@codingame/monaco-vscode-workspace-trust-service-override 34.1.3 → 35.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workspace-trust-service-override",
-  "version": "34.1.3",
+  "version": "35.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workspace-trust service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "34.1.3"
+    "@codingame/monaco-vscode-api": "35.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/workspace/browser/workspace.contribution.js

@@ -64,13 +64,13 @@ function getSessionsWindowTrustNote(environmentService, productService, isWorksp
     }
     if (isWorkspace) {
         return localize(
-            16410,
+            17075,
             "Trusting this workspace will also mark it as trusted in {0}.",
             productService.nameLong
         );
     }
     return localize(
-        16411,
+        17076,
         "Trusting this folder will also mark it as trusted in {0}.",
         productService.nameLong
     );
@@ -127,29 +127,29 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
                 await this.workspaceTrustManagementService.workspaceResolved;
                 const markdownDetails = [
                     this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY ? ( localize(
-                        16412,
+                        17077,
                         "You are trying to open untrusted files in a workspace which is trusted."
                     )) : ( localize(
-                        16413,
+                        17078,
                         "You are trying to open untrusted files in a window which is trusted."
                     )),
                     ( localize(
-                    16414,
+                    17079,
                     "If you don't want to open untrusted files, we recommend to open them in Restricted Mode in a new window as the files may be malicious. See [our docs](https://aka.ms/vscode-workspace-trust) to learn more."
                 ))
                 ];
                 await this.dialogService.prompt({
                     type: Severity.Info,
-                    message: this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY ? ( localize(16415, "Do you want to allow untrusted files in this workspace?")) : ( localize(16416, "Do you want to allow untrusted files in this window?")),
+                    message: this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY ? ( localize(17080, "Do you want to allow untrusted files in this workspace?")) : ( localize(17081, "Do you want to allow untrusted files in this window?")),
                     buttons: [{
-                        label: ( localize(16417, "&&Open")),
+                        label: ( localize(17082, "&&Open")),
                         run: (
                             {
                                 checkboxChecked
                             }
                         ) => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(WorkspaceTrustUriResponse.Open, !!checkboxChecked)
                     }, {
-                        label: ( localize(16418, "Open in &&Restricted Mode")),
+                        label: ( localize(17083, "Open in &&Restricted Mode")),
                         run: (
                             {
                                 checkboxChecked
@@ -160,7 +160,7 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
                         run: () => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(WorkspaceTrustUriResponse.Cancel)
                     },
                     checkbox: {
-                        label: ( localize(16419, "Remember my decision for all workspaces")),
+                        label: ( localize(17084, "Remember my decision for all workspaces")),
                         checked: false
                     },
                     custom: {
@@ -178,10 +178,10 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
             this.workspaceTrustRequestService.onDidInitiateResourcesTrustRequest(async options => {
                 await this.workspaceTrustManagementService.workspaceResolved;
                 const markdownDetails = [options?.message ?? ( localize(
-                    16420,
+                    17085,
                     "You are trying to open an untrusted folder. Do you trust the authors of this content?"
                 )), ( localize(
-                    16421,
+                    17086,
                     "If you don't trust the authors of these files, we recommend not continuing as the files may be malicious. See [our docs](https://aka.ms/vscode-workspace-trust) to learn more."
                 )), `\`${this.labelService.getUriLabel(options.uri)}\``];
                 const sessionsTrustNote = getSessionsWindowTrustNote(this.environmentService, this.productService, false);
@@ -190,9 +190,9 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
                 }
                 await this.dialogService.prompt({
                     type: Severity.Info,
-                    message: ( localize(16422, "Do you trust the authors of the files in this folder?")),
+                    message: ( localize(17087, "Do you trust the authors of the files in this folder?")),
                     buttons: [{
-                        label: ( localize(16423, "&&Trust Folder & Continue")),
+                        label: ( localize(17088, "&&Trust Folder & Continue")),
                         run: () => this.workspaceTrustRequestService.completeResourcesTrustRequest(options.uri, WorkspaceTrustUriResponse.Open)
                     }],
                     cancelButton: {
@@ -212,22 +212,22 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
         this._register(
             this.workspaceTrustRequestService.onDidInitiateWorkspaceTrustRequest(async requestOptions => {
                 await this.workspaceTrustManagementService.workspaceResolved;
-                const message = this.useWorkspaceLanguage ? ( localize(16424, "Do you trust the authors of the files in this workspace?")) : ( localize(16425, "Do you trust the authors of the files in this folder?"));
+                const message = this.useWorkspaceLanguage ? ( localize(17089, "Do you trust the authors of the files in this workspace?")) : ( localize(17090, "Do you trust the authors of the files in this folder?"));
                 const defaultDetails = ( localize(
-                    16426,
+                    17091,
                     "A feature you are trying to use may be a security risk if you do not trust the source of the files or folders you currently have open."
                 ));
                 const details = requestOptions?.message ?? defaultDetails;
                 const buttons = requestOptions?.buttons ?? [{
-                    label: this.useWorkspaceLanguage ? ( localize(16427, "&&Trust Workspace & Continue")) : ( localize(16428, "&&Trust Folder & Continue")),
+                    label: this.useWorkspaceLanguage ? ( localize(17092, "&&Trust Workspace & Continue")) : ( localize(17093, "&&Trust Folder & Continue")),
                     type: "ContinueWithTrust"
                 }, {
-                    label: ( localize(16429, "&&Manage")),
+                    label: ( localize(17094, "&&Manage")),
                     type: "Manage"
                 }];
                 if (!( buttons.some(b => b.type === "Cancel"))) {
                     buttons.push({
-                        label: ( localize(16430, "Cancel")),
+                        label: ( localize(17095, "Cancel")),
                         type: "Cancel"
                     });
                 }
@@ -235,7 +235,7 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
                     markdown: ( new MarkdownString(details))
                 }, {
                     markdown: ( new MarkdownString(( localize(
-                        16431,
+                        17096,
                         "If you don't trust the authors of these files, we do not recommend continuing as the files may be malicious. See [our docs](https://aka.ms/vscode-workspace-trust) to learn more."
                     ))))
                 }];
@@ -359,7 +359,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                     const addedFoldersTrustInfo = await Promise.all(( e.changes.added.map(folder => this.workspaceTrustManagementService.getUriTrustInfo(folder.uri))));
                     if (!( addedFoldersTrustInfo.map(info => info.trusted)).every(trusted => trusted)) {
                         let detail = ( localize(
-                            16432,
+                            17097,
                             "You are adding files that are not currently trusted to a trusted workspace. Do you trust the authors of these new files?"
                         ));
                         const sessionsTrustNote = getSessionsWindowTrustNote(this.environmentService, this.productService, false);
@@ -370,9 +370,9 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                             confirmed
                         } = await this.dialogService.confirm({
                             type: Severity.Info,
-                            message: ( localize(16433, "Do you trust the authors of the files in this folder?")),
+                            message: ( localize(17098, "Do you trust the authors of the files in this folder?")),
                             detail,
-                            cancelButton: ( localize(16434, "No")),
+                            cancelButton: ( localize(17099, "No")),
                             custom: {
                                 icon: Codicon.shield
                             }
@@ -401,25 +401,25 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 } else {
                     console.warn("AI generated workspace trust dialog contents not available.");
                 }
-                const title = titleString ?? (this.useWorkspaceLanguage ? ( localize(16424, "Do you trust the authors of the files in this workspace?")) : ( localize(16425, "Do you trust the authors of the files in this folder?")));
+                const title = titleString ?? (this.useWorkspaceLanguage ? ( localize(17089, "Do you trust the authors of the files in this workspace?")) : ( localize(17090, "Do you trust the authors of the files in this folder?")));
                 let checkboxText;
                 const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace());
                 const isSingleFolderWorkspace = isSingleFolderWorkspaceIdentifier(workspaceIdentifier);
                 const isEmptyWindow = isEmptyWorkspaceIdentifier(workspaceIdentifier);
                 if (!isAiGeneratedWorkspace && this.workspaceTrustManagementService.canSetParentFolderTrust()) {
                     const name = basename(dirname(workspaceIdentifier.uri));
-                    checkboxText = ( localize(16435, "Trust the authors of all files in the parent folder '{0}'", name));
+                    checkboxText = ( localize(17100, "Trust the authors of all files in the parent folder '{0}'", name));
                 }
                 const markdownStrings = [!isSingleFolderWorkspace ? ( localize(
-                    16436,
+                    17101,
                     "{0} provides features that may automatically execute files in this workspace.",
                     this.productService.nameShort
                 )) : ( localize(
-                    16437,
+                    17102,
                     "{0} provides features that may automatically execute files in this folder.",
                     this.productService.nameShort
                 )), learnMoreString ?? ( localize(
-                    16438,
+                    17103,
                     "If you don't trust the authors of these files, we recommend to continue in restricted mode as the files may be malicious. See [our docs](https://aka.ms/vscode-workspace-trust) to learn more."
                 )), !isEmptyWindow ? `\`${this.labelService.getWorkspaceLabel(workspaceIdentifier, {
     verbose: Verbosity.LONG
@@ -429,11 +429,11 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                     markdownStrings.push(sessionsTrustNote);
                 }
                 this.doShowModal(title, {
-                    label: trustOption ?? ( localize(16439, "&&Yes, I trust the authors")),
-                    sublabel: isSingleFolderWorkspace ? ( localize(16440, "Trust folder and enable all features")) : ( localize(16441, "Trust workspace and enable all features"))
+                    label: trustOption ?? ( localize(17104, "&&Yes, I trust the authors")),
+                    sublabel: isSingleFolderWorkspace ? ( localize(17105, "Trust folder and enable all features")) : ( localize(17106, "Trust workspace and enable all features"))
                 }, {
-                    label: dontTrustOption ?? ( localize(16442, "&&No, I don't trust the authors")),
-                    sublabel: isSingleFolderWorkspace ? ( localize(16443, "Open folder in restricted mode")) : ( localize(16444, "Open workspace in restricted mode"))
+                    label: dontTrustOption ?? ( localize(17107, "&&No, I don't trust the authors")),
+                    sublabel: isSingleFolderWorkspace ? ( localize(17108, "Open folder in restricted mode")) : ( localize(17109, "Open workspace in restricted mode"))
                 }, markdownStrings, checkboxText);
             })
         );
@@ -556,10 +556,10 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             return undefined;
         }
         const actions = [{
-            label: ( localize(16445, "Manage")),
+            label: ( localize(17110, "Manage")),
             href: "command:" + MANAGE_TRUST_COMMAND_ID
         }, {
-            label: ( localize(16446, "Learn More")),
+            label: ( localize(17111, "Learn More")),
             href: "https://aka.ms/vscode-workspace-trust"
         }];
         return {
@@ -584,17 +584,17 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         switch (this.workspaceContextService.getWorkbenchState()) {
         case WorkbenchState.EMPTY:
             return localize(
-                16447,
+                17112,
                 "Restricted Mode is intended for safe code browsing. Trust this window to enable all features. Use navigation keys to access banner actions."
             );
         case WorkbenchState.FOLDER:
             return localize(
-                16448,
+                17113,
                 "Restricted Mode is intended for safe code browsing. Trust this folder to enable all features. Use navigation keys to access banner actions."
             );
         case WorkbenchState.WORKSPACE:
             return localize(
-                16449,
+                17114,
                 "Restricted Mode is intended for safe code browsing. Trust this workspace to enable all features. Use navigation keys to access banner actions."
             );
         }
@@ -603,17 +603,17 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         switch (this.workspaceContextService.getWorkbenchState()) {
         case WorkbenchState.EMPTY:
             return localize(
-                16450,
+                17115,
                 "Restricted Mode is intended for safe code browsing. Trust this window to enable all features."
             );
         case WorkbenchState.FOLDER:
             return localize(
-                16451,
+                17116,
                 "Restricted Mode is intended for safe code browsing. Trust this folder to enable all features."
             );
         case WorkbenchState.WORKSPACE:
             return localize(
-                16452,
+                17117,
                 "Restricted Mode is intended for safe code browsing. Trust this workspace to enable all features."
             );
         }
@@ -632,12 +632,12 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         case WorkbenchState.EMPTY:
             {
                 ariaLabel = ( localize(
-                    16453,
+                    17118,
                     "Restricted Mode: Some features are disabled because this window is not trusted."
                 ));
                 toolTip = {
                     value: ( localize(
-                        16454,
+                        17119,
                         "Running in Restricted Mode\n\nSome [features are disabled]({0}) because this [window is not trusted]({1}).",
                         `command:${LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID}`,
                         `command:${MANAGE_TRUST_COMMAND_ID}`
@@ -650,12 +650,12 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         case WorkbenchState.FOLDER:
             {
                 ariaLabel = ( localize(
-                    16455,
+                    17120,
                     "Restricted Mode: Some features are disabled because this folder is not trusted."
                 ));
                 toolTip = {
                     value: ( localize(
-                        16456,
+                        17121,
                         "Running in Restricted Mode\n\nSome [features are disabled]({0}) because this [folder is not trusted]({1}).",
                         `command:${LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID}`,
                         `command:${MANAGE_TRUST_COMMAND_ID}`
@@ -668,12 +668,12 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         case WorkbenchState.WORKSPACE:
             {
                 ariaLabel = ( localize(
-                    16457,
+                    17122,
                     "Restricted Mode: Some features are disabled because this workspace is not trusted."
                 ));
                 toolTip = {
                     value: ( localize(
-                        16458,
+                        17123,
                         "Running in Restricted Mode\n\nSome [features are disabled]({0}) because this [workspace is not trusted]({1}).",
                         `command:${LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID}`,
                         `command:${MANAGE_TRUST_COMMAND_ID}`
@@ -685,8 +685,8 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             }
         }
         return {
-            name: ( localize(16459, "Workspace Trust")),
-            text: `$(shield) ${( localize(16460, "Restricted Mode"))}`,
+            name: ( localize(17124, "Workspace Trust")),
+            text: `$(shield) ${( localize(17125, "Restricted Mode"))}`,
             ariaLabel: ariaLabel,
             tooltip: toolTip,
             command: MANAGE_TRUST_COMMAND_ID,
@@ -730,16 +730,16 @@ class WorkspaceTrustEditorInputSerializer {
 }
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(WorkspaceTrustEditorInput.ID, WorkspaceTrustEditorInputSerializer);
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(WorkspaceTrustEditor, WorkspaceTrustEditor.ID, ( localize(16461, "Workspace Trust Editor"))),
+    EditorPaneDescriptor.create(WorkspaceTrustEditor, WorkspaceTrustEditor.ID, ( localize(17126, "Workspace Trust Editor"))),
     [( new SyncDescriptor(WorkspaceTrustEditorInput))]
 );
 const CONFIGURE_TRUST_COMMAND_ID = "workbench.trust.configure";
-const WORKSPACES_CATEGORY = ( localize2(16462, "Workspaces"));
+const WORKSPACES_CATEGORY = ( localize2(17127, "Workspaces"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_TRUST_COMMAND_ID,
-            title: ( localize2(16463, "Configure Workspace Trust Settings")),
+            title: ( localize2(17128, "Configure Workspace Trust Settings")),
             precondition: ( ContextKeyExpr.and(WorkspaceTrustContext.IsEnabled, ( ContextKeyExpr.equals(`config.${WORKSPACE_TRUST_ENABLED}`, true)))),
             category: WORKSPACES_CATEGORY,
             f1: true
@@ -756,7 +756,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: MANAGE_TRUST_COMMAND_ID,
-            title: ( localize2(16464, "Manage Workspace Trust")),
+            title: ( localize2(17129, "Manage Workspace Trust")),
             precondition: ( ContextKeyExpr.and(WorkspaceTrustContext.IsEnabled, ( ContextKeyExpr.equals(`config.${WORKSPACE_TRUST_ENABLED}`, true)))),
             category: WORKSPACES_CATEGORY,
             f1: true
@@ -779,7 +779,7 @@ registerAction2(class extends Action2 {
             type: "boolean",
             default: true,
             description: ( localize(
-                16465,
+                17130,
                 "Controls whether or not Workspace Trust is enabled within VS Code."
             )),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
@@ -787,30 +787,30 @@ registerAction2(class extends Action2 {
         },
         [WORKSPACE_TRUST_STARTUP_PROMPT]: {
             type: "string",
-            default: "once",
-            description: ( localize(16466, "Controls when the startup prompt to trust a workspace is shown.")),
+            default: "never",
+            description: ( localize(17131, "Controls when the startup prompt to trust a workspace is shown.")),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
             scope: ConfigurationScope.APPLICATION,
             enum: ["always", "once", "never"],
-            enumDescriptions: [( localize(16467, "Ask for trust every time an untrusted workspace is opened.")), ( localize(16468, "Ask for trust the first time an untrusted workspace is opened.")), ( localize(16469, "Do not ask for trust when an untrusted workspace is opened."))]
+            enumDescriptions: [( localize(17132, "Ask for trust every time an untrusted workspace is opened.")), ( localize(17133, "Ask for trust the first time an untrusted workspace is opened.")), ( localize(17134, "Do not ask for trust when an untrusted workspace is opened."))]
         },
         [WORKSPACE_TRUST_BANNER]: {
             type: "string",
             default: "untilDismissed",
-            description: ( localize(16470, "Controls when the restricted mode banner is shown.")),
+            description: ( localize(17135, "Controls when the restricted mode banner is shown.")),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
             scope: ConfigurationScope.APPLICATION,
             enum: ["always", "untilDismissed", "never"],
-            enumDescriptions: [( localize(16471, "Show the banner every time an untrusted workspace is open.")), ( localize(
-                16472,
+            enumDescriptions: [( localize(17136, "Show the banner every time an untrusted workspace is open.")), ( localize(
+                17137,
                 "Show the banner when an untrusted workspace is opened until dismissed."
-            )), ( localize(16473, "Do not show the banner when an untrusted workspace is open."))]
+            )), ( localize(17138, "Do not show the banner when an untrusted workspace is open."))]
         },
         [WORKSPACE_TRUST_UNTRUSTED_FILES]: {
             type: "string",
             default: "prompt",
             markdownDescription: ( localize(
-                16474,
+                17139,
                 "Controls how to handle opening untrusted files in a trusted workspace. This setting also applies to opening files in an empty window which is trusted via `#{0}#`.",
                 WORKSPACE_TRUST_EMPTY_WINDOW
             )),
@@ -818,13 +818,13 @@ registerAction2(class extends Action2 {
             scope: ConfigurationScope.APPLICATION,
             enum: ["prompt", "open", "newWindow"],
             enumDescriptions: [( localize(
-                16475,
+                17140,
                 "Ask how to handle untrusted files for each workspace. Once untrusted files are introduced to a trusted workspace, you will not be prompted again."
             )), ( localize(
-                16476,
+                17141,
                 "Always allow untrusted files to be introduced to a trusted workspace without prompting."
             )), ( localize(
-                16477,
+                17142,
                 "Always open untrusted files in a separate window in restricted mode without prompting."
             ))]
         },
@@ -832,7 +832,7 @@ registerAction2(class extends Action2 {
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                16478,
+                17143,
                 "Controls whether or not the empty window is trusted by default within VS Code. When used with `#{0}#`, you can enable the full functionality of VS Code without prompting in an empty window.",
                 WORKSPACE_TRUST_UNTRUSTED_FILES
             )),

package/vscode/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.js

@@ -39,7 +39,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/mini
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
-import { WorkbenchState, toWorkspaceIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
+import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -63,15 +63,14 @@ import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/th
 import { defaultButtonStyles, defaultInputBoxStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
-import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 
 var TrustedUriActionsColumnRenderer_1, TrustedUriPathColumnRenderer_1, TrustedUriHostColumnRenderer_1, WorkspaceTrustEditor_1;
-const shieldIcon = registerIcon("workspace-trust-banner", Codicon.shield, ( localize(16479, "Icon for workspace trust ion the banner.")));
-const checkListIcon = registerIcon("workspace-trust-editor-check", Codicon.check, ( localize(16480, "Icon for the checkmark in the workspace trust editor.")));
-const xListIcon = registerIcon("workspace-trust-editor-cross", Codicon.x, ( localize(16481, "Icon for the cross in the workspace trust editor.")));
-const folderPickerIcon = registerIcon("workspace-trust-editor-folder-picker", Codicon.folder, ( localize(16482, "Icon for the pick folder icon in the workspace trust editor.")));
-const editIcon = registerIcon("workspace-trust-editor-edit-folder", Codicon.edit, ( localize(16483, "Icon for the edit folder icon in the workspace trust editor.")));
-const removeIcon = registerIcon("workspace-trust-editor-remove-folder", Codicon.close, ( localize(16484, "Icon for the remove folder icon in the workspace trust editor.")));
+const shieldIcon = registerIcon("workspace-trust-banner", Codicon.shield, ( localize(17144, "Icon for workspace trust ion the banner.")));
+const checkListIcon = registerIcon("workspace-trust-editor-check", Codicon.check, ( localize(17145, "Icon for the checkmark in the workspace trust editor.")));
+const xListIcon = registerIcon("workspace-trust-editor-cross", Codicon.x, ( localize(17146, "Icon for the cross in the workspace trust editor.")));
+const folderPickerIcon = registerIcon("workspace-trust-editor-folder-picker", Codicon.folder, ( localize(17147, "Icon for the pick folder icon in the workspace trust editor.")));
+const editIcon = registerIcon("workspace-trust-editor-edit-folder", Codicon.edit, ( localize(17148, "Icon for the edit folder icon in the workspace trust editor.")));
+const removeIcon = registerIcon("workspace-trust-editor-remove-folder", Codicon.close, ( localize(17149, "Icon for the remove folder icon in the workspace trust editor.")));
 let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposable {
     constructor(
         container,
@@ -102,7 +101,7 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
         const tableElement = container.appendChild($(".trusted-uris-table"));
         const addButtonBarElement = container.appendChild($(".trusted-uris-button-bar"));
         this.table = this.instantiationService.createInstance(WorkbenchTable, "WorkspaceTrust", tableElement, ( new TrustedUriTableVirtualDelegate()), [{
-            label: ( localize(16485, "Host")),
+            label: ( localize(17150, "Host")),
             tooltip: "",
             weight: 1,
             templateId: TrustedUriHostColumnRenderer.TEMPLATE_ID,
@@ -110,7 +109,7 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
                 return row;
             }
         }, {
-            label: ( localize(16486, "Path")),
+            label: ( localize(17151, "Path")),
             tooltip: "",
             weight: 8,
             templateId: TrustedUriPathColumnRenderer.TEMPLATE_ID,
@@ -140,16 +139,16 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
                 getAriaLabel: item => {
                     const hostLabel = getHostLabel(this.labelService, item);
                     if (hostLabel === undefined || hostLabel.length === 0) {
-                        return localize(16487, "{0}, trusted", this.labelService.getUriLabel(item.uri));
+                        return localize(17152, "{0}, trusted", this.labelService.getUriLabel(item.uri));
                     }
                     return localize(
-                        16488,
+                        17153,
                         "{0} on {1}, trusted",
                         this.labelService.getUriLabel(item.uri),
                         hostLabel
                     );
                 },
-                getWidgetAriaLabel: () => ( localize(16489, "Trusted Folders & Workspaces"))
+                getWidgetAriaLabel: () => ( localize(17154, "Trusted Folders & Workspaces"))
             },
             identityProvider: {
                 getId(element) {
@@ -164,18 +163,18 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
         }));
         const buttonBar = this._register(( new ButtonBar(addButtonBarElement)));
         const addButton = this._register(buttonBar.addButton({
-            title: ( localize(16490, "Add Folder")),
+            title: ( localize(17155, "Add Folder")),
             ...defaultButtonStyles
         }));
-        addButton.label = ( localize(16490, "Add Folder"));
+        addButton.label = ( localize(17155, "Add Folder"));
         this._register(addButton.onDidClick(async () => {
             const uri = await this.fileDialogService.showOpenDialog({
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
                 defaultUri: this.currentWorkspaceUri,
-                openLabel: ( localize(16491, "Trust Folder")),
-                title: ( localize(16492, "Select Folder To Trust"))
+                openLabel: ( localize(17156, "Trust Folder")),
+                title: ( localize(17157, "Select Folder To Trust"))
             });
             if (uri) {
                 this.workspaceTrustManagementService.setUrisTrust(uri, true);
@@ -258,9 +257,9 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
         const entries = this.trustedUriEntries;
         this.container.classList.toggle("empty", entries.length === 0);
         this.descriptionElement.innerText = entries.length ? ( localize(
-            16493,
+            17158,
             "You trust the following folders, their subfolders, and workspace files."
-        )) : ( localize(16494, "You haven't trusted any folders or workspace files yet."));
+        )) : ( localize(17159, "You haven't trusted any folders or workspace files yet."));
         this.table.splice(0, Number.POSITIVE_INFINITY, this.trustedUriEntries);
         this.layout();
     }
@@ -274,7 +273,7 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
                 return {
                     type: MessageType.WARNING,
                     content: ( localize(
-                        16495,
+                        17160,
                         "You will trust all repositories on {0}.",
                         getHostLabel(this.labelService, item)
                     ))
@@ -284,7 +283,7 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
                 return {
                     type: MessageType.WARNING,
                     content: ( localize(
-                        16496,
+                        17161,
                         "You will trust all repositories and forks under '{0}' on {1}.",
                         segments[0],
                         getHostLabel(this.labelService, item)
@@ -294,7 +293,7 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
             if (segments.length > 2) {
                 return {
                     type: MessageType.ERROR,
-                    content: ( localize(16497, "You cannot trust individual folders within a repository.", path))
+                    content: ( localize(17162, "You cannot trust individual folders within a repository.", path))
                 };
             }
         }
@@ -331,8 +330,8 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
                 canSelectFolders: true,
                 canSelectMany: false,
                 defaultUri: item.uri,
-                openLabel: ( localize(16491, "Trust Folder")),
-                title: ( localize(16492, "Select Folder To Trust"))
+                openLabel: ( localize(17156, "Trust Folder")),
+                title: ( localize(17157, "Select Folder To Trust"))
             });
             if (uri) {
                 this.acceptEdit(item, uri[0]);
@@ -399,7 +398,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
             class: ThemeIcon.asClassName(editIcon),
             enabled: true,
             id: "editTrustedUri",
-            tooltip: ( localize(16498, "Edit Path")),
+            tooltip: ( localize(17163, "Edit Path")),
             run: () => {
                 this.table.edit(item, false);
             }
@@ -411,7 +410,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
             class: ThemeIcon.asClassName(folderPickerIcon),
             enabled: true,
             id: "pickerTrustedUri",
-            tooltip: ( localize(16499, "Open File Picker")),
+            tooltip: ( localize(17164, "Open File Picker")),
             run: () => {
                 this.table.edit(item, true);
             }
@@ -423,7 +422,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
             class: ThemeIcon.asClassName(removeIcon),
             enabled: true,
             id: "deleteTrustedUri",
-            tooltip: ( localize(16500, "Delete Path")),
+            tooltip: ( localize(17165, "Delete Path")),
             run: async () => {
                 await this.table.delete(item);
             }
@@ -549,7 +548,7 @@ let TrustedUriPathColumnRenderer = class TrustedUriPathColumnRenderer {
 };
 TrustedUriPathColumnRenderer = TrustedUriPathColumnRenderer_1 = ( __decorate([( __param(1, IContextViewService))], TrustedUriPathColumnRenderer));
 function getHostLabel(labelService, item) {
-    return item.uri.authority ? labelService.getHostLabel(item.uri.scheme, item.uri.authority) : ( localize(16501, "Local"));
+    return item.uri.authority ? labelService.getHostLabel(item.uri.scheme, item.uri.authority) : ( localize(17166, "Local"));
 }
 let TrustedUriHostColumnRenderer = class TrustedUriHostColumnRenderer {
     static {
@@ -683,10 +682,6 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
                 if (this.workspaceTrustManagementService.canSetWorkspaceTrust()) {
                     this.workspaceTrustManagementService.setWorkspaceTrust(!this.workspaceTrustManagementService.isWorkspaceTrusted());
                 }
-            } else if (event.equals(KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter)) {
-                if (this.workspaceTrustManagementService.canSetParentFolderTrust()) {
-                    this.workspaceTrustManagementService.setParentFolderTrust(true);
-                }
             }
         }));
     }
@@ -722,18 +717,18 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
     getHeaderTitleText(trusted) {
         if (trusted) {
             if (this.workspaceTrustManagementService.isWorkspaceTrustForced()) {
-                return localize(16502, "This window is trusted");
+                return localize(17167, "This window is trusted");
             }
             switch (this.workspaceService.getWorkbenchState()) {
             case WorkbenchState.EMPTY:
-                return localize(16503, "You trust this window");
+                return localize(17168, "You trust this window");
             case WorkbenchState.FOLDER:
-                return localize(16504, "You trust this folder");
+                return localize(17169, "You trust this folder");
             case WorkbenchState.WORKSPACE:
-                return localize(16505, "You trust this workspace");
+                return localize(17170, "You trust this workspace");
             }
         }
-        return localize(16506, "You are in Restricted Mode");
+        return localize(17171, "You are in Restricted Mode");
     }
     getHeaderTitleIconClassNames(trusted) {
         return ThemeIcon.asClassNameArray(shieldIcon);
@@ -744,36 +739,36 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         switch (this.workspaceService.getWorkbenchState()) {
         case WorkbenchState.EMPTY:
             {
-                title = trusted ? ( localize(16507, "In a Trusted Window")) : ( localize(16508, "In Restricted Mode"));
+                title = trusted ? ( localize(17172, "In a Trusted Window")) : ( localize(17173, "In Restricted Mode"));
                 subTitle = trusted ? ( localize(
-                    16509,
+                    17174,
                     "You trust the authors of the files in the current window. All features are enabled:"
                 )) : ( localize(
-                    16510,
+                    17175,
                     "You do not trust the authors of the files in the current window. The following features are disabled:"
                 ));
                 break;
             }
         case WorkbenchState.FOLDER:
             {
-                title = trusted ? ( localize(16511, "In a Trusted Folder")) : ( localize(16508, "In Restricted Mode"));
+                title = trusted ? ( localize(17176, "In a Trusted Folder")) : ( localize(17173, "In Restricted Mode"));
                 subTitle = trusted ? ( localize(
-                    16512,
+                    17177,
                     "You trust the authors of the files in the current folder. All features are enabled:"
                 )) : ( localize(
-                    16513,
+                    17178,
                     "You do not trust the authors of the files in the current folder. The following features are disabled:"
                 ));
                 break;
             }
         case WorkbenchState.WORKSPACE:
             {
-                title = trusted ? ( localize(16514, "In a Trusted Workspace")) : ( localize(16508, "In Restricted Mode"));
+                title = trusted ? ( localize(17179, "In a Trusted Workspace")) : ( localize(17173, "In Restricted Mode"));
                 subTitle = trusted ? ( localize(
-                    16515,
+                    17180,
                     "You trust the authors of the files in the current workspace. All features are enabled:"
                 )) : ( localize(
-                    16516,
+                    17181,
                     "You do not trust the authors of the files in the current workspace. The following features are disabled:"
                 ));
                 break;
@@ -782,6 +777,9 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         return [title, subTitle];
     }
     async render() {
+        if (this._store.isDisposed) {
+            return;
+        }
         if (this.rendering) {
             return;
         }
@@ -796,16 +794,16 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         this.headerDescription.innerText = "";
         const headerDescriptionText = append(this.headerDescription, $("div"));
         headerDescriptionText.innerText = isWorkspaceTrusted ? ( localize(
-            16517,
+            17182,
             "All features are enabled because trust has been granted to the workspace."
         )) : ( localize(
-            16518,
+            17183,
             "{0} is in a restricted mode intended for safe code browsing.",
             this.productService.nameShort
         ));
         const headerDescriptionActions = append(this.headerDescription, $("div"));
         const headerDescriptionActionsText = ( localize(
-            16519,
+            17184,
             "[Configure your settings]({0}) or [learn more](https://aka.ms/vscode-workspace-trust).",
             `command:workbench.trust.configure`
         ));
@@ -820,7 +818,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
             }
         }
         this.headerContainer.className = this.getHeaderContainerClass(isWorkspaceTrusted);
-        this.rootElement.setAttribute("aria-label", `${( localize(16520, "Manage Workspace Trust"))}:  ${this.headerContainer.innerText}`);
+        this.rootElement.setAttribute("aria-label", `${( localize(17185, "Manage Workspace Trust"))}:  ${this.headerContainer.innerText}`);
         const restrictedSettings = this.configurationService.restrictedSettings;
         const configurationRegistry = ( Registry.as(Extensions.Configuration));
         const settingsRequiringTrustedWorkspaceCount = restrictedSettings.default.filter(key => {
@@ -888,7 +886,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
             tabIndex: "0"
         }));
         const configurationTitle = append(this.configurationContainer, $(".workspace-trusted-folders-title"));
-        configurationTitle.innerText = ( localize(16489, "Trusted Folders & Workspaces"));
+        configurationTitle.innerText = ( localize(17154, "Trusted Folders & Workspaces"));
         this.workspaceTrustedUrisTable = this._register(
             this.instantiationService.createInstance(WorkspaceTrustedUrisTable, this.configurationContainer)
         );
@@ -913,7 +911,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         clearNode(this.untrustedContainer);
         const [trustedTitle, trustedSubTitle] = this.getFeaturesHeaderText(true);
         this.renderLimitationsHeaderElement(this.trustedContainer, trustedTitle, trustedSubTitle);
-        const trustedContainerItems = this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY ? [( localize(16521, "Tasks are allowed to run")), ( localize(16522, "Debugging is enabled")), ( localize(16523, "All enabled extensions are activated"))] : [( localize(16521, "Tasks are allowed to run")), ( localize(16522, "Debugging is enabled")), ( localize(16524, "All workspace settings are applied")), ( localize(16523, "All enabled extensions are activated"))];
+        const trustedContainerItems = this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY ? [( localize(17186, "Tasks are allowed to run")), ( localize(17187, "Debugging is enabled")), ( localize(17188, "All enabled extensions are activated"))] : [( localize(17186, "Tasks are allowed to run")), ( localize(17187, "Debugging is enabled")), ( localize(17189, "All workspace settings are applied")), ( localize(17188, "All enabled extensions are activated"))];
         this.renderLimitationsListElement(
             this.trustedContainer,
             trustedContainerItems,
@@ -921,18 +919,18 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         );
         const [untrustedTitle, untrustedSubTitle] = this.getFeaturesHeaderText(false);
         this.renderLimitationsHeaderElement(this.untrustedContainer, untrustedTitle, untrustedSubTitle);
-        const untrustedContainerItems = this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY ? [( localize(16525, "Tasks are not allowed to run")), ( localize(16526, "Debugging is disabled")), fixBadLocalizedLinks(( localize(
-            16527,
+        const untrustedContainerItems = this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY ? [( localize(17190, "Tasks are not allowed to run")), ( localize(17191, "Debugging is disabled")), fixBadLocalizedLinks(( localize(
+            17192,
             "[{0} extensions]({1}) are disabled or have limited functionality",
             numExtensions,
             `command:${LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID}`
-        )))] : [( localize(16525, "Tasks are not allowed to run")), ( localize(16526, "Debugging is disabled")), fixBadLocalizedLinks(numSettings ? ( localize(
-            16528,
+        )))] : [( localize(17190, "Tasks are not allowed to run")), ( localize(17191, "Debugging is disabled")), fixBadLocalizedLinks(numSettings ? ( localize(
+            17193,
             "[{0} workspace settings]({1}) are not applied",
             numSettings,
             "command:settings.filterUntrusted"
-        )) : ( localize(16529, "Workspace settings requiring trust are not applied"))), fixBadLocalizedLinks(( localize(
-            16527,
+        )) : ( localize(17194, "Workspace settings requiring trust are not applied"))), fixBadLocalizedLinks(( localize(
+            17192,
             "[{0} extensions]({1}) are disabled or have limited functionality",
             numExtensions,
             `command:${LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID}`
@@ -966,7 +964,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
             button.label = action.label;
             button.enabled = enabled !== undefined ? enabled : action.enabled;
             button.description = keybinding.getLabel();
-            button.element.ariaLabel = action.label + ", " + ( localize(16530, "Keyboard Shortcut: {0}", keybinding.getAriaLabel()));
+            button.element.ariaLabel = action.label + ", " + ( localize(17195, "Keyboard Shortcut: {0}", keybinding.getAriaLabel()));
             this.rerenderDisposables.add(button.onDidClick(e => {
                 if (e) {
                     EventHelper.stop(e, true);
@@ -976,35 +974,18 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         }
     }
     addTrustButtonToElement(parent) {
-        const trustAction = this.rerenderDisposables.add(( new Action("workspace.trust.button.action.grant", ( localize(16531, "Trust")), undefined, true, async () => {
+        const trustAction = this.rerenderDisposables.add(( new Action("workspace.trust.button.action.grant", ( localize(17196, "Trust")), undefined, true, async () => {
             await this.workspaceTrustManagementService.setWorkspaceTrust(true);
         })));
         const trustActions = [{
             action: trustAction,
             keybinding: this.keybindingService.resolveUserBinding(isMacintosh ? "Cmd+Enter" : "Ctrl+Enter")[0]
         }];
-        if (this.workspaceTrustManagementService.canSetParentFolderTrust()) {
-            const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceService.getWorkspace());
-            const name = basename(dirname(workspaceIdentifier.uri));
-            const trustMessageElement = append(parent, $(".trust-message-box"));
-            trustMessageElement.innerText = ( localize(
-                16532,
-                "Trust the authors of all files in the current folder or its parent '{0}'.",
-                name
-            ));
-            const trustParentAction = this.rerenderDisposables.add(( new Action("workspace.trust.button.action.grantParent", ( localize(16533, "Trust Parent")), undefined, true, async () => {
-                await this.workspaceTrustManagementService.setParentFolderTrust(true);
-            })));
-            trustActions.push({
-                action: trustParentAction,
-                keybinding: this.keybindingService.resolveUserBinding(isMacintosh ? "Cmd+Shift+Enter" : "Ctrl+Shift+Enter")[0]
-            });
-        }
         this.createButtonRow(parent, trustActions);
     }
     addDontTrustButtonToElement(parent) {
         this.createButtonRow(parent, [{
-            action: this.rerenderDisposables.add(( new Action("workspace.trust.button.action.deny", ( localize(16534, "Don't Trust")), undefined, true, async () => {
+            action: this.rerenderDisposables.add(( new Action("workspace.trust.button.action.deny", ( localize(17197, "Don't Trust")), undefined, true, async () => {
                 await this.workspaceTrustManagementService.setWorkspaceTrust(false);
             }))),
             keybinding: this.keybindingService.resolveUserBinding(isMacintosh ? "Cmd+Enter" : "Ctrl+Enter")[0]
@@ -1017,14 +998,14 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         const textElement = append(parent, $(".workspace-trust-untrusted-description"));
         if (!this.workspaceTrustManagementService.isWorkspaceTrustForced()) {
             textElement.innerText = this.workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE ? ( localize(
-                16535,
+                17198,
                 "This workspace is trusted via the bolded entries in the trusted folders below."
             )) : ( localize(
-                16536,
+                17199,
                 "This folder is trusted via the bolded entries in the trusted folders below."
             ));
         } else {
-            textElement.innerText = ( localize(16537, "This window is trusted by nature of the workspace that is opened."));
+            textElement.innerText = ( localize(17200, "This window is trusted by nature of the workspace that is opened."));
         }
     }
     renderLimitationsHeaderElement(parent, headerText, subtitleText) {

package/vscode/src/vs/workbench/services/workspaces/browser/workspaceTrustEditorInput.js

@@ -7,7 +7,7 @@ import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/th
 import { EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { EditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput';
 
-const WorkspaceTrustEditorIcon = registerIcon("workspace-trust-editor-label-icon", Codicon.shield, ( localize(17660, "Icon of the workspace trust editor label.")));
+const WorkspaceTrustEditorIcon = registerIcon("workspace-trust-editor-label-icon", Codicon.shield, ( localize(18325, "Icon of the workspace trust editor label.")));
 class WorkspaceTrustEditorInput extends EditorInput {
     constructor() {
         super(...arguments);
@@ -29,7 +29,7 @@ class WorkspaceTrustEditorInput extends EditorInput {
         return super.matches(otherInput) || otherInput instanceof WorkspaceTrustEditorInput;
     }
     getName() {
-        return localize(17661, "Workspace Trust");
+        return localize(18326, "Workspace Trust");
     }
     getIcon() {
         return WorkspaceTrustEditorIcon;