From eb36432c6b40563e0e1086c7450ab9a41a03afff Mon Sep 17 00:00:00 2001 From: SteVen Batten Date: Wed, 31 Mar 2021 11:24:58 -0700 Subject: [PATCH] use existing func for wid --- .../contrib/workspace/browser/workspaceTrustEditor.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts index 97426071bfc..fd4302c5fe7 100644 --- a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts +++ b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts @@ -32,6 +32,7 @@ import { attachButtonStyler, attachLinkStyler, attachStylerCallback } from 'vs/p import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { WorkspaceTrustState } from 'vs/platform/workspace/common/workspaceTrust'; +import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces'; import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane'; import { EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor'; import { ChoiceAction } from 'vs/workbench/common/notifications'; @@ -266,8 +267,9 @@ export class WorkspaceTrustEditor extends EditorPane { } }; - if (workspaceFolders.length === 1 && workspaceFolders[0].uri.scheme === Schemas.file) { - const { parentPath } = splitName(workspaceFolders[0].uri.fsPath); + const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceService.getWorkspace()); + if (isSingleFolderWorkspaceIdentifier(workspaceIdentifier) && workspaceIdentifier.uri.scheme === Schemas.file) { + const { parentPath } = splitName(workspaceIdentifier.uri.fsPath); const { name } = splitName(parentPath); if (parentPath) { trustChoiceWithMenu.menu.push({