@codingame/monaco-vscode-view-common-service-override 32.0.2 → 34.0.0

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

@@ -22,11 +22,11 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(15273, "Whether a type hierarchy provider is available"))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(15274, "Whether type hierarchy peek is currently showing"))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(15612, "Whether a type hierarchy provider is available"))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(15613, "Whether type hierarchy peek is currently showing"))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey("typeHierarchyDirection", undefined, {
     type: "string",
-    description: ( localize(15275, "whether type hierarchy shows super types or subtypes"))
+    description: ( localize(15614, "whether type hierarchy shows super types or subtypes"))
 }));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes ? candidate : TypeHierarchyDirection.Subtypes;
@@ -121,14 +121,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._sessionDisposables.add(model);
                 this._widget.showModel(model);
             } else {
-                this._widget.showMessage(( localize(15276, "No results")));
+                this._widget.showMessage(( localize(15615, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(15277, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(15616, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -179,7 +179,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showTypeHierarchy",
-            title: ( localize2(15278, "Peek Type Hierarchy")),
+            title: ( localize2(15617, "Peek Type Hierarchy")),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: "navigation",
@@ -198,7 +198,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSupertypes",
-            title: ( localize2(15279, "Show Supertypes")),
+            title: ( localize2(15618, "Show Supertypes")),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
@@ -220,7 +220,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSubtypes",
-            title: ( localize2(15280, "Show Subtypes")),
+            title: ( localize2(15619, "Show Subtypes")),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
@@ -242,7 +242,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.refocusTypeHierarchy",
-            title: ( localize2(15281, "Refocus Type Hierarchy")),
+            title: ( localize2(15620, "Refocus Type Hierarchy")),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -258,7 +258,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.closeTypeHierarchy",
-            title: ( localize(15282, "Close")),
+            title: ( localize(15621, "Close")),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js

@@ -326,12 +326,12 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15283, "Supertypes of '{0}'", element.model.root.name)) : ( localize(15284, "Subtypes of '{0}'", element.model.root.name));
+        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15622, "Supertypes of '{0}'", element.model.root.name)) : ( localize(15623, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset["state"] = State.Loading;
-        this.setTitle(( localize(15285, "Loading...")));
+        this.setTitle(( localize(15624, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -349,7 +349,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         const root = this._tree.getNode(model).children[0];
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
-            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15286, "No supertypes of '{0}'", model.root.name)) : ( localize(15287, "No subtypes of '{0}'", model.root.name)));
+            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(15625, "No supertypes of '{0}'", model.root.name)) : ( localize(15626, "No subtypes of '{0}'", model.root.name)));
         } else {
             this._parent.dataset["state"] = State.Data;
             if (!viewState || this._tree.getFocus().length === 0) {

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js

@@ -123,13 +123,13 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(15288, "Type Hierarchy");
+        return localize(15627, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(15289, "supertypes of {0}", element.item.name);
+            return localize(15628, "supertypes of {0}", element.item.name);
         } else {
-            return localize(15290, "subtypes of {0}", element.item.name);
+            return localize(15629, "subtypes of {0}", element.item.name);
         }
     }
 }

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.d.ts

@@ -118,6 +118,8 @@ export declare class WebviewElement extends Disposable implements IWebviewElemen
     private doUpdateContent;
     protected style(): void;
     protected handleFocusChange(isFocused: boolean): void;
+    private shouldForwardKeyEvent;
+    private isActiveElement;
     private handleKeyEvent;
     private handleDragEvent;
     windowDidDragStart(): void;

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -174,6 +174,9 @@ let WebviewElement = class WebviewElement extends Disposable {
                 uri
             }
         ) => {
+            if (!this.isActiveElement()) {
+                return;
+            }
             this._onDidClickLink.fire(uri);
         }));
         this._register(this.on("onmessage", (
@@ -220,7 +223,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on("fatal-error", e => {
-            notificationService.error(( localize(15647, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(15986, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({
                 message: e.message
             });
@@ -643,7 +646,16 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._onDidBlur.fire();
         }
     }
+    shouldForwardKeyEvent(event) {
+        return event.isTrusted || !!this._content.options.forwardUntrustedKeypressEvents;
+    }
+    isActiveElement() {
+        return !!this.element && this.window?.document.activeElement === this.element;
+    }
     handleKeyEvent(type, event) {
+        if (!this.shouldForwardKeyEvent(event) || !this.isActiveElement()) {
+            return;
+        }
         const emulatedKeyboardEvent = ( new KeyboardEvent(type, event));
         Object.defineProperty(emulatedKeyboardEvent, "target", {
             get: () => this.element

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js

@@ -18,7 +18,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
         this.ID = "editor.action.webvieweditor.showFind";
     }
     static {
-        this.LABEL = ( localize(15678, "Show find"));
+        this.LABEL = ( localize(16017, "Show find"));
     }
     constructor() {
         super({
@@ -43,7 +43,7 @@ class HideWebViewEditorFindCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.hideFind";
     }
     static {
-        this.LABEL = ( localize(15679, "Stop find"));
+        this.LABEL = ( localize(16018, "Stop find"));
     }
     constructor() {
         super({
@@ -68,7 +68,7 @@ class WebViewEditorFindNextCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findNext";
     }
     static {
-        this.LABEL = ( localize(15680, "Find next"));
+        this.LABEL = ( localize(16019, "Find next"));
     }
     constructor() {
         super({
@@ -93,7 +93,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findPrevious";
     }
     static {
-        this.LABEL = ( localize(15681, "Find previous"));
+        this.LABEL = ( localize(16020, "Find previous"));
     }
     constructor() {
         super({
@@ -118,7 +118,7 @@ class ReloadWebviewAction extends Action2 {
         this.ID = "workbench.action.webview.reloadWebviewAction";
     }
     static {
-        this.LABEL = ( localize2(15682, "Reload Webviews"));
+        this.LABEL = ( localize2(16021, "Reload Webviews"));
     }
     constructor() {
         super({

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.js

@@ -126,6 +126,7 @@ function restoreWebviewOptions(options) {
 function restoreWebviewContentOptions(options) {
     return {
         ...options,
+        forwardUntrustedKeypressEvents: options.forwardUntrustedKeypressEvents ?? true,
         localResourceRoots: options.localResourceRoots?.map(uri => reviveUri(uri))
     };
 }

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

@@ -19,7 +19,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(15684, "webview editor"))),
+    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(16023, "webview editor"))),
     [( new SyncDescriptor(WebviewInput))]
 );
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.d.ts

@@ -10,7 +10,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IUntypedEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
-import { EditorAssociations, EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, ResolvedEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
+import { EditorAssociations, EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorRegistrationInfo, ResolvedEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
 import { IEditorResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service";
 import { PreferredGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService";
 export declare class EditorResolverService extends Disposable implements IEditorResolverService {
@@ -37,7 +37,7 @@ export declare class EditorResolverService extends Disposable implements IEditor
     resolveEditor(editor: IUntypedEditorInput, preferredGroup: PreferredGroup | undefined): Promise<ResolvedEditor>;
     private doResolveSideBySideEditor;
     bufferChangeEvents(callback: Function): void;
-    registerEditor(globPattern: string | glob.IRelativePattern, editorInfo: RegisteredEditorInfo, options: RegisteredEditorOptions, editorFactoryObject: EditorInputFactoryObject): IDisposable;
+    registerEditor(globPattern: string | glob.IRelativePattern, editorInfo: RegisteredEditorRegistrationInfo, options: RegisteredEditorOptions, editorFactoryObject: EditorInputFactoryObject): IDisposable;
     getAssociationsForResource(resource: URI): EditorAssociations;
     private getAssociationsForResourceByType;
     private getAssociationsForResourceFromSetting;

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -23,10 +23,18 @@ import { SideBySideEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/wo
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { findGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupFinder';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { ResolvedStatus, editorsAssociationsSettingId, diffEditorsAssociationsSettingId, globMatchesResource, RegisteredEditorPriority, priorityToRank } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
+import { toRegisteredEditorPriorityInfo, ResolvedStatus, editorsAssociationsSettingId, diffEditorsAssociationsSettingId, globMatchesResource, RegisteredEditorPriority, priorityToRank } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 var EditorResolverService_1;
+function normalizeRegisteredEditorInfo(editorInfo) {
+    return {
+        id: editorInfo.id,
+        label: editorInfo.label,
+        detail: editorInfo.detail,
+        priority: toRegisteredEditorPriorityInfo(editorInfo.priority)
+    };
+}
 var EditorAssociationType;
 (function(EditorAssociationType) {
     EditorAssociationType[EditorAssociationType["Editor"] = 0] = "Editor";
@@ -234,22 +242,23 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         }
     }
     registerEditor(globPattern, editorInfo, options, editorFactoryObject) {
+        const registeredEditorInfo = normalizeRegisteredEditorInfo(editorInfo);
         let registeredEditor = this._editors.get(globPattern);
         if (registeredEditor === undefined) {
             registeredEditor = ( new Map());
             this._editors.set(globPattern, registeredEditor);
         }
-        let editorsWithId = registeredEditor.get(editorInfo.id);
+        let editorsWithId = registeredEditor.get(registeredEditorInfo.id);
         if (editorsWithId === undefined) {
             editorsWithId = [];
         }
         const remove = insert(editorsWithId, {
             globPattern,
-            editorInfo,
+            editorInfo: registeredEditorInfo,
             options,
             editorFactoryObject
         });
-        registeredEditor.set(editorInfo.id, editorsWithId);
+        registeredEditor.set(registeredEditorInfo.id, editorsWithId);
         this._shouldReFlattenEditors = true;
         this._onDidChangeEditorRegistrations.fire();
         return toDisposable(() => {
@@ -400,7 +409,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                     continue;
                 }
                 const foundInSettings = userSettings.find(setting => setting.viewType === editor.editorInfo.id);
-                if ((foundInSettings && editor.editorInfo.priority !== RegisteredEditorPriority.exclusive) || globMatchesResource(key, resource)) {
+                if ((foundInSettings && this.getEffectivePriority(editor.editorInfo, associationType) !== RegisteredEditorPriority.exclusive) || globMatchesResource(key, resource)) {
                     matchingEditors.push(editor);
                 }
             }
@@ -418,7 +427,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         this._flattenedEditors = this._flattenEditorsMap();
         if (URI.isUri(resource)) {
             const editors = this.findMatchingEditors(resource);
-            if (editors.find(e => e.editorInfo.priority === RegisteredEditorPriority.exclusive)) {
+            if (editors.find(e => e.editorInfo.priority.editor === RegisteredEditorPriority.exclusive)) {
                 return [];
             }
             return ( editors.map(editor => editor.editorInfo));
@@ -479,11 +488,11 @@ let EditorResolverService = class EditorResolverService extends Disposable {
     getEffectivePriority(editorInfo, associationType) {
         switch (associationType) {
         case EditorAssociationType.DiffEditor:
-            return editorInfo.diffEditorPriority ?? editorInfo.priority;
+            return editorInfo.priority.diff;
         case EditorAssociationType.MergeEditor:
-            return editorInfo.mergeEditorPriority ?? editorInfo.priority;
+            return editorInfo.priority.merge;
         default:
-            return editorInfo.priority;
+            return editorInfo.priority.editor;
         }
     }
     async doResolveEditor(editor, group, selectedEditor) {
@@ -627,8 +636,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource]?.find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Warning, ( localize(16518, "There are multiple default editors available for the resource.")), [{
-            label: ( localize(16519, "Configure Default")),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(16865, "There are multiple default editors available for the resource.")), [{
+            label: ( localize(16866, "Configure Default")),
             run: async () => {
                 const picked = await this.doPickEditor(untypedInput, true);
                 if (!picked) {
@@ -646,7 +655,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }]);
             }
         }, {
-            label: ( localize(16520, "Keep {0}", editorName)),
+            label: ( localize(16867, "Keep {0}", editorName)),
             run: writeCurrentEditorsToStorage
         }]);
         const onCloseListener = handle.onDidClose(() => {
@@ -656,7 +665,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
     }
     mapEditorsToQuickPickEntry(resource, showDefaultPicker, associationType) {
         const currentEditor = this.editorGroupService.activeGroup.findEditors(resource).at(0);
-        let registeredEditors = resource.scheme === Schemas.untitled ? this._registeredEditors.filter(e => e.editorInfo.priority !== RegisteredEditorPriority.exclusive) : this.findMatchingEditors(resource, associationType);
+        let registeredEditors = resource.scheme === Schemas.untitled ? this._registeredEditors.filter(e => e.editorInfo.priority.editor !== RegisteredEditorPriority.exclusive) : this.findMatchingEditors(resource, associationType);
         if (associationType === EditorAssociationType.DiffEditor) {
             registeredEditors = registeredEditors.filter(editor => !!editor.editorFactoryObject.createDiffEditorInput);
         }
@@ -668,15 +677,15 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             } else if (b.editorInfo.id === DEFAULT_EDITOR_ASSOCIATION.id) {
                 return 1;
             } else {
-                return priorityToRank(b.editorInfo.priority) - priorityToRank(a.editorInfo.priority);
+                return priorityToRank(this.getEffectivePriority(b.editorInfo, associationType)) - priorityToRank(this.getEffectivePriority(a.editorInfo, associationType));
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(16521, "Active"));
-        const currentDefaultLabel = ( localize(16522, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(16523, "Active and Default"));
+        const currentlyActiveLabel = ( localize(16868, "Active"));
+        const currentDefaultLabel = ( localize(16869, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(16870, "Active and Default"));
         let defaultViewType = defaultSetting;
-        if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
+        if (!defaultViewType && registeredEditors.length > 2 && this.getEffectivePriority(registeredEditors[1].editorInfo, associationType) !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
         }
         if (!defaultViewType) {
@@ -690,7 +699,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 id: editor.editorInfo.id,
                 label: editor.editorInfo.label,
                 description: isActive && isDefault ? currentDefaultAndActiveLabel : isActive ? currentlyActiveLabel : isDefault ? currentDefaultLabel : undefined,
-                detail: editor.editorInfo.detail ?? editor.editorInfo.priority
+                detail: editor.editorInfo.detail ?? editor.editorInfo.priority.editor
             };
             quickPickEntries.push(quickPickEntry);
         });
@@ -701,7 +710,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(16524, "Configure default editor for '{0}'...", `*${extname(resource)}`))
+                label: ( localize(16871, "Configure default editor for '{0}'...", `*${extname(resource)}`))
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -722,7 +731,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({
             useSeparators: true
         }));
-        const placeHolderMessage = showDefaultPicker ? ( localize(16525, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(16526, "Select editor for '{0}'", basename(resource)));
+        const placeHolderMessage = showDefaultPicker ? ( localize(16872, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(16873, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;
@@ -778,7 +787,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const cacheStorage = ( new Set());
         for (const [globPattern, contribPoint] of this._flattenedEditors) {
             const nonOptional = !!contribPoint.find(
-                c => c.editorInfo.priority !== RegisteredEditorPriority.option && c.editorInfo.id !== DEFAULT_EDITOR_ASSOCIATION.id
+                c => c.editorInfo.priority.editor !== RegisteredEditorPriority.option && c.editorInfo.id !== DEFAULT_EDITOR_ASSOCIATION.id
             );
             if (!nonOptional) {
                 continue;

package/vscode/src/vs/workbench/services/history/browser/historyService.js

@@ -101,33 +101,33 @@ let HistoryService = class HistoryService extends Disposable {
             return matcher;
         }));
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(16741, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(16742, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(17088, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(17089, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = ( new RawContextKey("canNavigateBackInNavigationLocations", false, ( localize(
-            16743,
+            17090,
             "Whether it is possible to navigate back in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = ( new RawContextKey("canNavigateForwardInNavigationLocations", false, ( localize(
-            16744,
+            17091,
             "Whether it is possible to navigate forward in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = ( new RawContextKey("canNavigateToLastNavigationLocation", false, ( localize(
-            16745,
+            17092,
             "Whether it is possible to navigate to the last editor navigation location"
         )))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = ( new RawContextKey("canNavigateBackInEditLocations", false, ( localize(
-            16746,
+            17093,
             "Whether it is possible to navigate back in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = ( new RawContextKey("canNavigateForwardInEditLocations", false, ( localize(
-            16747,
+            17094,
             "Whether it is possible to navigate forward in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = ( new RawContextKey("canNavigateToLastEditLocation", false, ( localize(
-            16748,
+            17095,
             "Whether it is possible to navigate to the last editor edit location"
         )))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(16749, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(17096, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
         this.registerListeners();
         if (this.editorService.activeEditorPane) {
             this.onDidActiveEditorChange();

package/vscode/src/vs/workbench/services/progress/browser/progressService.js

@@ -157,7 +157,9 @@ let ProgressService = class ProgressService extends Disposable {
             this.updateWindowProgress();
             Promise.all([timeout(150), promise]).finally(() => {
                 const idx = this.windowProgressStack.indexOf(task);
-                this.windowProgressStack.splice(idx, 1);
+                if (idx !== -1) {
+                    this.windowProgressStack.splice(idx, 1);
+                }
                 this.updateWindowProgress();
             });
         }, 150);
@@ -173,20 +175,20 @@ let ProgressService = class ProgressService extends Disposable {
             let title;
             const source = options.source && typeof options.source !== "string" ? options.source.label : options.source;
             if (progressTitle && progressMessage) {
-                text = ( localize(16878, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(16879, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(17225, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(17226, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             } else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(16880, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(17227, "[{0}]: {1}", source, progressTitle)) : text;
             } else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(16880, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(17227, "[{0}]: {1}", source, progressMessage)) : text;
             } else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(16881, "Progress Message")),
+                name: ( localize(17228, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -292,7 +294,7 @@ let ProgressService = class ProgressService extends Disposable {
                     constructor() {
                         super(
                             "progress.cancel",
-                            typeof options.cancellable === "string" ? options.cancellable : ( localize(16882, "Cancel")),
+                            typeof options.cancellable === "string" ? options.cancellable : ( localize(17229, "Cancel")),
                             undefined,
                             true
                         );
@@ -484,7 +486,7 @@ let ProgressService = class ProgressService extends Disposable {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(
-                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(16882, "Cancel")) : options.cancellable) : ( localize(16883, "Dismiss"))
+                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(17229, "Cancel")) : options.cancellable) : ( localize(17230, "Dismiss"))
                 );
             }
             dialog = ( new Dialog(

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.d.ts

@@ -78,7 +78,6 @@ export declare class ViewDescriptorService extends Disposable implements IViewDe
     getViewContainerByViewId(viewId: string): ViewContainer | null;
     getViewContainerLocation(viewContainer: ViewContainer): ViewContainerLocation;
     getDefaultViewContainerLocation(viewContainer: ViewContainer): ViewContainerLocation;
-    private getEffectiveViewContainerLocation;
     getDefaultContainerById(viewId: string): ViewContainer | null;
     getViewContainerModel(container: ViewContainer): ViewContainerModel;
     getViewContainerById(id: string): ViewContainer | null;

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, ViewContainerLocation, WindowEnablement, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
+import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, WindowEnablement, ViewContainerLocation, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ContextKeyExpr, RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -290,17 +290,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         return containerId ? this.getViewContainerById(containerId) : this.getDefaultContainerById(viewId);
     }
     getViewContainerLocation(viewContainer) {
-        const location = this.viewContainersCustomLocations.get(viewContainer.id) ?? this.getDefaultViewContainerLocation(viewContainer);
-        return this.getEffectiveViewContainerLocation(location);
+        return this.viewContainersCustomLocations.get(viewContainer.id) ?? this.getDefaultViewContainerLocation(viewContainer);
     }
     getDefaultViewContainerLocation(viewContainer) {
-        return this.getEffectiveViewContainerLocation(this.viewContainersRegistry.getViewContainerLocation(viewContainer));
-    }
-    getEffectiveViewContainerLocation(location) {
-        if (!this.isSessionsWindow && location === ViewContainerLocation.ChatBar) {
-            return ViewContainerLocation.AuxiliaryBar;
-        }
-        return location;
+        return this.viewContainersRegistry.getViewContainerLocation(viewContainer);
     }
     getDefaultContainerById(viewId) {
         return this.viewsRegistry.getViewContainer(viewId) ?? null;
@@ -507,7 +500,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 mergeViewWithContainerWhenSingleView: true
             }])),
             title: {
-                value: ( localize(17260, "User View Container")),
+                value: ( localize(17607, "User View Container")),
                 original: "User View Container"
             },
             icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
@@ -820,7 +813,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                             title: viewDescriptor.name,
                             metadata: {
                                 description: ( localize2(
-                                    17261,
+                                    17608,
                                     "Toggles the visibility of the {0} view if the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -851,10 +844,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(17262, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(17609, "Hide '{0}'", viewDescriptor.name.value)),
                             metadata: {
                                 description: ( localize2(
-                                    17263,
+                                    17610,
                                     "Hides the {0} view if it is visible and the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -884,7 +877,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(17264, "Reset Location")),
+                    title: ( localize2(17611, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewContainerTitleContext,
                         group: "1_viewActions",