@codingame/monaco-vscode-api 2.2.2 → 3.1.0

package/vscode/src/vs/workbench/contrib/debug/common/debugVisualizers.js

@@ -7,7 +7,7 @@ import { createDecorator } from '../../../../platform/instantiation/common/insta
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_VALUE, CONTEXT_VARIABLE_TYPE } from './debug.js';
 import { getContextForVariable } from './debugContext.js';
-import { Variable, Scope } from './debugModel.js';
+import { Variable, VisualizedExpression, Scope } from './debugModel.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
 const IDebugVisualizerService = ( createDecorator('debugVisualizerService'));
@@ -32,12 +32,14 @@ class DebugVisualizer {
         await this.handle.executeDebugVisualizerCommand(this.viz.id);
     }
 }
+const emptyRef = { object: [], dispose: () => { } };
 let DebugVisualizerService = class DebugVisualizerService {
     constructor(contextKeyService, extensionService, logService) {
         this.contextKeyService = contextKeyService;
         this.extensionService = extensionService;
         this.logService = logService;
         this.handles = ( new Map());
+        this.trees = ( new Map());
         this.didActivate = ( new Map());
         this.registrations = [];
         visualizersExtensionPoint.setHandler((_, { added, removed }) => {
@@ -46,31 +48,14 @@ let DebugVisualizerService = class DebugVisualizerService {
         });
     }
     async getApplicableFor(variable, token) {
+        if (!(variable instanceof Variable)) {
+            return emptyRef;
+        }
         const threadId = variable.getThreadId();
         if (threadId === undefined) {
-            return { object: [], dispose: () => { } };
-        }
-        const context = {
-            sessionId: variable.getSession()?.getId() || '',
-            containerId: variable.parent.getId(),
-            threadId,
-            variable: {
-                name: variable.name,
-                value: variable.value,
-                type: variable.type,
-                evaluateName: variable.evaluateName,
-                variablesReference: variable.reference || 0,
-                indexedVariables: variable.indexedVariables,
-                memoryReference: variable.memoryReference,
-                namedVariables: variable.namedVariables,
-                presentationHint: variable.presentationHint,
-            }
-        };
-        for (let p = variable; p instanceof Variable; p = p.parent) {
-            if (p.parent instanceof Scope) {
-                context.frameId = p.parent.stackFrame.frameId;
-            }
+            return emptyRef;
         }
+        const context = this.getVariableContext(threadId, variable);
         const overlay = getContextForVariable(this.contextKeyService, variable, [
             [CONTEXT_VARIABLE_NAME.key, variable.name],
             [CONTEXT_VARIABLE_VALUE.key, variable.value],
@@ -110,6 +95,68 @@ let DebugVisualizerService = class DebugVisualizerService {
         this.handles.set(key, handle);
         return toDisposable(() => this.handles.delete(key));
     }
+    registerTree(treeId, handle) {
+        this.trees.set(treeId, handle);
+        return toDisposable(() => this.trees.delete(treeId));
+    }
+    async getVisualizedNodeFor(treeId, expr) {
+        if (!(expr instanceof Variable)) {
+            return;
+        }
+        const threadId = expr.getThreadId();
+        if (threadId === undefined) {
+            return;
+        }
+        const tree = this.trees.get(treeId);
+        if (!tree) {
+            return;
+        }
+        try {
+            const treeItem = await tree.getTreeItem(this.getVariableContext(threadId, expr));
+            if (!treeItem) {
+                return;
+            }
+            return ( new VisualizedExpression(this, treeId, treeItem, expr));
+        }
+        catch (e) {
+            this.logService.warn('Failed to get visualized node', e);
+            return;
+        }
+    }
+    async getVisualizedChildren(treeId, treeElementId) {
+        const children = (await this.trees.get(treeId)?.getChildren(treeElementId)) || [];
+        return ( children.map(c => ( new VisualizedExpression(this, treeId, c, undefined))));
+    }
+    async editTreeItem(treeId, treeItem, newValue) {
+        const newItem = await this.trees.get(treeId)?.editItem?.(treeItem.id, newValue);
+        if (newItem) {
+            Object.assign(treeItem, newItem);
+        }
+    }
+    getVariableContext(threadId, variable) {
+        const context = {
+            sessionId: variable.getSession()?.getId() || '',
+            containerId: (variable.parent instanceof Variable ? variable.reference : undefined),
+            threadId,
+            variable: {
+                name: variable.name,
+                value: variable.value,
+                type: variable.type,
+                evaluateName: variable.evaluateName,
+                variablesReference: variable.reference || 0,
+                indexedVariables: variable.indexedVariables,
+                memoryReference: variable.memoryReference,
+                namedVariables: variable.namedVariables,
+                presentationHint: variable.presentationHint,
+            }
+        };
+        for (let p = variable; p instanceof Variable; p = p.parent) {
+            if (p.parent instanceof Scope) {
+                context.frameId = p.parent.stackFrame.frameId;
+            }
+        }
+        return context;
+    }
     processExtensionRegistration(ext) {
         const viz = ext.contributes?.debugVisualizers;
         if (!(viz instanceof Array)) {
@@ -134,7 +181,7 @@ DebugVisualizerService = ( __decorate([
     ( __param(2, ILogService))
 ], DebugVisualizerService));
 const toKey = (extensionId, id) => `${ExtensionIdentifier.toKey(extensionId)}\0${id}`;
-const visualizersExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const visualizersExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'debugVisualizers',
     jsonSchema: {
         type: 'array',
@@ -160,5 +207,5 @@ const visualizersExtensionPoint = ( ExtensionsRegistry.registerExtensionPoint({
             }
         }
     }
-}));
+});
 export { DebugVisualizer, DebugVisualizerService, IDebugVisualizerService };

package/vscode/src/vs/workbench/contrib/editSessions/common/editSessions.js

@@ -5,14 +5,11 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { StringSHA1 } from '../../../../base/common/hash.js';
-const EDIT_SESSION_SYNC_CATEGORY = {
-    original: 'Cloud Changes',
-    value: ( localizeWithPath(
-        'vs/workbench/contrib/editSessions/common/editSessions',
-        'cloud changes',
-        'Cloud Changes'
-    ))
-};
+const EDIT_SESSION_SYNC_CATEGORY = ( localize2WithPath(
+    'vs/workbench/contrib/editSessions/common/editSessions',
+    'cloud changes',
+    'Cloud Changes'
+));
 const IEditSessionsStorageService = ( createDecorator('IEditSessionsStorageService'));
 const IEditSessionsLogService = ( createDecorator('IEditSessionsLogService'));
 var ChangeType;

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js

@@ -64,6 +64,8 @@ import { ILocaleService } from '../../../services/localization/common/locale.js'
 import { isString } from '../../../../base/common/types.js';
 import { showWindowLogActionId } from '../../../services/log/common/logConstants.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { Extensions, IExtensionFeaturesManagementService } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var InstallAction_1, InstallInOtherServerAction_1, UninstallAction_1, ToggleAutoUpdateForExtensionAction_1, ToggleAutoUpdatesForPublisherAction_1, MigrateDeprecatedExtensionAction_1, ManageExtensionAction_1, TogglePreReleaseExtensionAction_1, InstallAnotherVersionAction_1, EnableForWorkspaceAction_1, EnableGloballyAction_1, DisableForWorkspaceAction_1, DisableGloballyAction_1, ReloadAction_1, SetColorThemeAction_1, SetFileIconThemeAction_1, SetProductIconThemeAction_1, SetLanguageAction_1, ClearLanguageAction_1, ShowRecommendedExtensionAction_1, InstallRecommendedExtensionAction_1, IgnoreExtensionRecommendationAction_1, UndoIgnoreExtensionRecommendationAction_1, ExtensionStatusLabelAction_1, ToggleSyncExtensionAction_1, ExtensionStatusAction_1, ReinstallAction_1, InstallSpecificVersionOfExtensionAction_1;
 let PromptExtensionInstallFailureAction = class PromptExtensionInstallFailureAction extends Action {
@@ -942,7 +944,7 @@ UpdateAction = ( __decorate([
 let ToggleAutoUpdateForExtensionAction = class ToggleAutoUpdateForExtensionAction extends ExtensionAction {
     static { ToggleAutoUpdateForExtensionAction_1 = this; }
     static { this.ID = 'workbench.extensions.action.toggleAutoUpdateForExtension'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/extensions/browser/extensionsActions',
         'enableAutoUpdateLabel',
         "Auto Update"
@@ -950,7 +952,7 @@ let ToggleAutoUpdateForExtensionAction = class ToggleAutoUpdateForExtensionActio
     static { this.EnabledClass = `${ExtensionAction.EXTENSION_ACTION_CLASS} auto-update`; }
     static { this.DisabledClass = `${ToggleAutoUpdateForExtensionAction_1.EnabledClass} hide`; }
     constructor(enableWhenOutdated, enableWhenAutoUpdateValue, extensionsWorkbenchService, configurationService) {
-        super(ToggleAutoUpdateForExtensionAction_1.ID, ToggleAutoUpdateForExtensionAction_1.LABEL, ToggleAutoUpdateForExtensionAction_1.DisabledClass);
+        super(ToggleAutoUpdateForExtensionAction_1.ID, ToggleAutoUpdateForExtensionAction_1.LABEL.value, ToggleAutoUpdateForExtensionAction_1.DisabledClass);
         this.enableWhenOutdated = enableWhenOutdated;
         this.enableWhenAutoUpdateValue = enableWhenAutoUpdateValue;
         this.extensionsWorkbenchService = extensionsWorkbenchService;
@@ -2491,7 +2493,7 @@ let ExtensionStatusAction = class ExtensionStatusAction extends ExtensionAction
     static { ExtensionStatusAction_1 = this; }
     static { this.CLASS = `${ExtensionAction.ICON_ACTION_CLASS} extension-status`; }
     get status() { return this._status; }
-    constructor(extensionManagementServerService, labelService, commandService, workspaceTrustEnablementService, workspaceTrustService, extensionsWorkbenchService, extensionService, extensionManifestPropertiesService, contextService, productService, workbenchExtensionEnablementService) {
+    constructor(extensionManagementServerService, labelService, commandService, workspaceTrustEnablementService, workspaceTrustService, extensionsWorkbenchService, extensionService, extensionManifestPropertiesService, contextService, productService, workbenchExtensionEnablementService, extensionFeaturesManagementService) {
         super('extensions.status', '', `${ExtensionStatusAction_1.CLASS} hide`, false);
         this.extensionManagementServerService = extensionManagementServerService;
         this.labelService = labelService;
@@ -2504,12 +2506,14 @@ let ExtensionStatusAction = class ExtensionStatusAction extends ExtensionAction
         this.contextService = contextService;
         this.productService = productService;
         this.workbenchExtensionEnablementService = workbenchExtensionEnablementService;
+        this.extensionFeaturesManagementService = extensionFeaturesManagementService;
         this.updateWhenCounterExtensionChanges = true;
         this._onDidChangeStatus = this._register(( new Emitter()));
         this.onDidChangeStatus = this._onDidChangeStatus.event;
         this.updateThrottler = ( new Throttler());
         this._register(this.labelService.onDidChangeFormatters(() => this.update(), this));
         this._register(this.extensionService.onDidChangeExtensions(() => this.update()));
+        this._register(this.extensionFeaturesManagementService.onDidChangeAccessData(() => this.update()));
         this.update();
     }
     update() {
@@ -2749,6 +2753,26 @@ let ExtensionStatusAction = class ExtensionStatusAction extends ExtensionAction
                 return;
             }
         }
+        const extensionId = ( new ExtensionIdentifier(this.extension.identifier.id));
+        const features = ( Registry.as(Extensions.ExtensionFeaturesRegistry)).getExtensionFeatures();
+        for (const feature of features) {
+            const status = this.extensionFeaturesManagementService.getAccessData(extensionId, feature.id)?.current?.status;
+            const manageAccessLink = `[${( localizeWithPath(
+                'vs/workbench/contrib/extensions/browser/extensionsActions',
+                'manage access',
+                'Manage Access'
+            ))}](${( URI.parse(
+                `command:extension.open?${encodeURIComponent(JSON.stringify([this.extension.identifier.id, "features" , false, feature.id]))}`
+            ))})`;
+            if (status?.severity === Severity.Error) {
+                this.updateStatus({ icon: errorIcon, message: ( new MarkdownString()).appendText(status.message).appendMarkdown(` ${manageAccessLink}`) }, true);
+                return;
+            }
+            if (status?.severity === Severity.Warning) {
+                this.updateStatus({ icon: warningIcon, message: ( new MarkdownString()).appendText(status.message).appendMarkdown(` ${manageAccessLink}`) }, true);
+                return;
+            }
+        }
         if (this.extensionManagementServerService.remoteExtensionManagementServer) {
             if (isLanguagePackExtension(this.extension.local.manifest)) {
                 if (!( this.extensionsWorkbenchService.installed.some(
@@ -2923,7 +2947,8 @@ ExtensionStatusAction = ExtensionStatusAction_1 = ( __decorate([
     ( __param(7, IExtensionManifestPropertiesService)),
     ( __param(8, IWorkspaceContextService)),
     ( __param(9, IProductService)),
-    ( __param(10, IWorkbenchExtensionEnablementService))
+    ( __param(10, IWorkbenchExtensionEnablementService)),
+    ( __param(11, IExtensionFeaturesManagementService))
 ], ExtensionStatusAction));
 let ReinstallAction = class ReinstallAction extends Action {
     static { ReinstallAction_1 = this; }

package/vscode/src/vs/workbench/contrib/files/browser/editors/fileEditorHandler.js

@@ -42,6 +42,7 @@ class FileEditorInputSerializer {
     }
 }
 let FileEditorWorkingCopyEditorHandler = class FileEditorWorkingCopyEditorHandler extends Disposable {
+    static { this.ID = 'workbench.contrib.fileEditorWorkingCopyEditorHandler'; }
     constructor(workingCopyEditorService, textEditorService, fileService) {
         super();
         this.textEditorService = textEditorService;

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.js

@@ -14,6 +14,7 @@ import { UntitledTextEditorInput } from '../../../../services/untitled/common/un
 import { IWorkingCopyEditorService } from '../../../../services/workingCopy/common/workingCopyEditorService.js';
 import { DEFAULT_EDITOR_ASSOCIATION } from '../../../../common/editor.js';
 let TextFileEditorTracker = class TextFileEditorTracker extends Disposable {
+    static { this.ID = 'workbench.contrib.textFileEditorTracker'; }
     constructor(editorService, textFileService, lifecycleService, hostService, codeEditorService, filesConfigurationService, workingCopyEditorService) {
         super();
         this.editorService = editorService;

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js

@@ -34,6 +34,7 @@ const conflictEditorHelp = ( localizeWithPath(
     "Use the actions in the editor tool bar to either undo your changes or overwrite the content of the file with your changes."
 ));
 let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable {
+    static { this.ID = 'workbench.contrib.textFileSaveErrorHandler'; }
     constructor(notificationService, textFileService, contextKeyService, editorService, textModelService, instantiationService, storageService) {
         super();
         this.notificationService = notificationService;
@@ -338,7 +339,7 @@ class DiscardModelAction extends Action {
 }
 let SaveModelAsAction = class SaveModelAsAction extends Action {
     constructor(model, editorService) {
-        super('workbench.files.action.saveModelAs', SAVE_FILE_AS_LABEL);
+        super('workbench.files.action.saveModelAs', SAVE_FILE_AS_LABEL.value);
         this.model = model;
         this.editorService = editorService;
     }

package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/explorerviewlet.css.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { mark } from '../../../../base/common/performance.js';
-import { VIEWLET_ID, VIEW_ID, ExplorerViewletVisibleContext } from '../common/files.js';
+import { VIEW_ID, VIEWLET_ID, ExplorerViewletVisibleContext } from '../common/files.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ExplorerView } from './views/explorerView.js';
 import { EmptyView } from './views/emptyView.js';
@@ -14,7 +14,7 @@ import { IWorkspaceContextService } from '../../../../platform/workspace/common/
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { ViewContentGroups, Extensions, IViewDescriptorService } from '../../../common/views.js';
+import { Extensions, ViewContentGroups, IViewDescriptorService } from '../../../common/views.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
@@ -42,6 +42,7 @@ const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book,
     'View icon of the open editors view.'
 )));
 let ExplorerViewletViewsContribution = class ExplorerViewletViewsContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.explorerViewletViews'; }
     constructor(workspaceContextService, progressService) {
         super();
         this.workspaceContextService = workspaceContextService;
@@ -267,7 +268,7 @@ const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
-        { key: 'noWorkspaceHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
+        { key: 'noWorkspaceHelp', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
         "You have not yet added a folder to the workspace.\n{0}",
         addRootFolderButton
     )),
@@ -280,7 +281,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
-        { key: 'noFolderHelpWeb', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
+        { key: 'noFolderHelpWeb', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
         "You have not yet opened a folder.\n{0}\n{1}",
         openFolderViaWorkspaceButton,
         openRecentButton
@@ -294,7 +295,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
-        { key: 'remoteNoFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
+        { key: 'remoteNoFolderHelp', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
         "Connected to remote.\n{0}",
         openFolderButton
     )),
@@ -308,7 +309,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
-        { key: 'noFolderButEditorsHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
+        { key: 'noFolderButEditorsHelp', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
         "You have not yet opened a folder.\n{0}\nOpening a folder will close all currently open editors. To keep them open, {1} instead.",
         openFolderButton,
         addAFolderButton
@@ -323,7 +324,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
-        { key: 'noFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
+        { key: 'noFolderHelp', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
         "You have not yet opened a folder.\n{0}",
         openFolderButton
     )),