@codingame/monaco-vscode-workspace-trust-service-override 4.5.2 → 5.0.1

package/package.json

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

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

@@ -9,7 +9,6 @@ import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs
 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 { workspaceTrustToString } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
@@ -515,22 +514,20 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         }
         return result;
     }
-    getStatusbarEntry(trusted) {
-        const text = workspaceTrustToString(trusted);
+    getRestrictedModeStatusbarEntry() {
         let ariaLabel = '';
         let toolTip;
         switch (this.workspaceContextService.getWorkbenchState()) {
             case 1 : {
-                ariaLabel = trusted ? ( localizeWithPath(_moduleId, 37, "This window is trusted.")) :
-                    ( localizeWithPath(
-                        _moduleId,
-                        38,
-                        "Restricted Mode: Some features are disabled because this window is not trusted."
-                    ));
-                toolTip = trusted ? ariaLabel : {
+                ariaLabel = ( localizeWithPath(
+                    _moduleId,
+                    37,
+                    "Restricted Mode: Some features are disabled because this window is not trusted."
+                ));
+                toolTip = {
                     value: ( localizeWithPath(
                         _moduleId,
-                        39,
+                        38,
                         "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}`
@@ -541,16 +538,15 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 break;
             }
             case 2 : {
-                ariaLabel = trusted ? ( localizeWithPath(_moduleId, 40, "This folder is trusted.")) :
-                    ( localizeWithPath(
-                        _moduleId,
-                        41,
-                        "Restricted Mode: Some features are disabled because this folder is not trusted."
-                    ));
-                toolTip = trusted ? ariaLabel : {
+                ariaLabel = ( localizeWithPath(
+                    _moduleId,
+                    39,
+                    "Restricted Mode: Some features are disabled because this folder is not trusted."
+                ));
+                toolTip = {
                     value: ( localizeWithPath(
                         _moduleId,
-                        42,
+                        40,
                         "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}`
@@ -561,16 +557,15 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
                 break;
             }
             case 3 : {
-                ariaLabel = trusted ? ( localizeWithPath(_moduleId, 43, "This workspace is trusted.")) :
-                    ( localizeWithPath(
-                        _moduleId,
-                        44,
-                        "Restricted Mode: Some features are disabled because this workspace is not trusted."
-                    ));
-                toolTip = trusted ? ariaLabel : {
+                ariaLabel = ( localizeWithPath(
+                    _moduleId,
+                    41,
+                    "Restricted Mode: Some features are disabled because this workspace is not trusted."
+                ));
+                toolTip = {
                     value: ( localizeWithPath(
                         _moduleId,
-                        45,
+                        42,
                         "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}`
@@ -582,8 +577,8 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             }
         }
         return {
-            name: ( localizeWithPath(_moduleId, 46, "Workspace Trust")),
-            text: trusted ? `$(shield)` : `$(shield) ${text}`,
+            name: ( localizeWithPath(_moduleId, 43, "Workspace Trust")),
+            text: `$(shield) ${( localizeWithPath(_moduleId, 44, "Restricted Mode"))}`,
             ariaLabel: ariaLabel,
             tooltip: toolTip,
             command: MANAGE_TRUST_COMMAND_ID,
@@ -596,7 +591,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
             return;
         }
         if (!trusted && !this.statusbarEntryAccessor.value) {
-            const entry = this.getStatusbarEntry(trusted);
+            const entry = this.getRestrictedModeStatusbarEntry();
             this.statusbarEntryAccessor.value = this.statusbarService.addEntry(entry, this.entryId, 0 , 0.99 * Number.MAX_VALUE );
         }
     }
@@ -633,16 +628,16 @@ class WorkspaceTrustEditorInputSerializer {
 }
 ( (Registry.as(EditorExtensions.EditorFactory)))
     .registerEditorSerializer(WorkspaceTrustEditorInput.ID, WorkspaceTrustEditorInputSerializer);
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WorkspaceTrustEditor, WorkspaceTrustEditor.ID, ( localizeWithPath(_moduleId, 47, "Workspace Trust Editor"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WorkspaceTrustEditor, WorkspaceTrustEditor.ID, ( localizeWithPath(_moduleId, 45, "Workspace Trust Editor"))), [
     ( (new SyncDescriptor(WorkspaceTrustEditorInput)))
 ]);
 const CONFIGURE_TRUST_COMMAND_ID = 'workbench.trust.configure';
-const WORKSPACES_CATEGORY = ( localize2WithPath(_moduleId, 48, 'Workspaces'));
+const WORKSPACES_CATEGORY = ( localize2WithPath(_moduleId, 46, 'Workspaces'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_TRUST_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 49, "Configure Workspace Trust Settings")),
+            title: ( localize2WithPath(_moduleId, 47, "Configure Workspace Trust Settings")),
             precondition: ( (ContextKeyExpr.and(
                 WorkspaceTrustContext.IsEnabled,
                  (ContextKeyExpr.equals(`config.${WORKSPACE_TRUST_ENABLED}`, true))
@@ -659,7 +654,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: MANAGE_TRUST_COMMAND_ID,
-            title: ( localize2WithPath(_moduleId, 50, "Manage Workspace Trust")),
+            title: ( localize2WithPath(_moduleId, 48, "Manage Workspace Trust")),
             precondition: ( (ContextKeyExpr.and(
                 WorkspaceTrustContext.IsEnabled,
                  (ContextKeyExpr.equals(`config.${WORKSPACE_TRUST_ENABLED}`, true))
@@ -685,7 +680,7 @@ registerAction2(class extends Action2 {
             default: true,
             description: ( localizeWithPath(
                 _moduleId,
-                51,
+                49,
                 "Controls whether or not Workspace Trust is enabled within VS Code."
             )),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
@@ -696,7 +691,7 @@ registerAction2(class extends Action2 {
             default: 'once',
             description: ( localizeWithPath(
                 _moduleId,
-                52,
+                50,
                 "Controls when the startup prompt to trust a workspace is shown."
             )),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
@@ -705,17 +700,17 @@ registerAction2(class extends Action2 {
             enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    53,
+                    51,
                     "Ask for trust every time an untrusted workspace is opened."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    54,
+                    52,
                     "Ask for trust the first time an untrusted workspace is opened."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    55,
+                    53,
                     "Do not ask for trust when an untrusted workspace is opened."
                 )),
             ]
@@ -723,24 +718,24 @@ registerAction2(class extends Action2 {
         [WORKSPACE_TRUST_BANNER]: {
             type: 'string',
             default: 'untilDismissed',
-            description: ( localizeWithPath(_moduleId, 56, "Controls when the restricted mode banner is shown.")),
+            description: ( localizeWithPath(_moduleId, 54, "Controls when the restricted mode banner is shown.")),
             tags: [WORKSPACE_TRUST_SETTING_TAG],
             scope: 1 ,
             enum: ['always', 'untilDismissed', 'never'],
             enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    57,
+                    55,
                     "Show the banner every time an untrusted workspace is open."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    58,
+                    56,
                     "Show the banner when an untrusted workspace is opened until dismissed."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    59,
+                    57,
                     "Do not show the banner when an untrusted workspace is open."
                 )),
             ]
@@ -750,7 +745,7 @@ registerAction2(class extends Action2 {
             default: 'prompt',
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                60,
+                58,
                 "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
             )),
@@ -760,17 +755,17 @@ registerAction2(class extends Action2 {
             enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    61,
+                    59,
                     "Ask how to handle untrusted files for each workspace. Once untrusted files are introduced to a trusted workspace, you will not be prompted again."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    62,
+                    60,
                     "Always allow untrusted files to be introduced to a trusted workspace without prompting."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    63,
+                    61,
                     "Always open untrusted files in a separate window in restricted mode without prompting."
                 )),
             ]
@@ -780,7 +775,7 @@ registerAction2(class extends Action2 {
             default: true,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                64,
+                62,
                 "Controls whether or not the empty window is trusted by default within VS Code. When used with `#{0}#`, you can enable the full functionality of VS Code without prompting in an empty window.",
                 WORKSPACE_TRUST_UNTRUSTED_FILES
             )),

package/vscode/src/vs/platform/workspace/common/workspaceTrust.js

@@ -1,13 +0,0 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-
-const _moduleId = "vs/platform/workspace/common/workspaceTrust";
-function workspaceTrustToString(trustState) {
-    if (trustState) {
-        return ( localizeWithPath(_moduleId, 0, "Trusted"));
-    }
-    else {
-        return ( localizeWithPath(_moduleId, 1, "Restricted Mode"));
-    }
-}
-
-export { workspaceTrustToString };