@codingame/monaco-vscode-view-common-service-override 8.0.4 → 9.0.0

package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js

@@ -24,22 +24,22 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
     static { this.AUTO_LOCK_EXTRA_EDITORS = [
         {
             id: 'workbench.input.interactive',
-            label: ( localize(9730, 'Interactive Window')),
+            label: ( localize(9757, 'Interactive Window')),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-markdown.preview',
-            label: ( localize(9731, "Markdown Preview")),
+            label: ( localize(9758, "Markdown Preview")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-simpleBrowser.view',
-            label: ( localize(9732, "Simple Browser")),
+            label: ( localize(9759, "Simple Browser")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-browserPreview',
-            label: ( localize(9733, "Live Preview")),
+            label: ( localize(9760, "Live Preview")),
             priority: RegisteredEditorPriority.builtin
         }
     ]; }
@@ -84,7 +84,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 'workbench.editor.autoLockGroups': {
                     type: 'object',
                     description: ( localize(
-                        9734,
+                        9761,
                         "If an editor matching one of the listed types is opened as the first in an editor group and more than one group is open, the group is automatically locked. Locked groups will only be used for opening editors when explicitly chosen by a user gesture (for example drag and drop), but not by default. Consequently, the active editor in a locked group is less likely to be replaced accidentally with a different editor."
                     )),
                     properties: autoLockGroupConfiguration,
@@ -102,7 +102,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     default: '',
                     enum: [...binaryEditorCandidates, ''],
                     description: ( localize(
-                        9735,
+                        9762,
                         "The default editor for files detected as binary. If undefined, the user will be presented with a picker."
                     )),
                 }
@@ -115,7 +115,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 'workbench.editorAssociations': {
                     type: 'object',
                     markdownDescription: ( localize(
-                        9736,
+                        9763,
                         "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
                     )),
                     patternProperties: {
@@ -137,7 +137,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     minimum: 1,
                     scope: ConfigurationScope.RESOURCE,
                     markdownDescription: ( localize(
-                        9737,
+                        9764,
                         "Controls the minimum size of a file in MB before asking for confirmation when opening in the editor. Note that this setting may not apply to all editor types and environments."
                     )),
                 }

package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js

@@ -79,7 +79,7 @@ let DropOverlay = class DropOverlay extends Themable {
         this.overlay.classList.add('editor-group-overlay-indicator');
         container.appendChild(this.overlay);
         if (this.enableDropIntoEditor) {
-            this.dropIntoPromptElement = renderFormattedText(( localize(10833, "Hold __{0}__ to drop into editor", isMacintosh ? '⇧' : 'Shift')), {});
+            this.dropIntoPromptElement = renderFormattedText(( localize(10881, "Hold __{0}__ to drop into editor", isMacintosh ? '⇧' : 'Shift')), {});
             this.dropIntoPromptElement.classList.add('editor-group-overlay-drop-into-prompt');
             this.overlay.appendChild(this.dropIntoPromptElement);
         }

package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js

@@ -108,7 +108,7 @@ let EditorPart = class EditorPart extends Part {
         this.onDidChangeGroupMaximized = this._onDidChangeGroupMaximized.event;
         this._onDidActivateGroup = this._register(( new Emitter()));
         this.onDidActivateGroup = this._onDidActivateGroup.event;
-        this._onDidAddGroup = this._register(( new Emitter()));
+        this._onDidAddGroup = this._register(( new PauseableEmitter()));
         this.onDidAddGroup = this._onDidAddGroup.event;
         this._onDidRemoveGroup = this._register(( new PauseableEmitter()));
         this.onDidRemoveGroup = this._onDidRemoveGroup.event;
@@ -121,6 +121,8 @@ let EditorPart = class EditorPart extends Part {
         this.onDidScroll = Event.any(this.onDidSetGridWidget.event, this._onDidScroll.event);
         this._onDidChangeEditorPartOptions = this._register(( new Emitter()));
         this.onDidChangeEditorPartOptions = this._onDidChangeEditorPartOptions.event;
+        this._onWillDispose = this._register(( new Emitter()));
+        this.onWillDispose = this._onWillDispose.event;
         this.workspaceMemento = this.getMemento(StorageScope.WORKSPACE, StorageTarget.USER);
         this.profileMemento = this.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
         this.groupViews = ( new Map());
@@ -976,13 +978,16 @@ let EditorPart = class EditorPart extends Part {
     }
     async doApplyState(state, options) {
         const groups = await this.doPrepareApplyState();
-        const resumeEvents = this.disposeGroups(true );
+        this._onDidAddGroup.pause();
+        this._onDidRemoveGroup.pause();
+        this.disposeGroups();
         this.mostRecentActiveGroups = state.mostRecentActiveGroups;
         try {
             this.doApplyGridState(state.serializedGrid, state.activeGroup, undefined, options);
         }
         finally {
-            resumeEvents();
+            this._onDidRemoveGroup.resume();
+            this._onDidAddGroup.resume();
         }
         await this.activeGroup.openEditors(( groups
             .flatMap(group => group.editors)
@@ -1027,21 +1032,16 @@ let EditorPart = class EditorPart extends Part {
             type: Parts.EDITOR_PART
         };
     }
-    disposeGroups(surpressEvents) {
-        if (surpressEvents) {
-            this._onDidRemoveGroup.pause();
-        }
+    disposeGroups() {
         for (const group of this.groups) {
             group.dispose();
             this._onDidRemoveGroup.fire(group);
         }
         this.groupViews.clear();
         this.mostRecentActiveGroups = [];
-        if (surpressEvents) {
-            return () => this._onDidRemoveGroup.resume();
-        }
     }
     dispose() {
+        this._onWillDispose.fire();
         this.disposeGroups();
         this.gridWidget?.dispose();
         super.dispose();

package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js

@@ -3,7 +3,7 @@ import { localize } from 'vscode/vscode/vs/nls';
 import { GroupsOrder, GroupLocation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { DisposableMap, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DisposableMap, toDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MainEditorPart } from './editorPart.js';
 import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { firstOrDefault, distinct } from 'vscode/vscode/vs/base/common/arrays';
@@ -17,6 +17,8 @@ import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/aux
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { isHTMLElement } from 'vscode/vscode/vs/base/browser/dom';
+import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 var EditorParts_1;
 let EditorParts = class EditorParts extends MultiWindowParts {
@@ -29,6 +31,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         this.contextKeyService = contextKeyService;
         this.mainPart = this._register(this.createMainEditorPart());
         this.mostRecentActiveParts = [this.mainPart];
+        this.mapPartToInstantiationService = ( (new Map()));
         this._onDidCreateAuxiliaryEditorPart = this._register(( (new Emitter())));
         this.onDidCreateAuxiliaryEditorPart = this._onDidCreateAuxiliaryEditorPart.event;
         this.workspaceMemento = this.getMemento(StorageScope.WORKSPACE, StorageTarget.USER);
@@ -76,11 +79,23 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     createMainEditorPart() {
         return this.instantiationService.createInstance(MainEditorPart, this);
     }
+    getScopedInstantiationService(part) {
+        if (part === this.mainPart) {
+            if (!( (this.mapPartToInstantiationService.has(part.windowId)))) {
+                this.instantiationService.invokeFunction(accessor => {
+                    const editorService = accessor.get(IEditorService);
+                    this.mapPartToInstantiationService.set(part.windowId, this._register(this.instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)]))))));
+                });
+            }
+        }
+        return this.mapPartToInstantiationService.get(part.windowId) ?? this.instantiationService;
+    }
     async createAuxiliaryEditorPart(options) {
         const { part, instantiationService, disposables } = await this.instantiationService.createInstance(AuxiliaryEditorPart, this).create(this.getGroupsLabel(this._parts.size), options);
+        this.mapPartToInstantiationService.set(part.windowId, instantiationService);
+        disposables.add(toDisposable(() => this.mapPartToInstantiationService.delete(part.windowId)));
         this._onDidAddGroup.fire(part.activeGroup);
-        const eventDisposables = disposables.add(( (new DisposableStore())));
-        this._onDidCreateAuxiliaryEditorPart.fire({ part, instantiationService, disposables: eventDisposables });
+        this._onDidCreateAuxiliaryEditorPart.fire(part);
         return part;
     }
     registerPart(part) {
@@ -125,7 +140,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
     }
     getGroupsLabel(index) {
-        return ( localize(3535, "Window {0}", index + 1));
+        return ( localize(3051, "Window {0}", index + 1));
     }
     getPart(groupOrElement) {
         if (this._parts.size > 1) {

package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js

@@ -95,7 +95,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         const viewContainer = this.viewDescriptorService.getViewContainerById(compositeId);
         const defaultLocation = this.viewDescriptorService.getDefaultViewContainerLocation(viewContainer);
         if (defaultLocation !== this.viewDescriptorService.getViewContainerLocation(viewContainer)) {
-            actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9310, "Reset Location")), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
+            actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9299, "Reset Location")), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
         }
         else {
             const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
@@ -103,7 +103,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 const viewToReset = viewContainerModel.allViewDescriptors[0];
                 const defaultContainer = this.viewDescriptorService.getDefaultContainerById(viewToReset.id);
                 if (defaultContainer !== viewContainer) {
-                    actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9310, "Reset Location")), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
+                    actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9299, "Reset Location")), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
                 }
             }
         }

