From c1dc62c038bb26d092ef13e8918eea4c50f67adb Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 4 Apr 2019 11:44:49 +0200 Subject: [PATCH] vscode.openFolder broken --- src/vs/workbench/api/node/apiCommands.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/api/node/apiCommands.ts b/src/vs/workbench/api/node/apiCommands.ts index 392a0238c8c..dfc2c149bc9 100644 --- a/src/vs/workbench/api/node/apiCommands.ts +++ b/src/vs/workbench/api/node/apiCommands.ts @@ -11,9 +11,9 @@ import { ITextEditorOptions } from 'vs/platform/editor/common/editor'; import { EditorViewColumn } from 'vs/workbench/api/common/shared/editor'; import { EditorGroupLayout } from 'vs/workbench/services/editor/common/editorGroupsService'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; -import { IWindowsService, IOpenSettings } from 'vs/platform/windows/common/windows'; +import { IWindowsService, IOpenSettings, IURIToOpen } from 'vs/platform/windows/common/windows'; import { IDownloadService } from 'vs/platform/download/common/download'; -import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces'; +import { IWorkspacesService, hasWorkspaceFileExtension } from 'vs/platform/workspaces/common/workspaces'; import { IRecent } from 'vs/platform/history/common/history'; // ----------------------------------------------------------------- @@ -51,7 +51,8 @@ export class OpenFolderAPICommand { } const options: IOpenSettings = { forceNewWindow: arg.forceNewWindow, noRecentEntry: arg.noRecentEntry }; uri = URI.revive(uri); - return executor.executeCommand('_files.windowOpen', [{ uri }], options); + const uriToOpen: IURIToOpen = hasWorkspaceFileExtension(uri.path) ? { workspaceUri: uri } : { folderUri: uri }; + return executor.executeCommand('_files.windowOpen', [uriToOpen], options); } } CommandsRegistry.registerCommand({ -- GitLab