@codingame/monaco-vscode-workspace-trust-service-override 5.3.0 → 6.0.0

package/package.json

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

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

@@ -4,18 +4,21 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$1, ConfigurationScope } 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 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 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';
@@ -23,11 +26,12 @@ 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, isEmptyWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, WorkbenchState, 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';
@@ -36,6 +40,7 @@ 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';
@@ -67,7 +72,7 @@ WorkspaceTrustContextKeys = ( (__decorate([
     ( (__param(1, IWorkspaceTrustEnablementService))),
     ( (__param(2, IWorkspaceTrustManagementService)))
 ], WorkspaceTrustContextKeys)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspaceTrustContextKeys, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspaceTrustContextKeys, LifecyclePhase.Restored);
 let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Disposable {
     static { this.ID = 'workbench.contrib.workspaceTrustRequestHandler'; }
     constructor(dialogService, commandService, workspaceContextService, workspaceTrustManagementService, workspaceTrustRequestService) {
@@ -86,7 +91,7 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
         this._register(this.workspaceTrustRequestService.onDidInitiateOpenFilesTrustRequest(async () => {
             await this.workspaceTrustManagementService.workspaceResolved;
             const markdownDetails = [
-                this.workspaceContextService.getWorkbenchState() !== 1  ?
+                this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY ?
                     ( localizeWithPath(
                         _moduleId,
                         0,
@@ -105,21 +110,21 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
             ];
             await this.dialogService.prompt({
                 type: Severity$1.Info,
-                message: this.workspaceContextService.getWorkbenchState() !== 1  ?
+                message: this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY ?
                     ( localizeWithPath(_moduleId, 3, "Do you want to allow untrusted files in this workspace?")) :
                     ( localizeWithPath(_moduleId, 4, "Do you want to allow untrusted files in this window?")),
                 buttons: [
                     {
                         label: ( localizeWithPath(_moduleId, 5, "&&Open")),
-                        run: ({ checkboxChecked }) => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(1 , !!checkboxChecked)
+                        run: ({ checkboxChecked }) => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(WorkspaceTrustUriResponse.Open, !!checkboxChecked)
                     },
                     {
                         label: ( localizeWithPath(_moduleId, 6, "Open in &&Restricted Mode")),
-                        run: ({ checkboxChecked }) => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(2 , !!checkboxChecked)
+                        run: ({ checkboxChecked }) => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(WorkspaceTrustUriResponse.OpenInNewWindow, !!checkboxChecked)
                     }
                 ],
                 cancelButton: {
-                    run: () => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(3 )
+                    run: () => this.workspaceTrustRequestService.completeOpenFilesTrustRequest(WorkspaceTrustUriResponse.Cancel)
                 },
                 checkbox: {
                     label: ( localizeWithPath(_moduleId, 7, "Remember my decision for all workspaces")),
@@ -328,7 +333,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                     "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: 2  })}\`` : '',
+                    `\`${this.labelService.getWorkspaceLabel(workspaceIdentifier, { verbose: Verbosity.LONG })}\`` : '',
             ], checkboxText);
         }));
     }
@@ -381,7 +386,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 markdownDetails: ( (markdownStrings.map(md => { return { markdown: ( (new MarkdownString(md))) }; })))
             }
         });
-        this.storageService.store(STARTUP_PROMPT_SHOWN_KEY, true, 1 , 1 );
+        this.storageService.store(STARTUP_PROMPT_SHOWN_KEY, true, StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
     async showModalOnStart() {
         if (this.workspaceTrustManagementService.isWorkspaceTrusted()) {
@@ -395,7 +400,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             this.updateWorkbenchIndicators(false);
             return;
         }
-        if (this.workspaceContextService.getWorkbenchState() === 1 ) {
+        if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY) {
             this.updateWorkbenchIndicators(false);
             return;
         }
@@ -403,7 +408,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             this.updateWorkbenchIndicators(false);
             return;
         }
-        if (this.startupPromptSetting === 'once' && this.storageService.getBoolean(STARTUP_PROMPT_SHOWN_KEY, 1 , false)) {
+        if (this.startupPromptSetting === 'once' && this.storageService.getBoolean(STARTUP_PROMPT_SHOWN_KEY, StorageScope.WORKSPACE, false)) {
             this.updateWorkbenchIndicators(false);
             return;
         }
@@ -433,7 +438,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         });
     }
     getBannerItem(restrictedMode) {
-        const dismissedRestricted = this.storageService.getBoolean(BANNER_RESTRICTED_MODE_DISMISSED_KEY, 1 , false);
+        const dismissedRestricted = this.storageService.getBoolean(BANNER_RESTRICTED_MODE_DISMISSED_KEY, StorageScope.WORKSPACE, false);
         if (this.bannerSetting === 'never') {
             return undefined;
         }
@@ -458,26 +463,26 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             actions,
             onClose: () => {
                 if (restrictedMode) {
-                    this.storageService.store(BANNER_RESTRICTED_MODE_DISMISSED_KEY, true, 1 , 1 );
+                    this.storageService.store(BANNER_RESTRICTED_MODE_DISMISSED_KEY, true, StorageScope.WORKSPACE, StorageTarget.MACHINE);
                 }
             }
         };
     }
     getBannerItemAriaLabels() {
         switch (this.workspaceContextService.getWorkbenchState()) {
-            case 1 :
+            case WorkbenchState.EMPTY:
                 return ( localizeWithPath(
                     _moduleId,
                     31,
                     "Restricted Mode is intended for safe code browsing. Trust this window to enable all features. Use navigation keys to access banner actions."
                 ));
-            case 2 :
+            case WorkbenchState.FOLDER:
                 return ( localizeWithPath(
                     _moduleId,
                     32,
                     "Restricted Mode is intended for safe code browsing. Trust this folder to enable all features. Use navigation keys to access banner actions."
                 ));
-            case 3 :
+            case WorkbenchState.WORKSPACE:
                 return ( localizeWithPath(
                     _moduleId,
                     33,
@@ -487,19 +492,19 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
     }
     getBannerItemMessages() {
         switch (this.workspaceContextService.getWorkbenchState()) {
-            case 1 :
+            case WorkbenchState.EMPTY:
                 return ( localizeWithPath(
                     _moduleId,
                     34,
                     "Restricted Mode is intended for safe code browsing. Trust this window to enable all features."
                 ));
-            case 2 :
+            case WorkbenchState.FOLDER:
                 return ( localizeWithPath(
                     _moduleId,
                     35,
                     "Restricted Mode is intended for safe code browsing. Trust this folder to enable all features."
                 ));
-            case 3 :
+            case WorkbenchState.WORKSPACE:
                 return ( localizeWithPath(
                     _moduleId,
                     36,
@@ -518,7 +523,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         let ariaLabel = '';
         let toolTip;
         switch (this.workspaceContextService.getWorkbenchState()) {
-            case 1 : {
+            case WorkbenchState.EMPTY: {
                 ariaLabel = ( localizeWithPath(
                     _moduleId,
                     37,
@@ -537,7 +542,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 };
                 break;
             }
-            case 2 : {
+            case WorkbenchState.FOLDER: {
                 ariaLabel = ( localizeWithPath(
                     _moduleId,
                     39,
@@ -556,7 +561,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 };
                 break;
             }
-            case 3 : {
+            case WorkbenchState.WORKSPACE: {
                 ariaLabel = ( localizeWithPath(
                     _moduleId,
                     41,
@@ -592,7 +597,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, 0 , 0.99 * Number.MAX_VALUE );
+            this.statusbarEntryAccessor.value = this.statusbarService.addEntry(entry, this.entryId, StatusbarAlignment.LEFT, 0.99 * Number.MAX_VALUE );
         }
     }
 };
@@ -613,8 +618,8 @@ WorkspaceTrustUXHandler = ( (__decorate([
     ( (__param(13, IEnvironmentService))),
     ( (__param(14, IFileService)))
 ], WorkspaceTrustUXHandler)));
-registerWorkbenchContribution2(WorkspaceTrustRequestHandler.ID, WorkspaceTrustRequestHandler, 2 );
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspaceTrustUXHandler, 3 );
+registerWorkbenchContribution2(WorkspaceTrustRequestHandler.ID, WorkspaceTrustRequestHandler, WorkbenchPhase.BlockRestore);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspaceTrustUXHandler, LifecyclePhase.Restored);
 class WorkspaceTrustEditorInputSerializer {
     canSerialize(editorInput) {
         return true;
@@ -684,7 +689,7 @@ registerAction2(class extends Action2 {
                 "Controls whether or not Workspace Trust is enabled within VS Code."
             )),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
         },
         [WORKSPACE_TRUST_STARTUP_PROMPT]: {
             type: 'string',
@@ -695,7 +700,7 @@ registerAction2(class extends Action2 {
                 "Controls when the startup prompt to trust a workspace is shown."
             )),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             enum: ['always', 'once', 'never'],
             enumDescriptions: [
                 ( localizeWithPath(
@@ -720,7 +725,7 @@ registerAction2(class extends Action2 {
             default: 'untilDismissed',
             description: ( localizeWithPath(_moduleId, 54, "Controls when the restricted mode banner is shown.")),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             enum: ['always', 'untilDismissed', 'never'],
             enumDescriptions: [
                 ( localizeWithPath(
@@ -750,7 +755,7 @@ registerAction2(class extends Action2 {
                 WORKSPACE_TRUST_EMPTY_WINDOW
             )),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             enum: ['prompt', 'open', 'newWindow'],
             enumDescriptions: [
                 ( localizeWithPath(
@@ -780,7 +785,7 @@ registerAction2(class extends Action2 {
                 WORKSPACE_TRUST_UNTRUSTED_FILES
             )),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
-            scope: 1
+            scope: ConfigurationScope.APPLICATION
         }
     }
 });
@@ -850,6 +855,6 @@ WorkspaceTrustTelemetryContribution = ( (__decorate([
     ( (__param(4, IWorkspaceTrustManagementService)))
 ], WorkspaceTrustTelemetryContribution)));
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(WorkspaceTrustTelemetryContribution, 3 );
+    .registerWorkbenchContribution(WorkspaceTrustTelemetryContribution, LifecyclePhase.Restored);
 
 export { WorkspaceTrustContextKeys, WorkspaceTrustRequestHandler, WorkspaceTrustUXHandler };

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

@@ -2,19 +2,21 @@ 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 { InputBox } from 'vscode/vscode/vs/base/browser/ui/inputbox/inputBox';
+import { MessageType, 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 { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, ConfigurationScope } 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';
@@ -36,7 +38,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 { toWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { WorkbenchState, 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';
@@ -49,6 +51,7 @@ 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';
@@ -270,7 +273,7 @@ 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: 2 ,
+                    type: MessageType.WARNING,
                     content: ( localizeWithPath(
                         _moduleId,
                         16,
@@ -281,7 +284,7 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
             }
             if (segments.length === 1) {
                 return {
-                    type: 2 ,
+                    type: MessageType.WARNING,
                     content: ( localizeWithPath(
                         _moduleId,
                         17,
@@ -293,7 +296,7 @@ let WorkspaceTrustedUrisTable = class WorkspaceTrustedUrisTable extends Disposab
             }
             if (segments.length > 2) {
                 return {
-                    type: 3 ,
+                    type: MessageType.ERROR,
                     content: ( localizeWithPath(
                         _moduleId,
                         18,
@@ -404,6 +407,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
     }
     createEditAction(item) {
         return {
+            label: '',
             class: ThemeIcon.asClassName(editIcon),
             enabled: true,
             id: 'editTrustedUri',
@@ -415,6 +419,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
     }
     createPickerAction(item) {
         return {
+            label: '',
             class: ThemeIcon.asClassName(folderPickerIcon),
             enabled: true,
             id: 'pickerTrustedUri',
@@ -426,6 +431,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
     }
     createDeleteAction(item) {
         return {
+            label: '',
             class: ThemeIcon.asClassName(removeIcon),
             enabled: true,
             id: 'deleteTrustedUri',
@@ -503,11 +509,11 @@ let TrustedUriPathColumnRenderer = class TrustedUriPathColumnRenderer {
         };
         templateData.renderDisposables.add(addStandardDisposableListener(templateData.pathInput.inputElement, EventType.KEY_DOWN, e => {
             let handled = false;
-            if (e.equals(3 )) {
+            if (e.equals(KeyCode.Enter)) {
                 accept();
                 handled = true;
             }
-            else if (e.equals(9 )) {
+            else if (e.equals(KeyCode.Escape)) {
                 reject();
                 handled = true;
             }
@@ -607,8 +613,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: 2 ,
-            vertical: 1 ,
+            horizontal: ScrollbarVisibility.Hidden,
+            vertical: ScrollbarVisibility.Auto,
         }))));
         append(this.rootElement, this.bodyScrollBar.getDomNode());
         this.createAffectedFeaturesElement(scrollableContent);
@@ -619,16 +625,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(16 ) || event.equals(18 )) {
+            if (event.equals(KeyCode.UpArrow) || event.equals(KeyCode.DownArrow)) {
                 const navOrder = [this.headerContainer, this.trustedContainer, this.untrustedContainer, this.configurationContainer];
                 const currentIndex = navOrder.findIndex(element => {
                     return isAncestorOfActiveElement(element);
                 });
                 let newIndex = currentIndex;
-                if (event.equals(18 )) {
+                if (event.equals(KeyCode.DownArrow)) {
                     newIndex++;
                 }
-                else if (event.equals(16 )) {
+                else if (event.equals(KeyCode.UpArrow)) {
                     newIndex = Math.max(0, newIndex);
                     newIndex--;
                 }
@@ -636,15 +642,15 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
                 newIndex %= navOrder.length;
                 navOrder[newIndex].focus();
             }
-            else if (event.equals(9 )) {
+            else if (event.equals(KeyCode.Escape)) {
                 this.rootElement.focus();
             }
-            else if (event.equals(2048  | 3 )) {
+            else if (event.equals(KeyMod.CtrlCmd | KeyCode.Enter)) {
                 if (this.workspaceTrustManagementService.canSetWorkspaceTrust()) {
                     this.workspaceTrustManagementService.setWorkspaceTrust(!this.workspaceTrustManagementService.isWorkspaceTrusted());
                 }
             }
-            else if (event.equals(2048  | 1024  | 3 )) {
+            else if (event.equals(KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter)) {
                 if (this.workspaceTrustManagementService.canSetParentFolderTrust()) {
                     this.workspaceTrustManagementService.setParentFolderTrust(true);
                 }
@@ -682,11 +688,11 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
                 return ( localizeWithPath(_moduleId, 23, "This window is trusted"));
             }
             switch (this.workspaceService.getWorkbenchState()) {
-                case 1 :
+                case WorkbenchState.EMPTY:
                     return ( localizeWithPath(_moduleId, 24, "You trust this window"));
-                case 2 :
+                case WorkbenchState.FOLDER:
                     return ( localizeWithPath(_moduleId, 25, "You trust this folder"));
-                case 3 :
+                case WorkbenchState.WORKSPACE:
                     return ( localizeWithPath(_moduleId, 26, "You trust this workspace"));
             }
         }
@@ -699,7 +705,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         let title = '';
         let subTitle = '';
         switch (this.workspaceService.getWorkbenchState()) {
-            case 1 : {
+            case WorkbenchState.EMPTY: {
                 title = trusted ? ( localizeWithPath(_moduleId, 28, "In a Trusted Window")) : ( localizeWithPath(_moduleId, 29, "In Restricted Mode"));
                 subTitle = trusted ? ( localizeWithPath(
                     _moduleId,
@@ -713,7 +719,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
                     ));
                 break;
             }
-            case 2 : {
+            case WorkbenchState.FOLDER: {
                 title = trusted ? ( localizeWithPath(_moduleId, 32, "In a Trusted Folder")) : ( localizeWithPath(_moduleId, 29, "In Restricted Mode"));
                 subTitle = trusted ? ( localizeWithPath(
                     _moduleId,
@@ -727,7 +733,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
                     ));
                 break;
             }
-            case 3 : {
+            case WorkbenchState.WORKSPACE: {
                 title = trusted ? ( localizeWithPath(_moduleId, 35, "In a Trusted Workspace")) : ( localizeWithPath(_moduleId, 29, "In Restricted Mode"));
                 subTitle = trusted ? ( localizeWithPath(
                     _moduleId,
@@ -791,7 +797,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
         const settingsRequiringTrustedWorkspaceCount = restrictedSettings.default.filter(key => {
             const property = configurationRegistry.getConfigurationProperties()[key];
-            if (property.scope === 1  || property.scope === 2 ) {
+            if (property.scope === ConfigurationScope.APPLICATION || property.scope === ConfigurationScope.MACHINE) {
                 return false;
             }
             if (property.deprecationMessage || property.markdownDeprecationMessage) {
@@ -821,8 +827,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 !== 8  && enablementState !== 9  &&
-                enablementState !== 0  && enablementState !== 5 ) {
+            if (enablementState !== EnablementState.EnabledGlobally && enablementState !== EnablementState.EnabledWorkspace &&
+                enablementState !== EnablementState.DisabledByTrustRequirement && enablementState !== EnablementState.DisabledByExtensionDependency) {
                 continue;
             }
             if (inVirtualWorkspace && this.extensionManifestPropertiesService.getExtensionVirtualWorkspaceSupportType(extension.manifest) === false) {
@@ -864,7 +870,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() === 1  ?
+        const trustedContainerItems = this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY ?
             [
                 ( localizeWithPath(_moduleId, 42, "Tasks are allowed to run")),
                 ( localizeWithPath(_moduleId, 43, "Debugging is enabled")),
@@ -879,7 +885,7 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
         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() === 1  ?
+        const untrustedContainerItems = this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY ?
             [
                 ( localizeWithPath(_moduleId, 46, "Tasks are not allowed to run")),
                 ( localizeWithPath(_moduleId, 47, "Debugging is disabled")),
@@ -973,12 +979,12 @@ let WorkspaceTrustEditor = class WorkspaceTrustEditor extends EditorPane {
             }]);
     }
     addTrustedTextToElement(parent) {
-        if (this.workspaceService.getWorkbenchState() === 1 ) {
+        if (this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY) {
             return;
         }
         const textElement = append(parent, $('.workspace-trust-untrusted-description'));
         if (!this.workspaceTrustManagementService.isWorkspaceTrustForced()) {
-            textElement.innerText = this.workspaceService.getWorkbenchState() === 3  ? ( localizeWithPath(
+            textElement.innerText = this.workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE ? ( localizeWithPath(
                 _moduleId,
                 56,
                 "This workspace is trusted via the bolded entries in the trusted folders below."

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

@@ -3,6 +3,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localizeWithPath } 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 _moduleId = "vs/workbench/services/workspaces/browser/workspaceTrustEditorInput";
@@ -17,7 +18,7 @@ class WorkspaceTrustEditorInput extends EditorInput {
     }
     static { this.ID = 'workbench.input.workspaceTrust'; }
     get capabilities() {
-        return 2  | 8 ;
+        return EditorInputCapabilities.Readonly | EditorInputCapabilities.Singleton;
     }
     get typeId() {
         return WorkspaceTrustEditorInput.ID;