package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js

@@ -142,7 +142,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this.emptyPaneMessageElement.classList.add('empty-pane-message-area');
         const messageElement = document.createElement('div');
         messageElement.classList.add('empty-pane-message');
-        messageElement.innerText = ( localize(9307, "Drag a view here to display."));
+        messageElement.innerText = ( localize(9296, "Drag a view here to display."));
         this.emptyPaneMessageElement.appendChild(messageElement);
         parent.appendChild(this.emptyPaneMessageElement);
         this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(this.emptyPaneMessageElement, {
@@ -192,7 +192,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
             orientation: ActionsOrientation.HORIZONTAL,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-            toggleMenuTitle: ( localize(9308, "More Actions...")),
+            toggleMenuTitle: ( localize(9297, "More Actions...")),
             hoverDelegate: this.toolbarHoverDelegate,
             hiddenItemStrategy: HiddenItemStrategy.NoHide
         }));
@@ -450,7 +450,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
             const menu = this.menuService.getMenuActions(ViewsSubMenu, scopedContextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
             createAndFillInActionBarActions(menu, { primary: viewsActions, secondary: [] }, () => true);
             disposables.dispose();
-            return viewsActions.length > 1 && ( (viewsActions.some(a => a.enabled))) ? ( (new SubmenuAction('views', ( localize(9309, "Views")), viewsActions))) : undefined;
+            return viewsActions.length > 1 && ( (viewsActions.some(a => a.enabled))) ? ( (new SubmenuAction('views', ( localize(9298, "Views")), viewsActions))) : undefined;
         }
         return undefined;
     }

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js

