@codingame/monaco-vscode-view-common-service-override 30.0.0 → 31.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(14783, "Whether a type hierarchy provider is available"))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(14784, "Whether type hierarchy peek is currently showing"))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(14943, "Whether a type hierarchy provider is available"))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(14944, "Whether type hierarchy peek is currently showing"))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey("typeHierarchyDirection", undefined, {
     type: "string",
-    description: ( localize(14785, "whether type hierarchy shows super types or subtypes"))
+    description: ( localize(14945, "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(14786, "No results")));
+                this._widget.showMessage(( localize(14946, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(14787, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(14947, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -179,7 +179,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showTypeHierarchy",
-            title: ( localize2(14788, "Peek Type Hierarchy")),
+            title: ( localize2(14948, "Peek Type Hierarchy")),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: "navigation",
@@ -198,7 +198,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSupertypes",
-            title: ( localize2(14789, "Show Supertypes")),
+            title: ( localize2(14949, "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(14790, "Show Subtypes")),
+            title: ( localize2(14950, "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(14791, "Refocus Type Hierarchy")),
+            title: ( localize2(14951, "Refocus Type Hierarchy")),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -258,7 +258,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.closeTypeHierarchy",
-            title: ( localize(14792, "Close")),
+            title: ( localize(14952, "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(14793, "Supertypes of '{0}'", element.model.root.name)) : ( localize(14794, "Subtypes of '{0}'", element.model.root.name));
+        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(14953, "Supertypes of '{0}'", element.model.root.name)) : ( localize(14954, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset["state"] = State.Loading;
-        this.setTitle(( localize(14795, "Loading...")));
+        this.setTitle(( localize(14955, "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(14796, "No supertypes of '{0}'", model.root.name)) : ( localize(14797, "No subtypes of '{0}'", model.root.name)));
+            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(14956, "No supertypes of '{0}'", model.root.name)) : ( localize(14957, "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(14798, "Type Hierarchy");
+        return localize(14958, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(14799, "supertypes of {0}", element.item.name);
+            return localize(14959, "supertypes of {0}", element.item.name);
         } else {
-            return localize(14800, "subtypes of {0}", element.item.name);
+            return localize(14960, "subtypes of {0}", element.item.name);
         }
     }
 }

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

@@ -6,17 +6,20 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
-import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IOverlayWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
 /**
- * Webview that is absolutely positioned over another element and that can creates and destroys an underlying webview as needed.
+ * Webview that is absolutely positioned over another element and that can
+ * creates and destroys an underlying webview as needed.
+ *
+ * Absolutely positioning is needed because webviews (iframes) cannot be re-parented without losing their state.
+ * This means that webviews are always placed on a top level and then moved over
+ * the element they are anchored to so they visually look like they are part of the original layout.
  */
 export declare class OverlayWebview extends Disposable implements IOverlayWebview {
     private readonly _layoutService;
     private readonly _webviewService;
     private readonly _baseContextKeyService;
-    private readonly _editorGroupsService;
     private _isFirstLoad;
     private readonly _firstLoadPendingMessages;
     private readonly _webview;
@@ -37,8 +40,8 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
     private _shouldShowFindWidgetOnRestore;
     readonly providedViewType?: string;
     origin: string;
-    private _container;
-    constructor(initInfo: WebviewInitInfo, _layoutService: IWorkbenchLayoutService, _webviewService: IWebviewService, _baseContextKeyService: IContextKeyService, _editorGroupsService: IEditorGroupsService);
+    private _overlayLayout;
+    constructor(initInfo: WebviewInitInfo, _layoutService: IWorkbenchLayoutService, _webviewService: IWebviewService, _baseContextKeyService: IContextKeyService);
     get isFocused(): boolean;
     private _isDisposed;
     private readonly _onDidDispose;
@@ -47,8 +50,7 @@ export declare class OverlayWebview extends Disposable implements IOverlayWebvie
     get container(): HTMLElement;
     claim(owner: unknown, targetWindow: CodeWindow, scopedContextKeyService: IContextKeyService | undefined): void;
     release(owner: unknown): void;
-    layoutWebviewOverElement(element: HTMLElement, dimension?: Dimension, clippingContainer?: HTMLElement): void;
-    private doLayoutWebviewOverElement;
+    layoutWebviewOverElement(anchorElement: HTMLElement, dimension?: Dimension, clippingContainer?: HTMLElement): void;
     private _show;
     setHtml(html: string): void;
     setTitle(title: string): void;

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

@@ -1,14 +1,13 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { getWindowById, createElement, isHTMLElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { FastDomNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/fastDomNode';
+import { getWindowById } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { OverlayLayoutElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/overlayLayoutElement';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -18,18 +17,11 @@ let OverlayWebview = class OverlayWebview extends Disposable {
     get window() {
         return getWindowById(this._windowId, true).window;
     }
-    constructor(
-        initInfo,
-        _layoutService,
-        _webviewService,
-        _baseContextKeyService,
-        _editorGroupsService
-    ) {
+    constructor(initInfo, _layoutService, _webviewService, _baseContextKeyService) {
         super();
         this._layoutService = _layoutService;
         this._webviewService = _webviewService;
         this._baseContextKeyService = _baseContextKeyService;
-        this._editorGroupsService = _editorGroupsService;
         this._isFirstLoad = true;
         this._firstLoadPendingMessages = ( new Set());
         this._webview = this._register(( new MutableDisposable()));
@@ -75,8 +67,8 @@ let OverlayWebview = class OverlayWebview extends Disposable {
     }
     dispose() {
         this._isDisposed = true;
-        this._container?.domNode.remove();
-        this._container = undefined;
+        this._overlayLayout?.dispose();
+        this._overlayLayout = undefined;
         for (const msg of this._firstLoadPendingMessages) {
             msg.resolve(false);
         }
@@ -88,22 +80,13 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         if (this._isDisposed) {
             throw ( new Error(`OverlayWebview has been disposed`));
         }
-        if (!this._container) {
-            const node = createElement("div");
-            node.style.position = "absolute";
-            node.style.overflow = "hidden";
-            this._container = ( new FastDomNode(node));
-            this._container.setVisibility("hidden");
-            const modalEditorContainer = this._editorGroupsService.activeModalEditorPart?.modalElement;
-            let root;
-            if (isHTMLElement(modalEditorContainer)) {
-                root = modalEditorContainer;
-            } else {
-                root = this._layoutService.getContainer(this.window);
-            }
-            root.appendChild(node);
+        if (!this._overlayLayout) {
+            this._overlayLayout = ( new OverlayLayoutElement());
+            this._overlayLayout.content.style.visibility = "hidden";
+            const root = this._layoutService.getContainer(this.window);
+            root.appendChild(this._overlayLayout.root);
         }
-        return this._container.domNode;
+        return this._overlayLayout.content;
     }
     claim(owner, targetWindow, scopedContextKeyService) {
         if (this._isDisposed) {
@@ -114,8 +97,8 @@ let OverlayWebview = class OverlayWebview extends Disposable {
             this.release(oldOwner);
             this._webview.clear();
             this._webviewEvents.clear();
-            this._container?.domNode.remove();
-            this._container = undefined;
+            this._overlayLayout?.dispose();
+            this._overlayLayout = undefined;
         }
         this._owner = owner;
         this._windowId = targetWindow.vscodeWindowId;
@@ -140,8 +123,8 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         }
         this._scopedContextKeyService.clear();
         this._owner = undefined;
-        if (this._container) {
-            this._container.setVisibility("hidden");
+        if (this._overlayLayout) {
+            this._overlayLayout.content.style.visibility = "hidden";
         }
         if (this._options.retainContextWhenHidden) {
             this._shouldShowFindWidgetOnRestore = !!this._findWidgetVisible?.get();
@@ -151,40 +134,14 @@ let OverlayWebview = class OverlayWebview extends Disposable {
             this._webviewEvents.clear();
         }
     }
-    layoutWebviewOverElement(element, dimension, clippingContainer) {
-        if (!this._container || !this._container.domNode.parentElement) {
-            return;
-        }
-        const whenContainerStylesLoaded = this._layoutService.whenContainerStylesLoaded(this.window);
-        if (whenContainerStylesLoaded) {
-            whenContainerStylesLoaded.then(
-                () => this.doLayoutWebviewOverElement(element, dimension, clippingContainer)
-            );
-        } else {
-            this.doLayoutWebviewOverElement(element, dimension, clippingContainer);
-        }
-    }
-    doLayoutWebviewOverElement(element, dimension, clippingContainer) {
-        if (!this._container || !this._container.domNode.parentElement) {
+    layoutWebviewOverElement(anchorElement, dimension, clippingContainer) {
+        if (!this._overlayLayout || !this._overlayLayout.content.parentElement) {
             return;
         }
-        const frameRect = element.getBoundingClientRect();
-        const containerRect = this._container.domNode.parentElement.getBoundingClientRect();
-        const parentBorderTop = (containerRect.height - this._container.domNode.parentElement.clientHeight) / 2.0;
-        const parentBorderLeft = (containerRect.width - this._container.domNode.parentElement.clientWidth) / 2.0;
-        this._container.setTop(frameRect.top - containerRect.top - parentBorderTop);
-        this._container.setLeft(frameRect.left - containerRect.left - parentBorderLeft);
-        this._container.setWidth(dimension ? dimension.width : frameRect.width);
-        this._container.setHeight(dimension ? dimension.height : frameRect.height);
-        if (clippingContainer) {
-            const {
-                top,
-                left,
-                right,
-                bottom
-            } = computeClippingRect(frameRect, clippingContainer);
-            this._container.domNode.style.clipPath = `polygon(${left}px ${top}px, ${right}px ${top}px, ${right}px ${bottom}px, ${left}px ${bottom}px)`;
-        }
+        this._overlayLayout?.layoutOverAnchorElement(anchorElement, {
+            clippingContainer,
+            fallbackDimension: dimension
+        });
     }
     _show(targetWindow) {
         if (this._isDisposed) {
@@ -257,7 +214,9 @@ let OverlayWebview = class OverlayWebview extends Disposable {
             this.showFind(false);
             this._shouldShowFindWidgetOnRestore = false;
         }
-        this._container?.setVisibility("visible");
+        if (this._overlayLayout) {
+            this._overlayLayout.content.style.visibility = "visible";
+        }
     }
     setHtml(html) {
         this._html = html;
@@ -375,19 +334,6 @@ let OverlayWebview = class OverlayWebview extends Disposable {
         this._webview.value?.setContextKeyService(contextKeyService);
     }
 };
-OverlayWebview = ( __decorate([( __param(1, IWorkbenchLayoutService)), ( __param(2, IWebviewService)), ( __param(3, IContextKeyService)), ( __param(4, IEditorGroupsService))], OverlayWebview));
-function computeClippingRect(frameRect, clipper) {
-    const rootRect = clipper.getBoundingClientRect();
-    const top = Math.max(rootRect.top - frameRect.top, 0);
-    const right = Math.max(frameRect.width - (frameRect.right - rootRect.right), 0);
-    const bottom = Math.max(frameRect.height - (frameRect.bottom - rootRect.bottom), 0);
-    const left = Math.max(rootRect.left - frameRect.left, 0);
-    return {
-        top,
-        right,
-        bottom,
-        left
-    };
-}
+OverlayWebview = ( __decorate([( __param(1, IWorkbenchLayoutService)), ( __param(2, IWebviewService)), ( __param(3, IContextKeyService))], OverlayWebview));
 
 export { OverlayWebview };

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

@@ -205,7 +205,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on("fatal-error", e => {
-            notificationService.error(( localize(15181, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(15317, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({
                 message: e.message
             });

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(15212, "Show find"));
+        this.LABEL = ( localize(15348, "Show find"));
     }
     constructor() {
         super({
@@ -43,7 +43,7 @@ class HideWebViewEditorFindCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.hideFind";
     }
     static {
-        this.LABEL = ( localize(15213, "Stop find"));
+        this.LABEL = ( localize(15349, "Stop find"));
     }
     constructor() {
         super({
@@ -68,7 +68,7 @@ class WebViewEditorFindNextCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findNext";
     }
     static {
-        this.LABEL = ( localize(15214, "Find next"));
+        this.LABEL = ( localize(15350, "Find next"));
     }
     constructor() {
         super({
@@ -93,7 +93,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findPrevious";
     }
     static {
-        this.LABEL = ( localize(15215, "Find previous"));
+        this.LABEL = ( localize(15351, "Find previous"));
     }
     constructor() {
         super({
@@ -118,7 +118,7 @@ class ReloadWebviewAction extends Action2 {
         this.ID = "workbench.action.webview.reloadWebviewAction";
     }
     static {
-        this.LABEL = ( localize2(15216, "Reload Webviews"));
+        this.LABEL = ( localize2(15352, "Reload Webviews"));
     }
     constructor() {
         super({

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(15218, "webview editor"))),
+    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(15354, "webview editor"))),
     [( new SyncDescriptor(WebviewInput))]
 );
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {

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

@@ -78,5 +78,12 @@ export declare class EditorResolverService extends Disposable implements IEditor
     private mapEditorsToQuickPickEntry;
     private doPickEditor;
     private cacheEditors;
+    /**
+     * Checks if a resource matches any user-configured editor association that
+     * points to a non-default editor. This ensures that on first startup (when
+     * the cache is empty), we still wait for extensions to register before
+     * resolving the editor, so that user-configured custom editors are available.
+     */
+    private resourceMatchesUserAssociation;
     private resourceMatchesCache;
 }

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

@@ -112,7 +112,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         let resource = EditorResourceAccessor.getCanonicalUri(untypedEditor, {
             supportSideBySide: SideBySideEditor.PRIMARY
         });
-        if (this.cache && resource && this.resourceMatchesCache(resource)) {
+        if (this.cache && resource && (this.resourceMatchesCache(resource) || this.resourceMatchesUserAssociation(resource))) {
             await this.extensionService.whenInstalledExtensionsRegistered();
         }
         if (resource === undefined) {
@@ -560,8 +560,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource]?.find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Warning, ( localize(15969, "There are multiple default editors available for the resource.")), [{
-            label: ( localize(15970, "Configure Default")),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(16186, "There are multiple default editors available for the resource.")), [{
+            label: ( localize(16187, "Configure Default")),
             run: async () => {
                 const picked = await this.doPickEditor(untypedInput, true);
                 if (!picked) {
@@ -579,7 +579,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }]);
             }
         }, {
-            label: ( localize(15971, "Keep {0}", editorName)),
+            label: ( localize(16188, "Keep {0}", editorName)),
             run: writeCurrentEditorsToStorage
         }]);
         const onCloseListener = handle.onDidClose(() => {
@@ -602,9 +602,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(15972, "Active"));
-        const currentDefaultLabel = ( localize(15973, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(15974, "Active and Default"));
+        const currentlyActiveLabel = ( localize(16189, "Active"));
+        const currentDefaultLabel = ( localize(16190, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(16191, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -631,7 +631,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(15975, "Configure default editor for '{0}'...", `*${extname(resource)}`))
+                label: ( localize(16192, "Configure default editor for '{0}'...", `*${extname(resource)}`))
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -651,7 +651,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({
             useSeparators: true
         }));
-        const placeHolderMessage = showDefaultPicker ? ( localize(15976, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(15977, "Select editor for '{0}'", basename(resource)));
+        const placeHolderMessage = showDefaultPicker ? ( localize(16193, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(16194, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;
@@ -731,6 +731,15 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             StorageTarget.MACHINE
         );
     }
+    resourceMatchesUserAssociation(resource) {
+        const userAssociations = this.getAllUserAssociations();
+        for (const association of userAssociations) {
+            if (association.filenamePattern && association.viewType !== DEFAULT_EDITOR_ASSOCIATION.id && globMatchesResource(association.filenamePattern, resource)) {
+                return true;
+            }
+        }
+        return false;
+    }
     resourceMatchesCache(resource) {
         if (!this.cache) {
             return false;

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(16191, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(16192, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(16408, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(16409, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = ( new RawContextKey("canNavigateBackInNavigationLocations", false, ( localize(
-            16193,
+            16410,
             "Whether it is possible to navigate back in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = ( new RawContextKey("canNavigateForwardInNavigationLocations", false, ( localize(
-            16194,
+            16411,
             "Whether it is possible to navigate forward in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = ( new RawContextKey("canNavigateToLastNavigationLocation", false, ( localize(
-            16195,
+            16412,
             "Whether it is possible to navigate to the last editor navigation location"
         )))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = ( new RawContextKey("canNavigateBackInEditLocations", false, ( localize(
-            16196,
+            16413,
             "Whether it is possible to navigate back in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = ( new RawContextKey("canNavigateForwardInEditLocations", false, ( localize(
-            16197,
+            16414,
             "Whether it is possible to navigate forward in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = ( new RawContextKey("canNavigateToLastEditLocation", false, ( localize(
-            16198,
+            16415,
             "Whether it is possible to navigate to the last editor edit location"
         )))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(16199, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(16416, "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

@@ -173,20 +173,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(16327, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(16328, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(16544, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(16545, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             } else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(16329, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(16546, "[{0}]: {1}", source, progressTitle)) : text;
             } else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(16329, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(16546, "[{0}]: {1}", source, progressMessage)) : text;
             } else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(16330, "Progress Message")),
+                name: ( localize(16547, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -292,7 +292,7 @@ let ProgressService = class ProgressService extends Disposable {
                     constructor() {
                         super(
                             "progress.cancel",
-                            typeof options.cancellable === "string" ? options.cancellable : ( localize(16331, "Cancel")),
+                            typeof options.cancellable === "string" ? options.cancellable : ( localize(16548, "Cancel")),
                             undefined,
                             true
                         );
@@ -484,7 +484,7 @@ let ProgressService = class ProgressService extends Disposable {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(
-                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(16331, "Cancel")) : options.cancellable) : ( localize(16332, "Dismiss"))
+                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(16548, "Cancel")) : options.cancellable) : ( localize(16549, "Dismiss"))
                 );
             }
             dialog = ( new Dialog(

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

@@ -509,7 +509,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 mergeViewWithContainerWhenSingleView: true
             }])),
             title: {
-                value: ( localize(16709, "User View Container")),
+                value: ( localize(16926, "User View Container")),
                 original: "User View Container"
             },
             icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
@@ -822,7 +822,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                             title: viewDescriptor.name,
                             metadata: {
                                 description: ( localize2(
-                                    16710,
+                                    16927,
                                     "Toggles the visibility of the {0} view if the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -853,10 +853,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(16711, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(16928, "Hide '{0}'", viewDescriptor.name.value)),
                             metadata: {
                                 description: ( localize2(
-                                    16712,
+                                    16929,
                                     "Hides the {0} view if it is visible and the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -886,7 +886,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(16713, "Reset Location")),
+                    title: ( localize2(16930, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewContainerTitleContext,
                         group: "1_viewActions",