@codingame/monaco-vscode-api 3.2.3 → 4.0.0

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

@@ -8,8 +8,11 @@ import { Emitter } from '../../../../base/common/event.js';
 import { stringHash } from '../../../../base/common/hash.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { mixin } from '../../../../base/common/objects.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/utils.js';
 import { basenameOrAuthority } from '../../../../base/common/resources.js';
-import { isUndefinedOrNull, isString } from '../../../../base/common/types.js';
+import { isString, isUndefinedOrNull } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { Range } from '../../../../editor/common/core/range.js';
@@ -20,7 +23,6 @@ import { DEBUG_MEMORY_SCHEME } from './debug.js';
 import { getUriFromSource, UNKNOWN_SOURCE_LABEL } from './debugSource.js';
 import { DisassemblyViewInput } from './disassemblyViewInput.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 class ExpressionContainer {
     static { this.allValues = ( new Map()); }
     static { this.BASE_CHUNK_SIZE = 100; }
@@ -924,15 +926,37 @@ class FunctionBreakpoint extends BaseBreakpoint {
 class DataBreakpoint extends BaseBreakpoint {
     constructor(opts, id = generateUuid()) {
         super(id, opts);
+        this.sessionDataIdForAddr = ( new WeakMap());
         this.description = opts.description;
-        this.dataId = opts.dataId;
+        if ('dataId' in opts) {
+            opts.src = { type: 0 , dataId: opts.dataId };
+        }
+        this.src = opts.src;
         this.canPersist = opts.canPersist;
         this.accessTypes = opts.accessTypes;
         this.accessType = opts.accessType;
+        if (opts.initialSessionData) {
+            this.sessionDataIdForAddr.set(opts.initialSessionData.session, opts.initialSessionData.dataId);
+        }
     }
-    toDAP() {
+    async toDAP(session) {
+        let dataId;
+        if (this.src.type === 0 ) {
+            dataId = this.src.dataId;
+        }
+        else {
+            let sessionDataId = this.sessionDataIdForAddr.get(session);
+            if (!sessionDataId) {
+                sessionDataId = (await session.dataBytesBreakpointInfo(this.src.address, this.src.bytes))?.dataId;
+                if (!sessionDataId) {
+                    return undefined;
+                }
+                this.sessionDataIdForAddr.set(session, sessionDataId);
+            }
+            dataId = sessionDataId;
+        }
         return {
-            dataId: this.dataId,
+            dataId,
             accessType: this.accessType,
             condition: this.condition,
             hitCondition: this.hitCondition,
@@ -942,7 +966,7 @@ class DataBreakpoint extends BaseBreakpoint {
         return {
             ...super.toJSON(),
             description: this.description,
-            dataId: this.dataId,
+            src: this.src,
             accessTypes: this.accessTypes,
             accessType: this.accessType,
             canPersist: this.canPersist,

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

@@ -1,5 +1,5 @@
 import { Emitter } from '../../../../base/common/event.js';
-import Severity from '../../../../base/common/severity.js';
+import Severity$1 from '../../../../base/common/severity.js';
 import { isObject, isString } from '../../../../base/common/types.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -222,7 +222,7 @@ class ReplModel {
                 'vs/workbench/contrib/debug/common/replModel',
                 'consoleCleared',
                 "Console was cleared"
-            )), sev: Severity.Ignore });
+            )), sev: Severity$1.Ignore });
             output = output.substring(clearAnsiIndex + clearAnsiSequence.length);
         }
         if (expression) {

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

@@ -25,7 +25,17 @@ import { CommandsRegistry, ICommandService } from '../../../../platform/commands
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { registerColor, buttonBackground, buttonForeground, buttonHoverBackground, buttonSeparator, editorErrorForeground, editorWarningForeground, editorInfoForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorErrorForeground, editorWarningForeground, editorInfoForeground } from '../../../../platform/theme/common/colors/editorColors.js';
+import { buttonBackground, buttonForeground, buttonHoverBackground, buttonSeparator } from '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -66,8 +76,9 @@ import { showWindowLogActionId } from '../../../services/log/common/logConstants
 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 { IUpdateService } from '../../../../platform/update/common/update.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;
+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, ExtensionRuntimeStateAction_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 {
     constructor(extension, version, installOperation, error, productService, openerService, notificationService, dialogService, commandService, logService, extensionManagementServerService, instantiationService, galleryService, extensionManifestPropertiesService) {
         super('extension.promptExtensionInstallFailure');
@@ -347,7 +358,7 @@ let InstallAction = class InstallAction extends ExtensionAction {
         this._manifest = manifest;
         this.updateLabel();
     }
-    constructor(options, extensionsWorkbenchService, instantiationService, runtimeExtensionService, workbenchThemeService, labelService, dialogService, preferencesService, telemetryService) {
+    constructor(options, extensionsWorkbenchService, instantiationService, runtimeExtensionService, workbenchThemeService, labelService, dialogService, preferencesService, telemetryService, contextService) {
         super('extensions.install', ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionsActions',
             'install',
@@ -361,6 +372,7 @@ let InstallAction = class InstallAction extends ExtensionAction {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.telemetryService = telemetryService;
+        this.contextService = contextService;
         this._manifest = null;
         this.updateThrottler = ( new Throttler());
         this.options = { ...options, isMachineScoped: false };
@@ -557,6 +569,13 @@ let InstallAction = class InstallAction extends ExtensionAction {
         this.label = this.getLabel();
     }
     getLabel(primary) {
+        if (this.extension?.isWorkspaceScoped && this.extension.resourceExtension && this.contextService.isInsideWorkspace(this.extension.resourceExtension.location)) {
+            return ( localizeWithPath(
+                'vs/workbench/contrib/extensions/browser/extensionsActions',
+                'install workspace version',
+                "Install Workspace Extension"
+            ));
+        }
         if (this.options.installPreReleaseVersion && this.extension?.hasPreReleaseVersion) {
             return primary ? ( localizeWithPath(
                 'vs/workbench/contrib/extensions/browser/extensionsActions',
@@ -594,7 +613,8 @@ InstallAction = InstallAction_1 = ( __decorate([
     ( __param(5, ILabelService)),
     ( __param(6, IDialogService)),
     ( __param(7, IPreferencesService)),
-    ( __param(8, ITelemetryService))
+    ( __param(8, ITelemetryService)),
+    ( __param(9, IWorkspaceContextService))
 ], InstallAction));
 let InstallDropdownAction = class InstallDropdownAction extends ActionWithDropDownAction {
     set manifest(manifest) {
@@ -1135,8 +1155,8 @@ let ExtensionDropDownAction = class ExtensionDropDownAction extends ExtensionAct
         this.instantiationService = instantiationService;
         this._actionViewItem = null;
     }
-    createActionViewItem() {
-        this._actionViewItem = this.instantiationService.createInstance(DropDownMenuActionViewItem, this);
+    createActionViewItem(options) {
+        this._actionViewItem = this.instantiationService.createInstance(DropDownMenuActionViewItem, this, options);
         return this._actionViewItem;
     }
     run({ actionGroups, disposeActionsOnHide }) {
@@ -1148,8 +1168,8 @@ ExtensionDropDownAction = ( __decorate([
     ( __param(4, IInstantiationService))
 ], ExtensionDropDownAction));
 let DropDownMenuActionViewItem = class DropDownMenuActionViewItem extends ActionViewItem {
-    constructor(action, contextMenuService) {
-        super(null, action, { icon: true, label: true });
+    constructor(action, options, contextMenuService) {
+        super(null, action, { ...options, icon: true, label: true });
         this.contextMenuService = contextMenuService;
     }
     showMenu(menuActionGroups, disposeActionsOnHide) {
@@ -1176,7 +1196,7 @@ let DropDownMenuActionViewItem = class DropDownMenuActionViewItem extends Action
     }
 };
 DropDownMenuActionViewItem = ( __decorate([
-    ( __param(1, IContextMenuService))
+    ( __param(2, IContextMenuService))
 ], DropDownMenuActionViewItem));
 async function getContextMenuActionsGroups(extension, contextKeyService, instantiationService) {
     return instantiationService.invokeFunction(async (accessor) => {
@@ -1191,6 +1211,10 @@ async function getContextMenuActionsGroups(extension, contextKeyService, instant
             cksOverlay.push(['isBuiltinExtension', extension.isBuiltin]);
             cksOverlay.push(['isDefaultApplicationScopedExtension', extension.local && isApplicationScopedExtension(extension.local.manifest)]);
             cksOverlay.push(['isApplicationScopedExtension', extension.local && extension.local.isApplicationScoped]);
+            cksOverlay.push(['isWorkspaceScopedExtension', extension.isWorkspaceScoped]);
+            if (extension.local) {
+                cksOverlay.push(['extensionSource', extension.local.source]);
+            }
             cksOverlay.push(['extensionHasConfiguration', extension.local && !!extension.local.manifest.contributes && !!extension.local.manifest.contributes.configuration]);
             cksOverlay.push(['extensionHasKeybindings', extension.local && !!extension.local.manifest.contributes && !!extension.local.manifest.contributes.keybindings]);
             cksOverlay.push(['extensionHasCommands', extension.local && !!extension.local.manifest.contributes && !!extension.local.manifest.contributes?.commands]);
@@ -1517,7 +1541,7 @@ let InstallAnotherVersionAction = class InstallAnotherVersionAction extends Exte
                     await this.extensionsWorkbenchService.install(extension ?? this.extension, { installPreReleaseVersion: pick.isPreReleaseVersion });
                 }
                 else {
-                    await this.extensionsWorkbenchService.installVersion(this.extension, pick.id, { installPreReleaseVersion: pick.isPreReleaseVersion });
+                    await this.extensionsWorkbenchService.install(this.extension, { installPreReleaseVersion: pick.isPreReleaseVersion, version: pick.id });
                 }
             }
             catch (error) {
@@ -1555,7 +1579,7 @@ let EnableForWorkspaceAction = class EnableForWorkspaceAction extends ExtensionA
     }
     update() {
         this.enabled = false;
-        if (this.extension && this.extension.local) {
+        if (this.extension && this.extension.local && !this.extension.isWorkspaceScoped) {
             this.enabled = this.extension.state === 1
                 && !this.extensionEnablementService.isEnabled(this.extension.local)
                 && this.extensionEnablementService.canChangeWorkspaceEnablement(this.extension.local);
@@ -1593,7 +1617,7 @@ let EnableGloballyAction = class EnableGloballyAction extends ExtensionAction {
     }
     update() {
         this.enabled = false;
-        if (this.extension && this.extension.local) {
+        if (this.extension && this.extension.local && !this.extension.isWorkspaceScoped) {
             this.enabled = this.extension.state === 1
                 && this.extensionEnablementService.isDisabledGlobally(this.extension.local)
                 && this.extensionEnablementService.canChangeEnablement(this.extension.local);
@@ -1634,7 +1658,7 @@ let DisableForWorkspaceAction = class DisableForWorkspaceAction extends Extensio
     }
     update() {
         this.enabled = false;
-        if (this.extension && this.extension.local && ( this.extensionService.extensions.some(
+        if (this.extension && this.extension.local && !this.extension.isWorkspaceScoped && ( this.extensionService.extensions.some(
             e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension.identifier) && this.workspaceContextService.getWorkbenchState() !== 1
         ))) {
             this.enabled = this.extension.state === 1
@@ -1678,7 +1702,7 @@ let DisableGloballyAction = class DisableGloballyAction extends ExtensionAction
     }
     update() {
         this.enabled = false;
-        if (this.extension && this.extension.local && ( this.extensionService.extensions.some(
+        if (this.extension && this.extension.local && !this.extension.isWorkspaceScoped && ( this.extensionService.extensions.some(
             e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension.identifier)
         ))) {
             this.enabled = this.extension.state === 1
@@ -1730,18 +1754,18 @@ let DisableDropDownAction = class DisableDropDownAction extends ActionWithDropDo
 DisableDropDownAction = ( __decorate([
     ( __param(0, IInstantiationService))
 ], DisableDropDownAction));
-let ReloadAction = class ReloadAction extends ExtensionAction {
-    static { ReloadAction_1 = this; }
+let ExtensionRuntimeStateAction = class ExtensionRuntimeStateAction extends ExtensionAction {
+    static { ExtensionRuntimeStateAction_1 = this; }
     static { this.EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} reload`; }
-    static { this.DisabledClass = `${ReloadAction_1.EnabledClass} disabled`; }
-    constructor(hostService, extensionService) {
-        super('extensions.reload', ( localizeWithPath(
-            'vs/workbench/contrib/extensions/browser/extensionsActions',
-            'reloadAction',
-            "Reload"
-        )), ReloadAction_1.DisabledClass, false);
+    static { this.DisabledClass = `${ExtensionRuntimeStateAction_1.EnabledClass} disabled`; }
+    constructor(hostService, extensionsWorkbenchService, updateService, extensionService, productService, telemetryService) {
+        super('extensions.runtimeState', '', ExtensionRuntimeStateAction_1.DisabledClass, false);
         this.hostService = hostService;
+        this.extensionsWorkbenchService = extensionsWorkbenchService;
+        this.updateService = updateService;
         this.extensionService = extensionService;
+        this.productService = productService;
+        this.telemetryService = telemetryService;
         this.updateWhenCounterExtensionChanges = true;
         this._register(this.extensionService.onDidChangeExtensions(() => this.update()));
         this.update();
@@ -1749,6 +1773,7 @@ let ReloadAction = class ReloadAction extends ExtensionAction {
     update() {
         this.enabled = false;
         this.tooltip = '';
+        this.class = ExtensionRuntimeStateAction_1.DisabledClass;
         if (!this.extension) {
             return;
         }
@@ -1759,24 +1784,68 @@ let ReloadAction = class ReloadAction extends ExtensionAction {
         if (this.extension.local && this.extension.local.manifest && this.extension.local.manifest.contributes && this.extension.local.manifest.contributes.localizations && this.extension.local.manifest.contributes.localizations.length > 0) {
             return;
         }
-        const reloadTooltip = this.extension.reloadRequiredStatus;
-        this.enabled = reloadTooltip !== undefined;
-        this.label = reloadTooltip !== undefined ? ( localizeWithPath(
+        const runtimeState = this.extension.runtimeState;
+        if (!runtimeState) {
+            return;
+        }
+        this.enabled = true;
+        this.class = ExtensionRuntimeStateAction_1.EnabledClass;
+        this.tooltip = runtimeState.reason;
+        this.label = runtimeState.action === "reloadWindow"  ? ( localizeWithPath(
+            'vs/workbench/contrib/extensions/browser/extensionsActions',
+            'reload window',
+            'Reload Window'
+        ))
+            : runtimeState.action === "restartExtensions"  ? ( localizeWithPath(
+            'vs/workbench/contrib/extensions/browser/extensionsActions',
+            'restart extensions',
+            'Restart Extensions'
+        ))
+                : runtimeState.action === "quitAndInstall"  ? ( localizeWithPath(
+            'vs/workbench/contrib/extensions/browser/extensionsActions',
+            'restart product',
+            'Restart to Update'
+        ))
+                    : runtimeState.action === "applyUpdate"  || runtimeState.action === "downloadUpdate"  ? ( localizeWithPath(
             'vs/workbench/contrib/extensions/browser/extensionsActions',
-            'reload required',
-            'Reload Required'
+            'update product',
+            'Update {0}',
+            this.productService.nameShort
         )) : '';
-        this.tooltip = reloadTooltip !== undefined ? reloadTooltip : '';
-        this.class = this.enabled ? ReloadAction_1.EnabledClass : ReloadAction_1.DisabledClass;
     }
-    run() {
-        return Promise.resolve(this.hostService.reload());
+    async run() {
+        const runtimeState = this.extension?.runtimeState;
+        if (!runtimeState?.action) {
+            return;
+        }
+        this.telemetryService.publicLog2('extensions:runtimestate:action', {
+            action: runtimeState.action
+        });
+        if (runtimeState?.action === "reloadWindow" ) {
+            return this.hostService.reload();
+        }
+        else if (runtimeState?.action === "restartExtensions" ) {
+            return this.extensionsWorkbenchService.updateRunningExtensions();
+        }
+        else if (runtimeState?.action === "downloadUpdate" ) {
+            return this.updateService.downloadUpdate();
+        }
+        else if (runtimeState?.action === "applyUpdate" ) {
+            return this.updateService.applyUpdate();
+        }
+        else if (runtimeState?.action === "quitAndInstall" ) {
+            return this.updateService.quitAndInstall();
+        }
     }
 };
-ReloadAction = ReloadAction_1 = ( __decorate([
+ExtensionRuntimeStateAction = ExtensionRuntimeStateAction_1 = ( __decorate([
     ( __param(0, IHostService)),
-    ( __param(1, IExtensionService))
-], ReloadAction));
+    ( __param(1, IExtensionsWorkbenchService)),
+    ( __param(2, IUpdateService)),
+    ( __param(3, IExtensionService)),
+    ( __param(4, IProductService)),
+    ( __param(5, ITelemetryService))
+], ExtensionRuntimeStateAction));
 function isThemeFromExtension(theme, extension) {
     return !!(extension && theme.extensionData && ExtensionIdentifier.equals(theme.extensionData.extensionId, extension.identifier.id));
 }
@@ -2851,7 +2920,7 @@ let ExtensionStatusAction = class ExtensionStatusAction extends ExtensionAction
         const isRunning = ( this.extensionService.extensions.some(
             e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension.identifier)
         ));
-        if (isEnabled && isRunning) {
+        if (!this.extension.isWorkspaceScoped && isEnabled && isRunning) {
             if (this.extension.enablementState === 9 ) {
                 this.updateStatus({ message: ( new MarkdownString(( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/extensionsActions',
@@ -3450,4 +3519,4 @@ registerThemingParticipant((theme, collector) => {
         collector.addRule(`.monaco-hover.extension-hover .markdown-hover .hover-contents ${ThemeIcon.asCSSSelector(infoIcon)} { color: ${infoColor}; }`);
     }
 });
-export { AbstractConfigureRecommendedExtensionsAction, AbstractInstallExtensionsInServerAction, ActionWithDropDownAction, ClearLanguageAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, ConfigureWorkspaceRecommendedExtensionsAction, DisableDropDownAction, DisableForWorkspaceAction, DisableGloballyAction, DropDownMenuActionViewItem, EnableDropDownAction, EnableForWorkspaceAction, EnableGloballyAction, ExtensionAction, ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction, ExtensionEditorManageExtensionAction, ExtensionStatusAction, ExtensionStatusLabelAction, IgnoreExtensionRecommendationAction, InstallAction, InstallAnotherVersionAction, InstallDropdownAction, InstallInOtherServerAction, InstallLocalExtensionsInRemoteAction, InstallRecommendedExtensionAction, InstallRemoteExtensionsInLocalAction, InstallSpecificVersionOfExtensionAction, InstallingLabelAction, LocalInstallAction, ManageExtensionAction, MenuItemExtensionAction, MigrateDeprecatedExtensionAction, PromptExtensionInstallFailureAction, ReinstallAction, ReloadAction, RemoteInstallAction, SearchExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetLanguageAction, SetProductIconThemeAction, ShowRecommendedExtensionAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, ToggleSyncExtensionAction, UndoIgnoreExtensionRecommendationAction, UninstallAction, UpdateAction, WebInstallAction, extensionButtonProminentBackground, getContextMenuActions };
+export { AbstractConfigureRecommendedExtensionsAction, AbstractInstallExtensionsInServerAction, ActionWithDropDownAction, ClearLanguageAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, ConfigureWorkspaceRecommendedExtensionsAction, DisableDropDownAction, DisableForWorkspaceAction, DisableGloballyAction, DropDownMenuActionViewItem, EnableDropDownAction, EnableForWorkspaceAction, EnableGloballyAction, ExtensionAction, ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction, ExtensionEditorManageExtensionAction, ExtensionRuntimeStateAction, ExtensionStatusAction, ExtensionStatusLabelAction, IgnoreExtensionRecommendationAction, InstallAction, InstallAnotherVersionAction, InstallDropdownAction, InstallInOtherServerAction, InstallLocalExtensionsInRemoteAction, InstallRecommendedExtensionAction, InstallRemoteExtensionsInLocalAction, InstallSpecificVersionOfExtensionAction, InstallingLabelAction, LocalInstallAction, ManageExtensionAction, MenuItemExtensionAction, MigrateDeprecatedExtensionAction, PromptExtensionInstallFailureAction, ReinstallAction, RemoteInstallAction, SearchExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetLanguageAction, SetProductIconThemeAction, ShowRecommendedExtensionAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, ToggleSyncExtensionAction, UndoIgnoreExtensionRecommendationAction, UninstallAction, UpdateAction, WebInstallAction, extensionButtonProminentBackground, getContextMenuActions };

package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js

@@ -17,7 +17,7 @@ class ExtensionsInput extends EditorInput {
         return ExtensionsInput.ID;
     }
     get capabilities() {
-        return 2  | 8  | 1024 ;
+        return 2  | 8 ;
     }
     get resource() {
         return ( URI.from({

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.js

@@ -1,5 +1,6 @@
 import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { externalUriOpenersConfigurationNode } from './configuration.js';
+import './externalUriOpenerService.js';
 ( Registry.as(Extensions.Configuration))
     .registerConfiguration(externalUriOpenersConfigurationNode);

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

@@ -10,20 +10,18 @@ import { EditorResolution } from '../../../../../platform/editor/common/editor.j
 import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.js';
 import { isEditorInputWithOptions } from '../../../../common/editor.js';
 import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
-import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 var BinaryFileEditor_1;
 let BinaryFileEditor = class BinaryFileEditor extends BaseBinaryResourceEditor {
     static { BinaryFileEditor_1 = this; }
     static { this.ID = BINARY_FILE_EDITOR_ID; }
-    constructor(telemetryService, themeService, editorResolverService, storageService, editorGroupService) {
-        super(BinaryFileEditor_1.ID, {
+    constructor(group, telemetryService, themeService, editorResolverService, storageService) {
+        super(BinaryFileEditor_1.ID, group, {
             openInternal: (input, options) => this.openInternal(input, options)
         }, telemetryService, themeService, storageService);
         this.editorResolverService = editorResolverService;
-        this.editorGroupService = editorGroupService;
     }
     async openInternal(input, options) {
-        if (input instanceof FileEditorInput && this.group?.activeEditor) {
+        if (input instanceof FileEditorInput && this.group.activeEditor) {
             const activeEditor = this.group.activeEditor;
             const untypedActiveEditor = activeEditor?.toUntyped();
             if (!untypedActiveEditor) {
@@ -50,7 +48,7 @@ let BinaryFileEditor = class BinaryFileEditor extends BaseBinaryResourceEditor {
                     }
                 }
             }
-            await (this.group ?? this.editorGroupService.activeGroup).replaceEditors([{
+            await this.group.replaceEditors([{
                     editor: activeEditor,
                     replacement: resolvedEditor?.editor ?? input,
                     options: {
@@ -68,10 +66,9 @@ let BinaryFileEditor = class BinaryFileEditor extends BaseBinaryResourceEditor {
     }
 };
 BinaryFileEditor = BinaryFileEditor_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IThemeService)),
-    ( __param(2, IEditorResolverService)),
-    ( __param(3, IStorageService)),
-    ( __param(4, IEditorGroupsService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IThemeService)),
+    ( __param(3, IEditorResolverService)),
+    ( __param(4, IStorageService))
 ], BinaryFileEditor));
 export { BinaryFileEditor };

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

@@ -17,6 +17,7 @@ import { Schemas } from '../../../../../base/common/network.js';
 import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
 import { IPathService } from '../../../../services/path/common/pathService.js';
 import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../../../services/editor/common/customEditorLabelService.js';
 var FileEditorInput_1;
 let FileEditorInput = FileEditorInput_1 = class FileEditorInput extends AbstractTextResourceEditorInput {
     get typeId() {
@@ -47,8 +48,8 @@ let FileEditorInput = FileEditorInput_1 = class FileEditorInput extends Abstract
         }
         return capabilities;
     }
-    constructor(resource, preferredResource, preferredName, preferredDescription, preferredEncoding, preferredLanguageId, preferredContents, instantiationService, textFileService, textModelService, labelService, fileService, filesConfigurationService, editorService, pathService, textResourceConfigurationService) {
-        super(resource, preferredResource, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
+    constructor(resource, preferredResource, preferredName, preferredDescription, preferredEncoding, preferredLanguageId, preferredContents, instantiationService, textFileService, textModelService, labelService, fileService, filesConfigurationService, editorService, pathService, textResourceConfigurationService, customEditorLabelService) {
+        super(resource, preferredResource, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
         this.instantiationService = instantiationService;
         this.textModelService = textModelService;
         this.pathService = pathService;
@@ -321,6 +322,7 @@ FileEditorInput = FileEditorInput_1 = ( __decorate([
     ( __param(12, IFilesConfigurationService)),
     ( __param(13, IEditorService)),
     ( __param(14, IPathService)),
-    ( __param(15, ITextResourceConfigurationService))
+    ( __param(15, ITextResourceConfigurationService)),
+    ( __param(16, ICustomEditorLabelService))
 ], FileEditorInput));
 export { FileEditorInput };

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

@@ -32,8 +32,8 @@ var TextFileEditor_1;
 let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
     static { TextFileEditor_1 = this; }
     static { this.ID = TEXT_FILE_EDITOR_ID; }
-    constructor(telemetryService, fileService, paneCompositeService, instantiationService, contextService, storageService, textResourceConfigurationService, editorService, themeService, editorGroupService, textFileService, explorerService, uriIdentityService, pathService, configurationService, preferencesService, hostService, filesConfigurationService) {
-        super(TextFileEditor_1.ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService, fileService);
+    constructor(group, telemetryService, fileService, paneCompositeService, instantiationService, contextService, storageService, textResourceConfigurationService, editorService, themeService, editorGroupService, textFileService, explorerService, uriIdentityService, pathService, configurationService, preferencesService, hostService, filesConfigurationService) {
+        super(TextFileEditor_1.ID, group, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService, fileService);
         this.paneCompositeService = paneCompositeService;
         this.contextService = contextService;
         this.textFileService = textFileService;
@@ -135,7 +135,7 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
             }
             throw createEditorOpenError(localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileEditor', 'fileIsDirectory', "The file is not displayed in the text editor because it is a directory."), actions, { forceMessage: true });
         }
-        if (error.fileOperationResult === 7  && this.group) {
+        if (error.fileOperationResult === 7 ) {
             let message;
             if (error instanceof TooLargeFileOperationError) {
                 message = ( localizeWithPath(
@@ -186,16 +186,15 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
     }
     openAsBinary(input, options) {
         const defaultBinaryEditor = this.configurationService.getValue('workbench.editor.defaultBinaryEditor');
-        const group = this.group ?? this.editorGroupService.activeGroup;
         const editorOptions = {
             ...options,
             activation: EditorActivation.PRESERVE
         };
         if (defaultBinaryEditor && defaultBinaryEditor !== '' && defaultBinaryEditor !== DEFAULT_EDITOR_ASSOCIATION.id) {
-            this.doOpenAsBinaryInDifferentEditor(group, defaultBinaryEditor, input, editorOptions);
+            this.doOpenAsBinaryInDifferentEditor(this.group, defaultBinaryEditor, input, editorOptions);
         }
         else {
-            this.doOpenAsBinaryInSameEditor(group, defaultBinaryEditor, input, editorOptions);
+            this.doOpenAsBinaryInSameEditor(this.group, defaultBinaryEditor, input, editorOptions);
         }
     }
     doOpenAsBinaryInDifferentEditor(group, editorId, editor, editorOptions) {
@@ -232,23 +231,23 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
     }
 };
 TextFileEditor = TextFileEditor_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IFileService)),
-    ( __param(2, IPaneCompositePartService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IWorkspaceContextService)),
-    ( __param(5, IStorageService)),
-    ( __param(6, ITextResourceConfigurationService)),
-    ( __param(7, IEditorService)),
-    ( __param(8, IThemeService)),
-    ( __param(9, IEditorGroupsService)),
-    ( __param(10, ITextFileService)),
-    ( __param(11, IExplorerService)),
-    ( __param(12, IUriIdentityService)),
-    ( __param(13, IPathService)),
-    ( __param(14, IConfigurationService)),
-    ( __param(15, IPreferencesService)),
-    ( __param(16, IHostService)),
-    ( __param(17, IFilesConfigurationService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IFileService)),
+    ( __param(3, IPaneCompositePartService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IWorkspaceContextService)),
+    ( __param(6, IStorageService)),
+    ( __param(7, ITextResourceConfigurationService)),
+    ( __param(8, IEditorService)),
+    ( __param(9, IThemeService)),
+    ( __param(10, IEditorGroupsService)),
+    ( __param(11, ITextFileService)),
+    ( __param(12, IExplorerService)),
+    ( __param(13, IUriIdentityService)),
+    ( __param(14, IPathService)),
+    ( __param(15, IConfigurationService)),
+    ( __param(16, IPreferencesService)),
+    ( __param(17, IHostService)),
+    ( __param(18, IFilesConfigurationService))
 ], TextFileEditor));
 export { TextFileEditor };