@@ -114,9 +114,9 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         createAndFillInContextMenuActions(panelAlignMenu, { primary: [], secondary: alignActions });
         actions.push(...[
             ( (new Separator())),
-            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3780, "Panel Position")), positionActions))),
-            ( (new SubmenuAction('workbench.action.panel.align', ( localize(3781, "Align Panel")), alignActions))),
-            toAction({ id: TogglePanelAction.ID, label: ( localize(3782, "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
+            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3263, "Panel Position")), positionActions))),
+            ( (new SubmenuAction('workbench.action.panel.align', ( localize(3264, "Align Panel")), alignActions))),
+            toAction({ id: TogglePanelAction.ID, label: ( localize(3265, "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
         ]);
     }
     layout(width, height, top, left) {

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js

@@ -13,7 +13,7 @@ class FocusSideBarAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.focusSideBar',
-            title: ( localize2(9306, 'Focus into Primary Side Bar')),
+            title: ( localize2(9295, 'Focus into Primary Side Bar')),
             category: Categories.View,
             f1: true,
             keybinding: {

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js

@@ -217,7 +217,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             constructor() {
                 super({
                     id: ToggleActivityBarVisibilityActionId,
-                    title: ( localize2(3760, "Toggle Activity Bar Visibility")),
+                    title: ( localize2(3243, "Toggle Activity Bar Visibility")),
                 });
             }
             run() {

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

@@ -23,12 +23,12 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 
 var CallHierarchyController_1;
-const _ctxHasCallHierarchyProvider = ( (new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4151, 'Whether a call hierarchy provider is available')))));
-const _ctxCallHierarchyVisible = ( (new RawContextKey('callHierarchyVisible', false, ( localize(4152, 'Whether call hierarchy peek is currently showing')))));
+const _ctxHasCallHierarchyProvider = ( (new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(3945, 'Whether a call hierarchy provider is available')))));
+const _ctxCallHierarchyVisible = ( (new RawContextKey('callHierarchyVisible', false, ( localize(3946, 'Whether call hierarchy peek is currently showing')))));
 const _ctxCallHierarchyDirection = ( (new RawContextKey(
     'callHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(4153, 'Whether call hierarchy shows incoming or outgoing calls')) }
+    { type: 'string', description: ( localize(3947, 'Whether call hierarchy shows incoming or outgoing calls')) }
 )));
 function sanitizedDirection(candidate) {
     return candidate === CallHierarchyDirection.CallsFrom || candidate === CallHierarchyDirection.CallsTo
@@ -116,14 +116,14 @@ let CallHierarchyController = class CallHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(4154, "No results")));
+                this._widget.showMessage(( localize(3948, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endCallHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4155, "Failed to show call hierarchy")));
+            this._widget.showMessage(( localize(3949, "Failed to show call hierarchy")));
         });
     }
     showOutgoingCalls() {
@@ -151,7 +151,7 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showCallHierarchy',
-            title: ( localize2(4156, 'Peek Call Hierarchy')),
+            title: ( localize2(3950, 'Peek Call Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -179,8 +179,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showIncomingCalls',
-            title: ( localize2(4157, 'Show Incoming Calls')),
-            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4158, 'Icon for incoming calls in the call hierarchy view.'))),
+            title: ( localize2(3951, 'Show Incoming Calls')),
+            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(3952, 'Icon for incoming calls in the call hierarchy view.'))),
             precondition: ( (ContextKeyExpr.and(
                 _ctxCallHierarchyVisible,
                  (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom))
@@ -204,8 +204,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showOutgoingCalls',
-            title: ( localize2(4159, 'Show Outgoing Calls')),
-            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4160, 'Icon for outgoing calls in the call hierarchy view.'))),
+            title: ( localize2(3953, 'Show Outgoing Calls')),
+            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(3954, 'Icon for outgoing calls in the call hierarchy view.'))),
             precondition: ( (ContextKeyExpr.and(
                 _ctxCallHierarchyVisible,
                  (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo))
@@ -229,7 +229,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusCallHierarchy',
-            title: ( localize2(4161, 'Refocus Call Hierarchy')),
+            title: ( localize2(3955, 'Refocus Call Hierarchy')),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -245,7 +245,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeCallHierarchy',
-            title: ( localize(4162, 'Close')),
+            title: ( localize(3956, 'Close')),
             icon: Codicon.close,
             precondition: _ctxCallHierarchyVisible,
             keybinding: {

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js

@@ -267,13 +267,13 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === CallHierarchyDirection.CallsFrom
-            ? ( localize(9527, "Calls from '{0}'", element.model.root.name))
-            : ( localize(9528, "Callers of '{0}'", element.model.root.name));
+            ? ( localize(9547, "Calls from '{0}'", element.model.root.name))
+            : ( localize(9548, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(9529, "Loading...")));
+        this.setTitle(( localize(9549, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -292,8 +292,8 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === CallHierarchyDirection.CallsFrom
-                ? ( localize(9530, "No calls from '{0}'", model.root.name))
-                : ( localize(9531, "No callers of '{0}'", model.root.name)));
+                ? ( localize(9550, "No calls from '{0}'", model.root.name))
+                : ( localize(9551, "No callers of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js

@@ -128,14 +128,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize(11185, "Call Hierarchy"));
+        return ( localize(11242, "Call Hierarchy"));
     }
     getAriaLabel(element) {
         if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
-            return ( localize(11186, "calls from {0}", element.item.name));
+            return ( localize(11243, "calls from {0}", element.item.name));
         }
         else {
-            return ( localize(11187, "callers of {0}", element.item.name));
+            return ( localize(11244, "callers of {0}", element.item.name));
         }
     }
 }

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js

@@ -98,7 +98,7 @@ let CustomEditorService = class CustomEditorService extends Disposable {
                     detail: contributedEditor.providerDisplayName,
                     priority: contributedEditor.priority,
                 }, {
-                    singlePerResource: () => !this.getCustomEditorCapabilities(contributedEditor.id)?.supportsMultipleEditorsPerDocument ?? true
+                    singlePerResource: () => !(this.getCustomEditorCapabilities(contributedEditor.id)?.supportsMultipleEditorsPerDocument ?? false)
                 }, {
                     createEditorInput: ({ resource }, group) => {
                         return { editor: CustomEditorInput.create(this.instantiationService, resource, contributedEditor.id, group.id) };

package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js

@@ -31,7 +31,7 @@ class ContributedCustomEditors extends Disposable {
                 this.add(( (new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localize(9515, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(9535, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
                     selector: webviewEditorContribution.selector || [],
                     priority: getPriorityFromContribution(webviewEditorContribution, extension.description),
                 }))));

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

@@ -5,7 +5,7 @@ import { globMatchesResource, RegisteredEditorPriority, priorityToRank } from 'v
 
 const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = ( (new RawContextKey('activeCustomEditorId', '', {
     type: 'string',
-    description: ( localize(9514, "The viewType of the currently active custom editor.")),
+    description: ( localize(9534, "The viewType of the currently active custom editor.")),
 })));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( (new RawContextKey('focusedCustomEditorIsEditable', false)));
 var CustomEditorPriority;

package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js

@@ -15,7 +15,7 @@ const Fields = ( (Object.freeze({
     priority: 'priority',
 })));
 const CustomEditorsContribution = {
-    description: ( localize(11173, 'Contributed custom editors.')),
+    description: ( localize(11230, 'Contributed custom editors.')),
     type: 'array',
     defaultSnippets: [{
             body: [{
@@ -37,20 +37,20 @@ const CustomEditorsContribution = {
             [Fields.viewType]: {
                 type: 'string',
                 markdownDescription: ( localize(
-                    11174,
+                    11231,
                     'Identifier for the custom editor. This must be unique across all custom editors, so we recommend including your extension id as part of `viewType`. The `viewType` is used when registering custom editors with `vscode.registerCustomEditorProvider` and in the `onCustomEditor:${id}` [activation event](https://code.visualstudio.com/api/references/activation-events).'
                 )),
             },
             [Fields.displayName]: {
                 type: 'string',
                 description: ( localize(
-                    11175,
+                    11232,
                     'Human readable name of the custom editor. This is displayed to users when selecting which editor to use.'
                 )),
             },
             [Fields.selector]: {
                 type: 'array',
-                description: ( localize(11176, 'Set of globs that the custom editor is enabled for.')),
+                description: ( localize(11233, 'Set of globs that the custom editor is enabled for.')),
                 items: {
                     type: 'object',
                     defaultSnippets: [{
@@ -61,7 +61,7 @@ const CustomEditorsContribution = {
                     properties: {
                         filenamePattern: {
                             type: 'string',
-                            description: ( localize(11177, 'Glob that the custom editor is enabled for.')),
+                            description: ( localize(11234, 'Glob that the custom editor is enabled for.')),
                         },
                     }
                 }
@@ -69,7 +69,7 @@ const CustomEditorsContribution = {
             [Fields.priority]: {
                 type: 'string',
                 markdownDeprecationMessage: ( localize(
-                    11178,
+                    11235,
                     'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'
                 )),
                 enum: [
@@ -78,11 +78,11 @@ const CustomEditorsContribution = {
                 ],
                 markdownEnumDescriptions: [
                     ( localize(
-                        11179,
+                        11236,
                         'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
                     )),
                     ( localize(
-                        11180,
+                        11237,
                         'The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command.'
                     )),
                 ],
@@ -118,9 +118,9 @@ class CustomEditorsDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(11181, "View Type")),
-            ( localize(11182, "Priority")),
-            ( localize(11183, "Filename Pattern")),
+            ( localize(11238, "View Type")),
+            ( localize(11239, "Priority")),
+            ( localize(11240, "Filename Pattern")),
         ];
         const rows = ( (customEditors
             .map(customEditor => {
@@ -141,7 +141,7 @@ class CustomEditorsDataRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'customEditors',
-    label: ( localize(11184, "Custom Editors")),
+    label: ( localize(11241, "Custom Editors")),
     access: {
         canToggle: false
     },

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

@@ -26,12 +26,11 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { equals } from 'vscode/vscode/vs/base/common/arrays';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { nativeHoverDelegate } from 'vscode/vscode/vs/platform/hover/browser/hover';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { Event } from 'vscode/vscode/vs/base/common/event';
 
 var LanguageStatus_1;
 class LanguageStatusViewModel {
@@ -61,19 +60,23 @@ StoredCounter = ( (__decorate([
     ( (__param(0, IStorageService)))
 ], StoredCounter)));
 let LanguageStatusContribution = class LanguageStatusContribution extends Disposable {
-    constructor(instantiationService, editorGroupService, editorService) {
+    constructor(editorGroupService) {
         super();
-        const mainInstantiationService = this._register(instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)])))));
-        this._register(mainInstantiationService.createInstance(LanguageStatus));
-        this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ instantiationService, disposables }) => {
-            disposables.add(instantiationService.createInstance(LanguageStatus));
-        }));
+        this.editorGroupService = editorGroupService;
+        for (const part of editorGroupService.parts) {
+            this.createLanguageStatus(part);
+        }
+        this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createLanguageStatus(part)));
+    }
+    createLanguageStatus(part) {
+        const disposables = ( (new DisposableStore()));
+        Event.once(part.onWillDispose)(() => disposables.dispose());
+        const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+        disposables.add(scopedInstantiationService.createInstance(LanguageStatus));
     }
 };
 LanguageStatusContribution = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, IEditorGroupsService))),
-    ( (__param(2, IEditorService)))
+    ( (__param(0, IEditorGroupsService)))
 ], LanguageStatusContribution)));
 let LanguageStatus = class LanguageStatus {
     static { LanguageStatus_1 = this; }
@@ -179,8 +182,8 @@ let LanguageStatus = class LanguageStatus {
                 isOneBusy = isOneBusy || (!isPinned && status.busy);
             }
             const props = {
-                name: ( localize(4355, "Editor Language Status")),
-                ariaLabel: ( localize(4356, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
+                name: ( localize(4149, "Editor Language Status")),
+                ariaLabel: ( localize(4150, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
                 tooltip: element,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? `${text}\u00A0\u00A0$(sync~spin)` : text,
@@ -280,7 +283,7 @@ let LanguageStatus = class LanguageStatus {
         store.add(actionBar);
         let action;
         if (!isPinned) {
-            action = ( (new Action('pin', ( localize(4357, "Add to Status Bar")), ThemeIcon.asClassName(Codicon.pin), true, () => {
+            action = ( (new Action('pin', ( localize(4151, "Add to Status Bar")), ThemeIcon.asClassName(Codicon.pin), true, () => {
                 this._dedicated.add(status.id);
                 this._statusBarService.updateEntryVisibility(status.id, true);
                 this._update();
@@ -288,7 +291,7 @@ let LanguageStatus = class LanguageStatus {
             })));
         }
         else {
-            action = ( (new Action('unpin', ( localize(4358, "Remove from Status Bar")), ThemeIcon.asClassName(Codicon.pinned), true, () => {
+            action = ( (new Action('unpin', ( localize(4152, "Remove from Status Bar")), ThemeIcon.asClassName(Codicon.pinned), true, () => {
                 this._dedicated.delete(status.id);
                 this._statusBarService.updateEntryVisibility(status.id, false);
                 this._update();
@@ -330,10 +333,10 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof status.label === 'string' ? status.label : status.label.value;
         if (status.detail) {
-            return { label: ( localize(4359, '{0}, {1}', textValue, status.detail)) };
+            return { label: ( localize(4153, '{0}, {1}', textValue, status.detail)) };
         }
         else {
-            return { label: ( localize(4360, '{0}', textValue)) };
+            return { label: ( localize(4154, '{0}', textValue)) };
         }
     }
     static _asStatusbarEntry(item) {
@@ -346,7 +349,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;
         return {
-            name: ( localize(4361, '{0} (Language Status)', item.name)),
+            name: ( localize(4155, '{0} (Language Status)', item.name)),
             text: item.busy ? `${textValue}\u00A0\u00A0$(sync~spin)` : textValue,
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -369,7 +372,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'editor.inlayHints.Reset',
-            title: ( localize2(4362, "Reset Language Status Interaction Counter")),
+            title: ( localize2(4156, "Reset Language Status Interaction Counter")),
             category: Categories.View,
             f1: true
         });