From 2507cc202e9d0f6147f27d0e20259effbf37b654 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 5 Oct 2016 14:36:11 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/vs/base/parts/ipc/test/node/ipc.perf.ts | 8 -------- src/vs/platform/opener/browser/openerService.ts | 2 +- src/vs/workbench/browser/parts/editor/editorActions.ts | 2 +- src/vs/workbench/browser/parts/editor/editorCommands.ts | 1 - src/vs/workbench/electron-browser/actions.ts | 2 +- .../test/browser/parts/quickOpen/quickopen.perf.test.ts | 4 ++++ 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/vs/base/parts/ipc/test/node/ipc.perf.ts b/src/vs/base/parts/ipc/test/node/ipc.perf.ts index 2694f1ab0fa..24f88b2bd71 100644 --- a/src/vs/base/parts/ipc/test/node/ipc.perf.ts +++ b/src/vs/base/parts/ipc/test/node/ipc.perf.ts @@ -22,10 +22,6 @@ function createClient(): Client { suite('IPC performance', () => { test('increasing batch size', () => { - if (process.env['VSCODE_PID']) { - return; // TODO@Ben find out why test fails when run from within VS Code - } - const client = createClient(); const channel = client.getChannel('test'); const service = new TestServiceClient(channel); @@ -67,10 +63,6 @@ suite('IPC performance', () => { }); test('increasing raw data size', () => { - if (process.env['VSCODE_PID']) { - return; // TODO@Ben find out why test fails when run from within VS Code - } - const client = createClient(); const channel = client.getChannel('test'); const service = new TestServiceClient(channel); diff --git a/src/vs/platform/opener/browser/openerService.ts b/src/vs/platform/opener/browser/openerService.ts index 6d5dc1011fe..7c33ad82d9a 100644 --- a/src/vs/platform/opener/browser/openerService.ts +++ b/src/vs/platform/opener/browser/openerService.ts @@ -61,7 +61,7 @@ export class OpenerService implements IOpenerService { // remove fragment resource = resource.with({ fragment: '' }); } else if (resource.scheme === Schemas.file) { - resource = URI.file(normalize(resource.fsPath)); // TODO@Ben workaround for non-normalized paths (https://github.com/Microsoft/vscode/issues/12954) + resource = URI.file(normalize(resource.fsPath)); // workaround for non-normalized paths (https://github.com/Microsoft/vscode/issues/12954) } promise = this._editorService.openEditor({ resource, options: { selection, } }, options && options.openToSide); } diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index 5c769f4fc51..3f7fe6457ed 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.ts @@ -401,7 +401,7 @@ export class OpenToSideAction extends Action { public static OPEN_TO_SIDE_ID = 'workbench.action.openToSide'; public static OPEN_TO_SIDE_LABEL = nls.localize('openToSide', "Open to the Side"); - constructor( @IWorkbenchEditorService private editorService: IWorkbenchEditorService) { + constructor(@IWorkbenchEditorService private editorService: IWorkbenchEditorService) { super(OpenToSideAction.OPEN_TO_SIDE_ID, OpenToSideAction.OPEN_TO_SIDE_LABEL); this.class = 'quick-open-sidebyside'; diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index c542173207f..8f4c719e873 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -191,7 +191,6 @@ function registerDiffEditorCommands(): void { }); } -// TODO@Ben remove eventually function handleCommandDeprecations(): void { const mapDeprecatedCommands = { 'workbench.action.focusFirstEditor': 'workbench.action.focusFirstEditorGroup', diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 76e25d00308..8054efc6f45 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -569,7 +569,7 @@ CommandsRegistry.registerCommand('_workbench.diff', function (accessor: Services return TPromise.join([editorService.createInput({ resource: left }), editorService.createInput({ resource: right })]).then(inputs => { const [left, right] = inputs; - const diff = new DiffEditorInput(label, undefined, left, right); + const diff = new DiffEditorInput(label, void 0, left, right); return editorService.openEditor(diff); }).then(() => { return void 0; diff --git a/src/vs/workbench/test/browser/parts/quickOpen/quickopen.perf.test.ts b/src/vs/workbench/test/browser/parts/quickOpen/quickopen.perf.test.ts index ae8d044e5e3..680f09ad821 100644 --- a/src/vs/workbench/test/browser/parts/quickOpen/quickopen.perf.test.ts +++ b/src/vs/workbench/test/browser/parts/quickOpen/quickopen.perf.test.ts @@ -40,6 +40,10 @@ declare var __dirname: string; suite('QuickOpen performance', () => { test('Measure', () => { + if (process.env['VSCODE_PID']) { + return; // TODO@Christoph find out why test fails when run from within VS Code + } + const n = 3; const argv = minimist(process.argv); const testWorkspaceArg = argv['testWorkspace']; -- GitLab