From bbd54cb673382d74dbc252c2ffb85e5eadcc4bd8 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 13 Aug 2018 17:39:43 +0200 Subject: [PATCH] fix #56251 --- src/vs/code/electron-main/windows.ts | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index ba5c9f64885..ee30f9a282b 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -546,14 +546,6 @@ export class WindowsManager implements IWindowsMainService { workspaceResolver: workspace => this.workspacesMainService.resolveWorkspaceSync(workspace.configPath) }); - // Special case: we started with --wait and we got back a folder to open. In this case - // we actually prefer to not open the folder but operate purely on the file. - if (typeof bestWindowOrFolder === 'string' && filesToWait) { - //TODO@Ben: #54483 This should not happen - console.error(`This should not happen`, bestWindowOrFolder, WindowsManager.WINDOWS); - bestWindowOrFolder = !openFilesInNewWindow ? this.getLastActiveWindow() : null; - } - // We found a window to open the files in if (bestWindowOrFolder instanceof CodeWindow) { @@ -581,13 +573,6 @@ export class WindowsManager implements IWindowsMainService { } } - // We found a suitable folder to open: add it to foldersToOpen - else if (typeof bestWindowOrFolder === 'string') { - //TODO@Ben: #54483 Ben This should not happen - // foldersToOpen.push(bestWindowOrFolder); - console.error(`This should not happen`, bestWindowOrFolder, WindowsManager.WINDOWS); - } - // Finally, if no window or folder is found, just open the files in an empty window else { usedWindows.push(this.openInBrowserWindow({