@codingame/monaco-vscode-workspace-trust-service-override 2.2.1 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workspace-trust-service-override",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

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

@@ -10,7 +10,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { workspaceTrustToString, IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+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';
 import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -36,7 +36,7 @@ import { WORKSPACE_TRUST_SETTING_TAG } from 'vscode/vscode/vs/workbench/contrib/
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { WorkspaceTrustContext, MANAGE_TRUST_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/workspace/common/workspace';
+import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from 'vscode/vscode/vs/workbench/contrib/workspace/common/workspace';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
 import { securityConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
@@ -66,6 +66,7 @@ WorkspaceTrustContextKeys = ( __decorate([
 ], WorkspaceTrustContextKeys));
 ( 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) {
         super();
         this.dialogService = dialogService;
@@ -78,9 +79,9 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
     get useWorkspaceLanguage() {
         return !isSingleFolderWorkspaceIdentifier(toWorkspaceIdentifier(this.workspaceContextService.getWorkspace()));
     }
-    async registerListeners() {
-        await this.workspaceTrustManagementService.workspaceResolved;
+    registerListeners() {
         this._register(this.workspaceTrustRequestService.onDidInitiateOpenFilesTrustRequest(async () => {
+            await this.workspaceTrustManagementService.workspaceResolved;
             const markdownDetails = [
                 this.workspaceContextService.getWorkbenchState() !== 1  ?
                     ( localizeWithPath(
@@ -148,6 +149,7 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
             });
         }));
         this._register(this.workspaceTrustRequestService.onDidInitiateWorkspaceTrustRequest(async (requestOptions) => {
+            await this.workspaceTrustManagementService.workspaceResolved;
             const message = this.useWorkspaceLanguage ?
                 ( localizeWithPath(
                     'vs/workbench/contrib/workspace/browser/workspace.contribution',
@@ -262,13 +264,13 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         this.remoteAgentService = remoteAgentService;
         this.environmentService = environmentService;
         this.fileService = fileService;
-        this.entryId = `status.workspaceTrust.${this.workspaceContextService.getWorkspace().id}`;
+        this.entryId = `status.workspaceTrust`;
         this.statusbarEntryAccessor = this._register(( new MutableDisposable()));
         (async () => {
             await this.workspaceTrustManagementService.workspaceTrustInitialized;
             if (this.workspaceTrustEnablementService.isWorkspaceTrustEnabled()) {
                 this.registerListeners();
-                this.createStatusbarEntry();
+                this.updateStatusbarEntry(this.workspaceTrustManagementService.isWorkspaceTrusted());
                 if (this.hostService.hasFocus) {
                     this.showModalOnStart();
                 }
@@ -601,11 +603,6 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         }
         return result;
     }
-    createStatusbarEntry() {
-        const entry = this.getStatusbarEntry(this.workspaceTrustManagementService.isWorkspaceTrusted());
-        this.statusbarEntryAccessor.value = this.statusbarService.addEntry(entry, this.entryId, 0 , 0.99 * Number.MAX_VALUE );
-        this.statusbarService.updateEntryVisibility(this.entryId, false);
-    }
     getStatusbarEntry(trusted) {
         const text = workspaceTrustToString(trusted);
         let ariaLabel = '';
@@ -698,8 +695,14 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
         };
     }
     updateStatusbarEntry(trusted) {
-        this.statusbarEntryAccessor.value?.update(this.getStatusbarEntry(trusted));
-        this.statusbarService.updateEntryVisibility(this.entryId, !trusted);
+        if (trusted && this.statusbarEntryAccessor.value) {
+            this.statusbarEntryAccessor.clear();
+            return;
+        }
+        if (!trusted && !this.statusbarEntryAccessor.value) {
+            const entry = this.getStatusbarEntry(trusted);
+            this.statusbarEntryAccessor.value = this.statusbarService.addEntry(entry, this.entryId, 0 , 0.99 * Number.MAX_VALUE );
+        }
     }
 };
 WorkspaceTrustUXHandler = ( __decorate([
@@ -719,7 +722,7 @@ WorkspaceTrustUXHandler = ( __decorate([
     ( __param(13, IEnvironmentService)),
     ( __param(14, IFileService))
 ], WorkspaceTrustUXHandler));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(WorkspaceTrustRequestHandler, 2 );
+registerWorkbenchContribution2(WorkspaceTrustRequestHandler.ID, WorkspaceTrustRequestHandler, 2 );
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(WorkspaceTrustUXHandler, 3 );
 class WorkspaceTrustEditorInputSerializer {
     canSerialize(editorInput) {
@@ -751,11 +754,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_TRUST_COMMAND_ID,
-            title: { original: 'Configure Workspace Trust Settings', value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/workspace/browser/workspace.contribution',
                 'configureWorkspaceTrustSettings',
                 "Configure Workspace Trust Settings"
-            )) },
+            )),
             precondition: ( ContextKeyExpr.and(WorkspaceTrustContext.IsEnabled, ( ContextKeyExpr.equals(`config.${WORKSPACE_TRUST_ENABLED}`, true)))),
             category: WORKSPACES_CATEGORY,
             f1: true
@@ -769,11 +772,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: MANAGE_TRUST_COMMAND_ID,
-            title: { original: 'Manage Workspace Trust', value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/workspace/browser/workspace.contribution',
                 'manageWorkspaceTrust',
                 "Manage Workspace Trust"
-            )) },
+            )),
             precondition: ( ContextKeyExpr.and(WorkspaceTrustContext.IsEnabled, ( ContextKeyExpr.equals(`config.${WORKSPACE_TRUST_ENABLED}`, true)))),
             category: WORKSPACES_CATEGORY,
             f1: true,

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

@@ -428,7 +428,7 @@ let TrustedUriActionsColumnRenderer = class TrustedUriActionsColumnRenderer {
     }
     renderTemplate(container) {
         const element = container.appendChild($('.actions'));
-        const actionBar = ( new ActionBar(element, { animated: false }));
+        const actionBar = ( new ActionBar(element));
         return { actionBar };
     }
     renderElement(item, index, templateData, height) {