This commit is contained in:
Benjamin Pasero 2016-06-04 15:21:55 +02:00
parent 1faead8dd3
commit 7c483ab854
2 changed files with 4 additions and 8 deletions

View file

@ -6,13 +6,10 @@
'use strict';
import * as assert from 'assert';
import * as fs from 'fs';
import * as os from 'os';
import {workspace, window, Position, Range} from 'vscode';
import {createRandomFile, deleteFile, cleanUp} from './utils';
import {join} from 'path';
suite("editor tests", () => {
suite('editor tests', () => {
teardown(cleanUp);

View file

@ -19,13 +19,12 @@ import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {IContextMenuService} from 'vs/platform/contextview/browser/contextView';
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
import {IWorkspaceContextService}from 'vs/workbench/services/workspace/common/contextService';
import {IWindowService}from 'vs/workbench/services/window/electron-browser/windowService';
import {IWindowService} from 'vs/workbench/services/window/electron-browser/windowService';
import {IWindowConfiguration} from 'vs/workbench/electron-browser/window';
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
import {ElectronWindow} from 'vs/workbench/electron-browser/window';
import * as browser from 'vs/base/browser/browser';
import win = require('vs/workbench/electron-browser/window');
import {ipcRenderer as ipc, webFrame, remote} from 'electron';
const currentWindow = remote.getCurrentWindow();
@ -59,7 +58,7 @@ export class ElectronIntegration {
public integrate(shellContainer: HTMLElement): void {
// Register the active window
let activeWindow = this.instantiationService.createInstance(win.ElectronWindow, currentWindow, shellContainer);
let activeWindow = this.instantiationService.createInstance(ElectronWindow, currentWindow, shellContainer);
this.windowService.registerWindow(activeWindow);
// Support runAction event