npm - @codingame/monaco-vscode-workspace-trust-service-override - Versions diffs - 9.0.3 → 10.0.0 - Mend

@codingame/monaco-vscode-workspace-trust-service-override 9.0.3 → 10.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workspace-trust-service-override",
-  "version": "9.0.3",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0"
   }
 }

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

@@ -4,21 +4,18 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { Extensions as Extensions$1, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { WorkspaceTrustUriResponse } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
 import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
-import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { shieldIcon, WorkspaceTrustEditor } from './workspaceTrustEditor.js';
@@ -26,12 +23,11 @@ import { WorkspaceTrustEditorInput } from '../../../services/workspaces/browser/
 import { WORKSPACE_TRUST_STARTUP_PROMPT, WORKSPACE_TRUST_BANNER, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_UNTRUSTED_FILES, WORKSPACE_TRUST_EMPTY_WINDOW } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceTrust';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
-import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, WorkbenchState, isEmptyWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { resolve, dirname as dirname$1 } from 'vscode/vscode/vs/base/common/path';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService.service';
@@ -40,7 +36,6 @@ import { LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vscode/vscode/
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { WORKSPACE_TRUST_SETTING_TAG } from 'vscode/vscode/vs/workbench/contrib/preferences/common/preferences';
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
-import { Verbosity } from 'vscode/vscode/vs/platform/label/common/label';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { WorkspaceTrustContext, MANAGE_TRUST_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/workspace/common/workspace';
@@ -71,7 +66,7 @@ WorkspaceTrustContextKeys = ( (__decorate([
     ( (__param(1, IWorkspaceTrustEnablementService))),
     ( (__param(2, IWorkspaceTrustManagementService)))
 ], WorkspaceTrustContextKeys)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspaceTrustContextKeys, LifecyclePhase.Restored);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspaceTrustContextKeys, 3 );
 let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Disposable {
     static { this.ID = 'workbench.contrib.workspaceTrustRequestHandler'; }
     constructor(dialogService, commandService, workspaceContextService, workspaceTrustManagementService, workspaceTrustRequestService) {
@@ -90,40 +85,40 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
         this._register(this.workspaceTrustRequestService.onDidInitiateOpenFilesTrustRequest(async () => {
             await this.workspaceTrustManagementService.workspaceResolved;
             const markdownDetails = [
-                this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY ?
+                this.workspaceContextService.getWorkbenchState() !== 1  ?
                     ( localize(
-                        3151,
+                        3224,
                         "You are trying to open untrusted files in a workspace which is trusted."
                     )) :
                     ( localize(
-                        3152,
+                        3225,
                         "You are trying to open untrusted files in a window which is trusted."
                     )),
                 ( localize(
-                    3153,
+                    3226,
                     "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$1.Info,
-                message: this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY ?
-                    ( localize(3154, "Do you want to allow untrusted files in this workspace?")) :
-                    ( localize(3155, "Do you want to allow untrusted files in this window?")),
+                message: this.workspaceContextService.getWorkbenchState() !== 1  ?
+                    ( localize(3227, "Do you want to allow untrusted files in this workspace?")) :
+                    ( localize(3228, "Do you want to allow untrusted files in this window?")),
                 buttons: [
                     {
-                        label: ( localize(3156, "&&Open")),
-                        run: ({ checkboxChecked }) => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(WorkspaceTrustUriResponse.Open, !!checkboxChecked)
+                        label: ( localize(3229, "&&Open")),
+                        run: ({ checkboxChecked }) => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(1 , !!checkboxChecked)
                     },
                     {
-                        label: ( localize(3157, "Open in &&Restricted Mode")),
-                        run: ({ checkboxChecked }) => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(WorkspaceTrustUriResponse.OpenInNewWindow, !!checkboxChecked)
+                        label: ( localize(3230, "Open in &&Restricted Mode")),
+                        run: ({ checkboxChecked }) => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(2 , !!checkboxChecked)
                     }
                 ],
                 cancelButton: {
-                    run: () => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(WorkspaceTrustUriResponse.Cancel)
+                    run: () => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(3 )
                 },
                 checkbox: {
-                    label: ( localize(3158, "Remember my decision for all workspaces")),
+                    label: ( localize(3231, "Remember my decision for all workspaces")),
                     checked: false
                 },
                 custom: {
@@ -135,19 +130,19 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
         this._register(this.workspaceTrustRequestService.onDidInitiateWorkspaceTrustRequest(async (requestOptions) => {
             await this.workspaceTrustManagementService.workspaceResolved;
             const message = this.useWorkspaceLanguage ?
-                ( localize(3159, "Do you trust the authors of the files in this workspace?")) :
-                ( localize(3160, "Do you trust the authors of the files in this folder?"));
+                ( localize(3232, "Do you trust the authors of the files in this workspace?")) :
+                ( localize(3233, "Do you trust the authors of the files in this folder?"));
             const defaultDetails = ( localize(
-                3161,
+                3234,
                 "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(3162, "&&Trust Workspace & Continue")) : ( localize(3163, "&&Trust Folder & Continue")), type: 'ContinueWithTrust' },
-                { label: ( localize(3164, "&&Manage")), type: 'Manage' }
+                { label: this.useWorkspaceLanguage ? ( localize(3235, "&&Trust Workspace & Continue")) : ( localize(3236, "&&Trust Folder & Continue")), type: 'ContinueWithTrust' },
+                { label: ( localize(3237, "&&Manage")), type: 'Manage' }
             ];
             if (!( (buttons.some(b => b.type === 'Cancel')))) {
-                buttons.push({ label: ( localize(3165, "Cancel")), type: 'Cancel' });
+                buttons.push({ label: ( localize(3238, "Cancel")), type: 'Cancel' });
             }
             const { result } = await this.dialogService.prompt({
                 type: Severity$1.Info,
@@ -157,7 +152,7 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
                     markdownDetails: [
                         { markdown: ( (new MarkdownString(details))) },
                         { markdown: ( (new MarkdownString(( localize(
-                            3166,
+                            3239,
                             "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."
                         ))))) }
                     ]
@@ -258,12 +253,12 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                     if (!( (addedFoldersTrustInfo.map(info => info.trusted))).every(trusted => trusted)) {
                         const { confirmed } = await this.dialogService.confirm({
                             type: Severity$1.Info,
-                            message: ( localize(3167, "Do you trust the authors of the files in this folder?")),
+                            message: ( localize(3240, "Do you trust the authors of the files in this folder?")),
                             detail: ( localize(
-                                3168,
+                                3241,
                                 "You are adding files that are not currently trusted to a trusted workspace. Do you trust the authors of these new files?"
                             )),
-                            cancelButton: ( localize(3169, 'No')),
+                            cancelButton: ( localize(3242, 'No')),
                             custom: { icon: Codicon.shield }
                         });
                         await this.workspaceTrustManagementService.setUrisTrust(( (addedFoldersTrustInfo.map(i => i.uri))), confirmed);
@@ -291,34 +286,34 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 console.warn('AI generated workspace trust dialog contents not available.');
             }
             const title = titleString ?? (this.useWorkspaceLanguage ?
-                ( localize(3159, "Do you trust the authors of the files in this workspace?")) :
-                ( localize(3160, "Do you trust the authors of the files in this folder?")));
+                ( localize(3232, "Do you trust the authors of the files in this workspace?")) :
+                ( localize(3233, "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(3170, "Trust the authors of all files in the parent folder '{0}'", name));
+                checkboxText = ( localize(3243, "Trust the authors of all files in the parent folder '{0}'", name));
             }
-            this.doShowModal(title, { label: trustOption ?? ( localize(3171, "&&Yes, I trust the authors")), sublabel: isSingleFolderWorkspace ? ( localize(3172, "Trust folder and enable all features")) : ( localize(3173, "Trust workspace and enable all features")) }, { label: dontTrustOption ?? ( localize(3174, "&&No, I don't trust the authors")), sublabel: isSingleFolderWorkspace ? ( localize(3175, "Browse folder in restricted mode")) : ( localize(3176, "Browse workspace in restricted mode")) }, [
+            this.doShowModal(title, { label: trustOption ?? ( localize(3244, "&&Yes, I trust the authors")), sublabel: isSingleFolderWorkspace ? ( localize(3245, "Trust folder and enable all features")) : ( localize(3246, "Trust workspace and enable all features")) }, { label: dontTrustOption ?? ( localize(3247, "&&No, I don't trust the authors")), sublabel: isSingleFolderWorkspace ? ( localize(3248, "Browse folder in restricted mode")) : ( localize(3249, "Browse workspace in restricted mode")) }, [
                 !isSingleFolderWorkspace ?
                     ( localize(
-                        3177,
+                        3250,
                         "{0} provides features that may automatically execute files in this workspace.",
                         this.productService.nameShort
                     )) :
                     ( localize(
-                        3178,
+                        3251,
                         "{0} provides features that may automatically execute files in this folder.",
                         this.productService.nameShort
                     )),
                 learnMoreString ?? ( localize(
-                    3179,
+                    3252,
                     "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 })}\`` : '',
+                    `\`${this.labelService.getWorkspaceLabel(workspaceIdentifier, { verbose: 2  })}\`` : '',
             ], checkboxText);
         }));
     }
@@ -371,7 +366,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 markdownDetails: ( (markdownStrings.map(md => { return { markdown: ( (new MarkdownString(md))) }; })))
             }
         });
-        this.storageService.store(STARTUP_PROMPT_SHOWN_KEY, true, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this.storageService.store(STARTUP_PROMPT_SHOWN_KEY, true, 1 , 1 );
     }
     async showModalOnStart() {
         if (this.workspaceTrustManagementService.isWorkspaceTrusted()) {
@@ -385,7 +380,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             this.updateWorkbenchIndicators(false);
             return;
         }
-        if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+        if (this.workspaceContextService.getWorkbenchState() === 1 ) {
             this.updateWorkbenchIndicators(false);
             return;
         }
@@ -393,7 +388,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             this.updateWorkbenchIndicators(false);
             return;
         }
-        if (this.startupPromptSetting === 'once' && this.storageService.getBoolean(STARTUP_PROMPT_SHOWN_KEY, StorageScope.WORKSPACE, false)) {
+        if (this.startupPromptSetting === 'once' && this.storageService.getBoolean(STARTUP_PROMPT_SHOWN_KEY, 1 , false)) {
             this.updateWorkbenchIndicators(false);
             return;
         }
@@ -423,7 +418,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         });
     }
     getBannerItem(restrictedMode) {
-        const dismissedRestricted = this.storageService.getBoolean(BANNER_RESTRICTED_MODE_DISMISSED_KEY, StorageScope.WORKSPACE, false);
+        const dismissedRestricted = this.storageService.getBoolean(BANNER_RESTRICTED_MODE_DISMISSED_KEY, 1 , false);
         if (this.bannerSetting === 'never') {
             return undefined;
         }
@@ -432,11 +427,11 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         }
         const actions = [
             {
-                label: ( localize(3180, "Manage")),
+                label: ( localize(3253, "Manage")),
                 href: 'command:' + MANAGE_TRUST_COMMAND_ID
             },
             {
-                label: ( localize(3181, "Learn More")),
+                label: ( localize(3254, "Learn More")),
                 href: 'https://aka.ms/vscode-workspace-trust'
             }
         ];
@@ -448,45 +443,45 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             actions,
             onClose: () => {
                 if (restrictedMode) {
-                    this.storageService.store(BANNER_RESTRICTED_MODE_DISMISSED_KEY, true, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+                    this.storageService.store(BANNER_RESTRICTED_MODE_DISMISSED_KEY, true, 1 , 1 );
                 }
             }
         };
     }
     getBannerItemAriaLabels() {
         switch (this.workspaceContextService.getWorkbenchState()) {
-            case WorkbenchState.EMPTY:
+            case 1 :
                 return ( localize(
-                    3182,
+                    3255,
                     "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:
+            case 2 :
                 return ( localize(
-                    3183,
+                    3256,
                     "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:
+            case 3 :
                 return ( localize(
-                    3184,
+                    3257,
                     "Restricted Mode is intended for safe code browsing. Trust this workspace to enable all features. Use navigation keys to access banner actions."
                 ));
         }
     }
     getBannerItemMessages() {
         switch (this.workspaceContextService.getWorkbenchState()) {
-            case WorkbenchState.EMPTY:
+            case 1 :
                 return ( localize(
-                    3185,
+                    3258,
                     "Restricted Mode is intended for safe code browsing. Trust this window to enable all features."
                 ));
-            case WorkbenchState.FOLDER:
+            case 2 :
                 return ( localize(
-                    3186,
+                    3259,
                     "Restricted Mode is intended for safe code browsing. Trust this folder to enable all features."
                 ));
-            case WorkbenchState.WORKSPACE:
+            case 3 :
                 return ( localize(
-                    3187,
+                    3260,
                     "Restricted Mode is intended for safe code browsing. Trust this workspace to enable all features."
                 ));
         }
@@ -502,14 +497,14 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         let ariaLabel = '';
         let toolTip;
         switch (this.workspaceContextService.getWorkbenchState()) {
-            case WorkbenchState.EMPTY: {
+            case 1 : {
                 ariaLabel = ( localize(
-                    3188,
+                    3261,
                     "Restricted Mode: Some features are disabled because this window is not trusted."
                 ));
                 toolTip = {
                     value: ( localize(
-                        3189,
+                        3262,
                         "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}`
@@ -519,14 +514,14 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 };
                 break;
             }
-            case WorkbenchState.FOLDER: {
+            case 2 : {
                 ariaLabel = ( localize(
-                    3190,
+                    3263,
                     "Restricted Mode: Some features are disabled because this folder is not trusted."
                 ));
                 toolTip = {
                     value: ( localize(
-                        3191,
+                        3264,
                         "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}`
@@ -536,14 +531,14 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 };
                 break;
             }
-            case WorkbenchState.WORKSPACE: {
+            case 3 : {
                 ariaLabel = ( localize(
-                    3192,
+                    3265,
                     "Restricted Mode: Some features are disabled because this workspace is not trusted."
                 ));
                 toolTip = {
                     value: ( localize(
-                        3193,
+                        3266,
                         "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}`
@@ -555,8 +550,8 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             }
         }
         return {
-            name: ( localize(3194, "Workspace Trust")),
-            text: `$(shield) ${( localize(3195, "Restricted Mode"))}`,
+            name: ( localize(3267, "Workspace Trust")),
+            text: `$(shield) ${( localize(3268, "Restricted Mode"))}`,
             ariaLabel: ariaLabel,
             tooltip: toolTip,
             command: MANAGE_TRUST_COMMAND_ID,
@@ -570,7 +565,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         }
         if (!trusted && !this.statusbarEntryAccessor.value) {
             const entry = this.getRestrictedModeStatusbarEntry();
-            this.statusbarEntryAccessor.value = this.statusbarService.addEntry(entry, this.entryId, StatusbarAlignment.LEFT, 0.99 * Number.MAX_VALUE );
+            this.statusbarEntryAccessor.value = this.statusbarService.addEntry(entry, this.entryId, 0 , 0.99 * Number.MAX_VALUE );
         }
     }
 };
@@ -591,8 +586,8 @@ WorkspaceTrustUXHandler = ( (__decorate([
     ( (__param(13, IEnvironmentService))),
     ( (__param(14, IFileService)))
 ], WorkspaceTrustUXHandler)));
-registerWorkbenchContribution2(WorkspaceTrustRequestHandler.ID, WorkspaceTrustRequestHandler, WorkbenchPhase.BlockRestore);
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspaceTrustUXHandler, LifecyclePhase.Restored);
+registerWorkbenchContribution2(WorkspaceTrustRequestHandler.ID, WorkspaceTrustRequestHandler, 2 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspaceTrustUXHandler, 3 );
 class WorkspaceTrustEditorInputSerializer {
     canSerialize(editorInput) {
         return true;
@@ -606,16 +601,16 @@ class WorkspaceTrustEditorInputSerializer {
 }
 ( (Registry.as(EditorExtensions.EditorFactory)))
     .registerEditorSerializer(WorkspaceTrustEditorInput.ID, WorkspaceTrustEditorInputSerializer);
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WorkspaceTrustEditor, WorkspaceTrustEditor.ID, ( localize(3196, "Workspace Trust Editor"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WorkspaceTrustEditor, WorkspaceTrustEditor.ID, ( localize(3269, "Workspace Trust Editor"))), [
     ( (new SyncDescriptor(WorkspaceTrustEditorInput)))
 ]);
 const CONFIGURE_TRUST_COMMAND_ID = 'workbench.trust.configure';
-const WORKSPACES_CATEGORY = ( localize2(3197, 'Workspaces'));
+const WORKSPACES_CATEGORY = ( localize2(3270, 'Workspaces'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_TRUST_COMMAND_ID,
-            title: ( localize2(3198, "Configure Workspace Trust Settings")),
+            title: ( localize2(3271, "Configure Workspace Trust Settings")),
             precondition: ( (ContextKeyExpr.and(
                 WorkspaceTrustContext.IsEnabled,
                  (ContextKeyExpr.equals(`config.${WORKSPACE_TRUST_ENABLED}`, true))
@@ -632,7 +627,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: MANAGE_TRUST_COMMAND_ID,
-            title: ( localize2(3199, "Manage Workspace Trust")),
+            title: ( localize2(3272, "Manage Workspace Trust")),
             precondition: ( (ContextKeyExpr.and(
                 WorkspaceTrustContext.IsEnabled,
                  (ContextKeyExpr.equals(`config.${WORKSPACE_TRUST_ENABLED}`, true))
@@ -656,61 +651,61 @@ registerAction2(class extends Action2 {
         [WORKSPACE_TRUST_ENABLED]: {
             type: 'boolean',
             default: true,
-            description: ( localize(3200, "Controls whether or not Workspace Trust is enabled within VS Code.")),
+            description: ( localize(3273, "Controls whether or not Workspace Trust is enabled within VS Code.")),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: ConfigurationScope.APPLICATION,
+            scope: 1 ,
         },
         [WORKSPACE_TRUST_STARTUP_PROMPT]: {
             type: 'string',
             default: 'once',
-            description: ( localize(3201, "Controls when the startup prompt to trust a workspace is shown.")),
+            description: ( localize(3274, "Controls when the startup prompt to trust a workspace is shown.")),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: ConfigurationScope.APPLICATION,
+            scope: 1 ,
             enum: ['always', 'once', 'never'],
             enumDescriptions: [
-                ( localize(3202, "Ask for trust every time an untrusted workspace is opened.")),
-                ( localize(3203, "Ask for trust the first time an untrusted workspace is opened.")),
-                ( localize(3204, "Do not ask for trust when an untrusted workspace is opened.")),
+                ( localize(3275, "Ask for trust every time an untrusted workspace is opened.")),
+                ( localize(3276, "Ask for trust the first time an untrusted workspace is opened.")),
+                ( localize(3277, "Do not ask for trust when an untrusted workspace is opened.")),
             ]
         },
         [WORKSPACE_TRUST_BANNER]: {
             type: 'string',
             default: 'untilDismissed',
-            description: ( localize(3205, "Controls when the restricted mode banner is shown.")),
+            description: ( localize(3278, "Controls when the restricted mode banner is shown.")),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: ConfigurationScope.APPLICATION,
+            scope: 1 ,
             enum: ['always', 'untilDismissed', 'never'],
             enumDescriptions: [
-                ( localize(3206, "Show the banner every time an untrusted workspace is open.")),
+                ( localize(3279, "Show the banner every time an untrusted workspace is open.")),
                 ( localize(
-                    3207,
+                    3280,
                     "Show the banner when an untrusted workspace is opened until dismissed."
                 )),
-                ( localize(3208, "Do not show the banner when an untrusted workspace is open.")),
+                ( localize(3281, "Do not show the banner when an untrusted workspace is open.")),
             ]
         },
         [WORKSPACE_TRUST_UNTRUSTED_FILES]: {
             type: 'string',
             default: 'prompt',
             markdownDescription: ( localize(
-                3209,
+                3282,
                 "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
             )),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: ConfigurationScope.APPLICATION,
+            scope: 1 ,
             enum: ['prompt', 'open', 'newWindow'],
             enumDescriptions: [
                 ( localize(
-                    3210,
+                    3283,
                     "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(
-                    3211,
+                    3284,
                     "Always allow untrusted files to be introduced to a trusted workspace without prompting."
                 )),
                 ( localize(
-                    3212,
+                    3285,
                     "Always open untrusted files in a separate window in restricted mode without prompting."
                 )),
             ]
@@ -719,12 +714,12 @@ registerAction2(class extends Action2 {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                3213,
+                3286,
                 "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
             )),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: ConfigurationScope.APPLICATION
+            scope: 1
         }
     }
 });
@@ -794,6 +789,6 @@ WorkspaceTrustTelemetryContribution = ( (__decorate([
     ( (__param(4, IWorkspaceTrustManagementService)))
 ], WorkspaceTrustTelemetryContribution)));
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(WorkspaceTrustTelemetryContribution, LifecyclePhase.Restored);
+    .registerWorkbenchContribution(WorkspaceTrustTelemetryContribution, 3 );
 export { WorkspaceTrustContextKeys, WorkspaceTrustRequestHandler, WorkspaceTrustUXHandler };

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

@@ -2,21 +2,19 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { $, addDisposableListener, EventType, EventHelper, addStandardDisposableListener, clearNode, append, isAncestorOfActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { ButtonBar } from 'vscode/vscode/vs/base/browser/ui/button/button';
-import { MessageType, InputBox } from 'vscode/vscode/vs/base/browser/ui/inputbox/inputBox';
+import { InputBox } from 'vscode/vscode/vs/base/browser/ui/inputbox/inputBox';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { debounce } from 'vscode/vscode/vs/base/common/decorators';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { normalizeDriveLetter } from 'vscode/vscode/vs/base/common/labels';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { ScrollbarVisibility } from 'vscode/vscode/vs/base/common/scrollable';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize } from 'vscode/vscode/vs/nls';
-import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -38,7 +36,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
-import { WorkbenchState, toWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { toWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
@@ -51,7 +49,6 @@ import { IWorkbenchConfigurationService } from 'vscode/vscode/vs/workbench/servi
 import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { getExtensionDependencies } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { EnablementState } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { posix, win32 } from 'vscode/vscode/vs/base/common/path';
 import { hasDriveLetter, toSlashes } from 'vscode/vscode/vs/base/common/extpath';
@@ -64,12 +61,12 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
 var TrustedUriActionsColumnRenderer_1, TrustedUriPathColumnRenderer_1, TrustedUriHostColumnRenderer_1, WorkspaceTrustEditor_1;
-const shieldIcon = registerIcon('workspace-trust-banner', Codicon.shield, ( localize(7534, 'Icon for workspace trust ion the banner.')));
-const checkListIcon = registerIcon('workspace-trust-editor-check', Codicon.check, ( localize(7535, 'Icon for the checkmark in the workspace trust editor.')));
-const xListIcon = registerIcon('workspace-trust-editor-cross', Codicon.x, ( localize(7536, 'Icon for the cross in the workspace trust editor.')));
-const folderPickerIcon = registerIcon('workspace-trust-editor-folder-picker', Codicon.folder, ( localize(7537, 'Icon for the pick folder icon in the workspace trust editor.')));
-const editIcon = registerIcon('workspace-trust-editor-edit-folder', Codicon.edit, ( localize(7538, 'Icon for the edit folder icon in the workspace trust editor.')));
-const removeIcon = registerIcon('workspace-trust-editor-remove-folder', Codicon.close, ( localize(7539, 'Icon for the remove folder icon in the workspace trust editor.')));
+const shieldIcon = registerIcon('workspace-trust-banner', Codicon.shield, ( localize(7614, 'Icon for workspace trust ion the banner.')));
+const checkListIcon = registerIcon('workspace-trust-editor-check', Codicon.check, ( localize(7615, 'Icon for the checkmark in the workspace trust editor.')));
+const xListIcon = registerIcon('workspace-trust-editor-cross', Codicon.x, ( localize(7616, 'Icon for the cross in the workspace trust editor.')));
+const folderPickerIcon = registerIcon('workspace-trust-editor-folder-picker', Codicon.folder, ( localize(7617, 'Icon for the pick folder icon in the workspace trust editor.')));
+const editIcon = registerIcon('workspace-trust-editor-edit-folder', Codicon.edit, ( localize(7618, 'Icon for the edit folder icon in the workspace trust editor.')));
+const removeIcon = registerIcon('workspace-trust-editor-remove-folder', Codicon.close, ( localize(7619, 'Icon for the remove folder icon in the workspace trust editor.')));
 let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposable {
     constructor(container, instantiationService, workspaceService, workspaceTrustManagementService, uriService, labelService, fileDialogService) {
         super();
@@ -93,14 +90,14 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
         const addButtonBarElement = container.appendChild($('.trusted-uris-button-bar'));
         this.table = this.instantiationService.createInstance(WorkbenchTable, 'WorkspaceTrust', tableElement, ( (new TrustedUriTableVirtualDelegate())), [
             {
-                label: ( localize(7540, "Host")),
+                label: ( localize(7620, "Host")),
                 tooltip: '',
                 weight: 1,
                 templateId: TrustedUriHostColumnRenderer.TEMPLATE_ID,
                 project(row) { return row; }
             },
             {
-                label: ( localize(7541, "Path")),
+                label: ( localize(7621, "Path")),
                 tooltip: '',
                 weight: 8,
                 templateId: TrustedUriPathColumnRenderer.TEMPLATE_ID,
@@ -128,16 +125,16 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
                 getAriaLabel: (item) => {
                     const hostLabel = getHostLabel(this.labelService, item);
                     if (hostLabel === undefined || hostLabel.length === 0) {
-                        return ( localize(7542, "{0}, trusted", this.labelService.getUriLabel(item.uri)));
+                        return ( localize(7622, "{0}, trusted", this.labelService.getUriLabel(item.uri)));
                     }
                     return ( localize(
-                        7543,
+                        7623,
                         "{0} on {1}, trusted",
                         this.labelService.getUriLabel(item.uri),
                         hostLabel
                     ));
                 },
-                getWidgetAriaLabel: () => ( localize(7544, "Trusted Folders & Workspaces"))
+                getWidgetAriaLabel: () => ( localize(7624, "Trusted Folders & Workspaces"))
             },
             identityProvider: {
                 getId(element) {
@@ -153,16 +150,16 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
             }
         }));
         const buttonBar = this._register(( (new ButtonBar(addButtonBarElement))));
-        const addButton = this._register(buttonBar.addButton({ title: ( localize(7545, "Add Folder")), ...defaultButtonStyles }));
-        addButton.label = ( localize(7545, "Add Folder"));
+        const addButton = this._register(buttonBar.addButton({ title: ( localize(7625, "Add Folder")), ...defaultButtonStyles }));
+        addButton.label = ( localize(7625, "Add Folder"));
         this._register(addButton.onDidClick(async () => {
             const uri = await this.fileDialogService.showOpenDialog({
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
                 defaultUri: this.currentWorkspaceUri,
-                openLabel: ( localize(7546, "Trust Folder")),
-                title: ( localize(7547, "Select Folder To Trust"))
+                openLabel: ( localize(7626, "Trust Folder")),
+                title: ( localize(7627, "Select Folder To Trust"))
             });
             if (uri) {
                 this.workspaceTrustManagementService.setUrisTrust(uri, true);
@@ -243,10 +240,10 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
         this.container.classList.toggle('empty', entries.length === 0);
         this.descriptionElement.innerText = entries.length ?
             ( localize(
-                7548,
+                7628,
                 "You trust the following folders, their subfolders, and workspace files."
             )) :
-            ( localize(7549, "You haven't trusted any folders or workspace files yet."));
+            ( localize(7629, "You haven't trusted any folders or workspace files yet."));
         this.table.splice(0, Number.POSITIVE_INFINITY, this.trustedUriEntries);
         this.layout();
     }
@@ -258,9 +255,9 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
             const segments = path.split(posix.sep).filter(s => s.length);
             if (segments.length === 0 && path.startsWith(posix.sep)) {
                 return {
-                    type: MessageType.WARNING,
+                    type: 2 ,
                     content: ( localize(
-                        7550,
+                        7630,
                         "You will trust all repositories on {0}.",
                         getHostLabel(this.labelService, item)
                     ))
@@ -268,9 +265,9 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
             }
             if (segments.length === 1) {
                 return {
-                    type: MessageType.WARNING,
+                    type: 2 ,
                     content: ( localize(
-                        7551,
+                        7631,
                         "You will trust all repositories and forks under '{0}' on {1}.",
                         segments[0],
                         getHostLabel(this.labelService, item)
@@ -279,8 +276,8 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
             }
             if (segments.length > 2) {
                 return {
-                    type: MessageType.ERROR,
-                    content: ( localize(7552, "You cannot trust individual folders within a repository.", path))
+                    type: 3 ,
+                    content: ( localize(7632, "You cannot trust individual folders within a repository.", path))
                 };
             }
         }
@@ -321,8 +318,8 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
                 canSelectFolders: true,
                 canSelectMany: false,
                 defaultUri: item.uri,
-                openLabel: ( localize(7546, "Trust Folder")),
-                title: ( localize(7547, "Select Folder To Trust"))
+                openLabel: ( localize(7626, "Trust Folder")),
+                title: ( localize(7627, "Select Folder To Trust"))
             });
             if (uri) {
                 this.acceptEdit(item, uri[0]);
@@ -389,7 +386,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
             class: ThemeIcon.asClassName(editIcon),
             enabled: true,
             id: 'editTrustedUri',
-            tooltip: ( localize(7553, "Edit Path")),
+            tooltip: ( localize(7633, "Edit Path")),
             run: () => {
                 this.table.edit(item, false);
             }
@@ -401,7 +398,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
             class: ThemeIcon.asClassName(folderPickerIcon),
             enabled: true,
             id: 'pickerTrustedUri',
-            tooltip: ( localize(7554, "Open File Picker")),
+            tooltip: ( localize(7634, "Open File Picker")),
             run: () => {
                 this.table.edit(item, true);
             }
@@ -413,7 +410,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
             class: ThemeIcon.asClassName(removeIcon),
             enabled: true,
             id: 'deleteTrustedUri',
-            tooltip: ( localize(7555, "Delete Path")),
+            tooltip: ( localize(7635, "Delete Path")),
             run: async () => {
                 await this.table.delete(item);
             }
@@ -487,11 +484,11 @@ let TrustedUriPathColumnRenderer = class TrustedUriPathColumnRenderer {
         };
         templateData.renderDisposables.add(addStandardDisposableListener(templateData.pathInput.inputElement, EventType.KEY_DOWN, e => {
             let handled = false;
-            if (e.equals(KeyCode.Enter)) {
+            if (e.equals(3 )) {
                 accept();
                 handled = true;
             }
-            else if (e.equals(KeyCode.Escape)) {
+            else if (e.equals(9 )) {
                 reject();
                 handled = true;
             }
@@ -530,7 +527,7 @@ 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(7556, "Local"));
+    return item.uri.authority ? labelService.getHostLabel(item.uri.scheme, item.uri.authority) : ( localize(7636, "Local"));
 }
 let TrustedUriHostColumnRenderer = class TrustedUriHostColumnRenderer {
     static { TrustedUriHostColumnRenderer_1 = this; }
@@ -591,8 +588,8 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         this.createHeaderElement(this.rootElement);
         const scrollableContent = $('.workspace-trust-editor-body');
         this.bodyScrollBar = this._register(( (new DomScrollableElement(scrollableContent, {
-            horizontal: ScrollbarVisibility.Hidden,
-            vertical: ScrollbarVisibility.Auto,
+            horizontal: 2 ,
+            vertical: 1 ,
         }))));
         append(this.rootElement, this.bodyScrollBar.getDomNode());
         this.createAffectedFeaturesElement(scrollableContent);
@@ -603,16 +600,16 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         this.rootElement.style.setProperty('--workspace-trust-x-color', asCssVariable(editorErrorForeground));
         this._register(addDisposableListener(this.rootElement, EventType.KEY_DOWN, e => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(KeyCode.UpArrow) || event.equals(KeyCode.DownArrow)) {
+            if (event.equals(16 ) || event.equals(18 )) {
                 const navOrder = [this.headerContainer, this.trustedContainer, this.untrustedContainer, this.configurationContainer];
                 const currentIndex = navOrder.findIndex(element => {
                     return isAncestorOfActiveElement(element);
                 });
                 let newIndex = currentIndex;
-                if (event.equals(KeyCode.DownArrow)) {
+                if (event.equals(18 )) {
                     newIndex++;
                 }
-                else if (event.equals(KeyCode.UpArrow)) {
+                else if (event.equals(16 )) {
                     newIndex = Math.max(0, newIndex);
                     newIndex--;
                 }
@@ -620,15 +617,15 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
                 newIndex %= navOrder.length;
                 navOrder[newIndex].focus();
             }
-            else if (event.equals(KeyCode.Escape)) {
+            else if (event.equals(9 )) {
                 this.rootElement.focus();
             }
-            else if (event.equals(KeyMod.CtrlCmd | KeyCode.Enter)) {
+            else if (event.equals(2048  | 3 )) {
                 if (this.workspaceTrustManagementService.canSetWorkspaceTrust()) {
                     this.workspaceTrustManagementService.setWorkspaceTrust(!this.workspaceTrustManagementService.isWorkspaceTrusted());
                 }
             }
-            else if (event.equals(KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter)) {
+            else if (event.equals(2048  | 1024  | 3 )) {
                 if (this.workspaceTrustManagementService.canSetParentFolderTrust()) {
                     this.workspaceTrustManagementService.setParentFolderTrust(true);
                 }
@@ -663,18 +660,18 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
     getHeaderTitleText(trusted) {
         if (trusted) {
             if (this.workspaceTrustManagementService.isWorkspaceTrustForced()) {
-                return ( localize(7557, "This window is trusted"));
+                return ( localize(7637, "This window is trusted"));
             }
             switch (this.workspaceService.getWorkbenchState()) {
-                case WorkbenchState.EMPTY:
-                    return ( localize(7558, "You trust this window"));
-                case WorkbenchState.FOLDER:
-                    return ( localize(7559, "You trust this folder"));
-                case WorkbenchState.WORKSPACE:
-                    return ( localize(7560, "You trust this workspace"));
+                case 1 :
+                    return ( localize(7638, "You trust this window"));
+                case 2 :
+                    return ( localize(7639, "You trust this folder"));
+                case 3 :
+                    return ( localize(7640, "You trust this workspace"));
             }
         }
-        return ( localize(7561, "You are in Restricted Mode"));
+        return ( localize(7641, "You are in Restricted Mode"));
     }
     getHeaderTitleIconClassNames(trusted) {
         return ThemeIcon.asClassNameArray(shieldIcon);
@@ -683,38 +680,38 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         let title = '';
         let subTitle = '';
         switch (this.workspaceService.getWorkbenchState()) {
-            case WorkbenchState.EMPTY: {
-                title = trusted ? ( localize(7562, "In a Trusted Window")) : ( localize(7563, "In Restricted Mode"));
+            case 1 : {
+                title = trusted ? ( localize(7642, "In a Trusted Window")) : ( localize(7643, "In Restricted Mode"));
                 subTitle = trusted ? ( localize(
-                    7564,
+                    7644,
                     "You trust the authors of the files in the current window. All features are enabled:"
                 )) :
                     ( localize(
-                        7565,
+                        7645,
                         "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(7566, "In a Trusted Folder")) : ( localize(7563, "In Restricted Mode"));
+            case 2 : {
+                title = trusted ? ( localize(7646, "In a Trusted Folder")) : ( localize(7643, "In Restricted Mode"));
                 subTitle = trusted ? ( localize(
-                    7567,
+                    7647,
                     "You trust the authors of the files in the current folder. All features are enabled:"
                 )) :
                     ( localize(
-                        7568,
+                        7648,
                         "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(7569, "In a Trusted Workspace")) : ( localize(7563, "In Restricted Mode"));
+            case 3 : {
+                title = trusted ? ( localize(7649, "In a Trusted Workspace")) : ( localize(7643, "In Restricted Mode"));
                 subTitle = trusted ? ( localize(
-                    7570,
+                    7650,
                     "You trust the authors of the files in the current workspace. All features are enabled:"
                 )) :
                     ( localize(
-                        7571,
+                        7651,
                         "You do not trust the authors of the files in the current workspace. The following features are disabled:"
                     ));
                 break;
@@ -738,17 +735,17 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         const headerDescriptionText = append(this.headerDescription, $('div'));
         headerDescriptionText.innerText = isWorkspaceTrusted ?
             ( localize(
-                7572,
+                7652,
                 "All features are enabled because trust has been granted to the workspace."
             )) :
             ( localize(
-                7573,
+                7653,
                 "{0} is in a restricted mode intended for safe code browsing.",
                 this.productService.nameShort
             ));
         const headerDescriptionActions = append(this.headerDescription, $('div'));
         const headerDescriptionActionsText = ( localize(
-            7574,
+            7654,
             "[Configure your settings]({0}) or [learn more](https://aka.ms/vscode-workspace-trust).",
             `command:workbench.trust.configure`
         ));
@@ -761,12 +758,12 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
             }
         }
         this.headerContainer.className = this.getHeaderContainerClass(isWorkspaceTrusted);
-        this.rootElement.setAttribute('aria-label', `${( localize(7575, "Manage Workspace Trust"))}:  ${this.headerContainer.innerText}`);
+        this.rootElement.setAttribute('aria-label', `${( localize(7655, "Manage Workspace Trust"))}:  ${this.headerContainer.innerText}`);
         const restrictedSettings = this.configurationService.restrictedSettings;
         const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
         const settingsRequiringTrustedWorkspaceCount = restrictedSettings.default.filter(key => {
             const property = configurationRegistry.getConfigurationProperties()[key];
-            if (property.scope === ConfigurationScope.APPLICATION || property.scope === ConfigurationScope.MACHINE) {
+            if (property.scope === 1  || property.scope === 2 ) {
                 return false;
             }
             if (property.deprecationMessage || property.markdownDeprecationMessage) {
@@ -796,8 +793,8 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         const localExtensions = ( (this.extensionWorkbenchService.local.filter(ext => ext.local).map(ext => ext.local)));
         for (const extension of localExtensions) {
             const enablementState = this.extensionEnablementService.getEnablementState(extension);
-            if (enablementState !== EnablementState.EnabledGlobally && enablementState !== EnablementState.EnabledWorkspace &&
-                enablementState !== EnablementState.DisabledByTrustRequirement && enablementState !== EnablementState.DisabledByExtensionDependency) {
+            if (enablementState !== 9  && enablementState !== 10  &&
+                enablementState !== 0  && enablementState !== 6 ) {
                 continue;
             }
             if (inVirtualWorkspace && this.extensionManifestPropertiesService.getExtensionVirtualWorkspaceSupportType(extension.manifest) === false) {
@@ -826,7 +823,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
     createConfigurationElement(parent) {
         this.configurationContainer = append(parent, $('.workspace-trust-settings', { tabIndex: '0' }));
         const configurationTitle = append(this.configurationContainer, $('.workspace-trusted-folders-title'));
-        configurationTitle.innerText = ( localize(7544, "Trusted Folders & Workspaces"));
+        configurationTitle.innerText = ( localize(7624, "Trusted Folders & Workspaces"));
         this.workspaceTrustedUrisTable = this._register(this.instantiationService.createInstance(WorkspaceTrustedUrisTable, this.configurationContainer));
     }
     createAffectedFeaturesElement(parent) {
@@ -839,43 +836,43 @@ 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 ?
+        const trustedContainerItems = this.workspaceService.getWorkbenchState() === 1  ?
             [
-                ( localize(7576, "Tasks are allowed to run")),
-                ( localize(7577, "Debugging is enabled")),
-                ( localize(7578, "All enabled extensions are activated"))
+                ( localize(7656, "Tasks are allowed to run")),
+                ( localize(7657, "Debugging is enabled")),
+                ( localize(7658, "All enabled extensions are activated"))
             ] :
             [
-                ( localize(7576, "Tasks are allowed to run")),
-                ( localize(7577, "Debugging is enabled")),
-                ( localize(7579, "All workspace settings are applied")),
-                ( localize(7578, "All enabled extensions are activated"))
+                ( localize(7656, "Tasks are allowed to run")),
+                ( localize(7657, "Debugging is enabled")),
+                ( localize(7659, "All workspace settings are applied")),
+                ( localize(7658, "All enabled extensions are activated"))
             ];
         this.renderLimitationsListElement(this.trustedContainer, trustedContainerItems, ThemeIcon.asClassNameArray(checkListIcon));
         const [untrustedTitle, untrustedSubTitle] = this.getFeaturesHeaderText(false);
         this.renderLimitationsHeaderElement(this.untrustedContainer, untrustedTitle, untrustedSubTitle);
-        const untrustedContainerItems = this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY ?
+        const untrustedContainerItems = this.workspaceService.getWorkbenchState() === 1  ?
             [
-                ( localize(7580, "Tasks are not allowed to run")),
-                ( localize(7581, "Debugging is disabled")),
+                ( localize(7660, "Tasks are not allowed to run")),
+                ( localize(7661, "Debugging is disabled")),
                 fixBadLocalizedLinks(( localize(
-                    7582,
+                    7662,
                     "[{0} extensions]({1}) are disabled or have limited functionality",
                     numExtensions,
                     `command:${LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID}`
                 )))
             ] :
             [
-                ( localize(7580, "Tasks are not allowed to run")),
-                ( localize(7581, "Debugging is disabled")),
+                ( localize(7660, "Tasks are not allowed to run")),
+                ( localize(7661, "Debugging is disabled")),
                 fixBadLocalizedLinks(numSettings ? ( localize(
-                    7583,
+                    7663,
                     "[{0} workspace settings]({1}) are not applied",
                     numSettings,
                     'command:settings.filterUntrusted'
-                )) : ( localize(7584, "Workspace settings requiring trust are not applied"))),
+                )) : ( localize(7664, "Workspace settings requiring trust are not applied"))),
                 fixBadLocalizedLinks(( localize(
-                    7582,
+                    7662,
                     "[{0} extensions]({1}) are disabled or have limited functionality",
                     numExtensions,
                     `command:${LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID}`
@@ -905,7 +902,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(7585, "Keyboard Shortcut: {0}", keybinding.getAriaLabel()));
+            button.element.ariaLabel = action.label + ', ' + ( localize(7665, "Keyboard Shortcut: {0}", keybinding.getAriaLabel()));
             this.rerenderDisposables.add(button.onDidClick(e => {
                 if (e) {
                     EventHelper.stop(e, true);
@@ -915,7 +912,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         }
     }
     addTrustButtonToElement(parent) {
-        const trustAction = ( (new Action('workspace.trust.button.action.grant', ( localize(7586, "Trust")), undefined, true, async () => {
+        const trustAction = ( (new Action('workspace.trust.button.action.grant', ( localize(7666, "Trust")), undefined, true, async () => {
             await this.workspaceTrustManagementService.setWorkspaceTrust(true);
         })));
         const trustActions = [{ action: trustAction, keybinding: this.keybindingService.resolveUserBinding(isMacintosh ? 'Cmd+Enter' : 'Ctrl+Enter')[0] }];
@@ -924,11 +921,11 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
             const name = basename(dirname(workspaceIdentifier.uri));
             const trustMessageElement = append(parent, $('.trust-message-box'));
             trustMessageElement.innerText = ( localize(
-                7587,
+                7667,
                 "Trust the authors of all files in the current folder or its parent '{0}'.",
                 name
             ));
-            const trustParentAction = ( (new Action('workspace.trust.button.action.grantParent', ( localize(7588, "Trust Parent")), undefined, true, async () => {
+            const trustParentAction = ( (new Action('workspace.trust.button.action.grantParent', ( localize(7668, "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] });
@@ -937,28 +934,28 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
     }
     addDontTrustButtonToElement(parent) {
         this.createButtonRow(parent, [{
-                action: ( (new Action('workspace.trust.button.action.deny', ( localize(7589, "Don't Trust")), undefined, true, async () => {
+                action: ( (new Action('workspace.trust.button.action.deny', ( localize(7669, "Don't Trust")), undefined, true, async () => {
                     await this.workspaceTrustManagementService.setWorkspaceTrust(false);
                 }))),
                 keybinding: this.keybindingService.resolveUserBinding(isMacintosh ? 'Cmd+Enter' : 'Ctrl+Enter')[0]
             }]);
     }
     addTrustedTextToElement(parent) {
-        if (this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY) {
+        if (this.workspaceService.getWorkbenchState() === 1 ) {
             return;
         }
         const textElement = append(parent, $('.workspace-trust-untrusted-description'));
         if (!this.workspaceTrustManagementService.isWorkspaceTrustForced()) {
-            textElement.innerText = this.workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE ? ( localize(
-                7590,
+            textElement.innerText = this.workspaceService.getWorkbenchState() === 3  ? ( localize(
+                7670,
                 "This workspace is trusted via the bolded entries in the trusted folders below."
             )) : ( localize(
-                7591,
+                7671,
                 "This folder is trusted via the bolded entries in the the trusted folders below."
             ));
         }
         else {
-            textElement.innerText = ( localize(7592, "This window is trusted by nature of the workspace that is opened."));
+            textElement.innerText = ( localize(7672, "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 CHANGED Viewed

@@ -3,10 +3,9 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize } from 'vscode/vscode/vs/nls';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
-import { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
-const WorkspaceTrustEditorIcon = registerIcon('workspace-trust-editor-label-icon', Codicon.shield, ( localize(7593, 'Icon of the workspace trust editor label.')));
+const WorkspaceTrustEditorIcon = registerIcon('workspace-trust-editor-label-icon', Codicon.shield, ( localize(7673, 'Icon of the workspace trust editor label.')));
 class WorkspaceTrustEditorInput extends EditorInput {
     constructor() {
         super(...arguments);
@@ -17,7 +16,7 @@ class WorkspaceTrustEditorInput extends EditorInput {
     }
     static { this.ID = 'workbench.input.workspaceTrust'; }
     get capabilities() {
-        return EditorInputCapabilities.Readonly | EditorInputCapabilities.Singleton;
+        return 2  | 8 ;
     }
     get typeId() {
         return WorkspaceTrustEditorInput.ID;
@@ -26,7 +25,7 @@ class WorkspaceTrustEditorInput extends EditorInput {
         return super.matches(otherInput) || otherInput instanceof WorkspaceTrustEditorInput;
     }
     getName() {
-        return ( localize(7594, "Workspace Trust"));
+        return ( localize(7674, "Workspace Trust"));
     }
     getIcon() {
         return WorkspaceTrustEditorIcon;