@codingame/monaco-vscode-view-common-service-override 32.0.1 → 33.0.9

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

@@ -5,7 +5,7 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Extensions, ConfigurationScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
-import { RegisteredEditorPriority, editorsAssociationsSettingId, diffEditorsAssociationsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
+import { toRegisteredEditorPriorityInfo, RegisteredEditorPriority, editorsAssociationsAgentsWindowDefault, editorsAssociationsSettingId, diffEditorsAssociationsSettingId } 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 { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
@@ -33,20 +33,20 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
         this.AUTO_LOCK_EXTRA_EDITORS = [
         {
             id: "workbench.input.interactive",
-            label: ( localize(3506, "Interactive Window")),
-            priority: RegisteredEditorPriority.builtin
+            label: ( localize(3528, "Interactive Window")),
+            priority: toRegisteredEditorPriorityInfo(RegisteredEditorPriority.builtin)
         }, {
             id: "mainThreadWebview-markdown.preview",
-            label: ( localize(3507, "Markdown Preview")),
-            priority: RegisteredEditorPriority.builtin
+            label: ( localize(3529, "Markdown Preview")),
+            priority: toRegisteredEditorPriorityInfo(RegisteredEditorPriority.builtin)
         }, {
             id: "mainThreadWebview-simpleBrowser.view",
-            label: ( localize(3508, "Simple Browser")),
-            priority: RegisteredEditorPriority.builtin
+            label: ( localize(3530, "Simple Browser")),
+            priority: toRegisteredEditorPriorityInfo(RegisteredEditorPriority.builtin)
         }, {
             id: "mainThreadWebview-browserPreview",
-            label: ( localize(3509, "Live Preview")),
-            priority: RegisteredEditorPriority.builtin
+            label: ( localize(3531, "Live Preview")),
+            priority: toRegisteredEditorPriorityInfo(RegisteredEditorPriority.builtin)
         }];
     }
     static {
@@ -74,7 +74,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
             ...this.editorResolverService.getEditors(),
             ...DynamicEditorConfigurations_1.AUTO_LOCK_EXTRA_EDITORS
         ].filter(e => !( DynamicEditorConfigurations_1.AUTO_LOCK_REMOVE_EDITORS.has(e.id)));
-        const binaryEditorCandidates = ( this.editorResolverService.getEditors().filter(e => e.priority !== RegisteredEditorPriority.exclusive).map(e => e.id));
+        const binaryEditorCandidates = ( this.editorResolverService.getEditors().filter(e => e.priority.editor !== RegisteredEditorPriority.exclusive).map(e => e.id));
         const autoLockGroupConfiguration = Object.create(null);
         for (const editor of lockableEditors) {
             autoLockGroupConfiguration[editor.id] = {
@@ -94,7 +94,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 "workbench.editor.autoLockGroups": {
                     type: "object",
                     description: ( localize(
-                        3510,
+                        3532,
                         "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,
@@ -112,7 +112,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     default: "",
                     enum: [...binaryEditorCandidates, ""],
                     description: ( localize(
-                        3511,
+                        3533,
                         "The default editor for files detected as binary. If undefined, the user will be presented with a picker."
                     ))
                 }
@@ -125,7 +125,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 [editorsAssociationsSettingId]: {
                     type: "object",
                     markdownDescription: ( localize(
-                        3512,
+                        3534,
                         "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
                     )),
                     patternProperties: {
@@ -133,6 +133,9 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                             type: "string",
                             enum: binaryEditorCandidates
                         }
+                    },
+                    agentsWindow: {
+                        default: editorsAssociationsAgentsWindowDefault
                     }
                 }
             }
@@ -144,7 +147,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 [diffEditorsAssociationsSettingId]: {
                     type: "object",
                     markdownDescription: ( localize(
-                        3513,
+                        3535,
                         "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors for diff views (for example `\"*.md\": \"vscode.markdown.preview.editor\"`). These override `workbench.editorAssociations` for diffs."
                     )),
                     patternProperties: {
@@ -166,7 +169,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     minimum: 1,
                     scope: ConfigurationScope.RESOURCE,
                     markdownDescription: ( localize(
-                        3514,
+                        3536,
                         "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/titlebar/menubar.contribution.js

@@ -8,7 +8,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: "File",
         original: "File",
-        mnemonicTitle: ( localize(3774, "&&File"))
+        mnemonicTitle: ( localize(3796, "&&File"))
     },
     order: 1
 });
@@ -17,7 +17,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: "Edit",
         original: "Edit",
-        mnemonicTitle: ( localize(3775, "&&Edit"))
+        mnemonicTitle: ( localize(3797, "&&Edit"))
     },
     order: 2
 });
@@ -26,7 +26,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: "Selection",
         original: "Selection",
-        mnemonicTitle: ( localize(3776, "&&Selection"))
+        mnemonicTitle: ( localize(3798, "&&Selection"))
     },
     order: 3
 });
@@ -35,7 +35,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: "View",
         original: "View",
-        mnemonicTitle: ( localize(3777, "&&View"))
+        mnemonicTitle: ( localize(3799, "&&View"))
     },
     order: 4
 });
@@ -44,7 +44,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: "Go",
         original: "Go",
-        mnemonicTitle: ( localize(3778, "&&Go"))
+        mnemonicTitle: ( localize(3800, "&&Go"))
     },
     order: 5
 });
@@ -53,7 +53,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: "Terminal",
         original: "Terminal",
-        mnemonicTitle: ( localize(3779, "&&Terminal"))
+        mnemonicTitle: ( localize(3801, "&&Terminal"))
     },
     order: 7
 });
@@ -62,7 +62,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: "Help",
         original: "Help",
-        mnemonicTitle: ( localize(3780, "&&Help"))
+        mnemonicTitle: ( localize(3802, "&&Help"))
     },
     order: 8
 });
@@ -71,7 +71,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: "Preferences",
         original: "Preferences",
-        mnemonicTitle: ( localize(3781, "&&Preferences"))
+        mnemonicTitle: ( localize(3803, "&&Preferences"))
     },
     when: IsMacNativeContext,
     order: 9

package/vscode/src/vs/workbench/browser/workbench.zenMode.contribution.js

@@ -16,40 +16,40 @@ import { ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingle
     registry.registerConfiguration({
         "id": "zenMode",
         "order": 9,
-        "title": ( localize(4102, "Zen Mode")),
+        "title": ( localize(4124, "Zen Mode")),
         "type": "object",
         "properties": {
             "zenMode.fullScreen": {
                 "type": "boolean",
                 "default": true,
                 "description": ( localize(
-                    4103,
+                    4125,
                     "Controls whether turning on Zen Mode also puts the workbench into full screen mode."
                 ))
             },
             "zenMode.centerLayout": {
                 "type": "boolean",
                 "default": true,
-                "description": ( localize(4104, "Controls whether turning on Zen Mode also centers the layout."))
+                "description": ( localize(4126, "Controls whether turning on Zen Mode also centers the layout."))
             },
             "zenMode.showTabs": {
                 "type": "string",
                 "enum": ["multiple", "single", "none"],
                 "description": ( localize(
-                    4105,
+                    4127,
                     "Controls whether turning on Zen Mode should show multiple editor tabs, a single editor tab, or hide the editor title area completely."
                 )),
-                "enumDescriptions": [( localize(4106, "Each editor is displayed as a tab in the editor title area.")), ( localize(
-                    4107,
+                "enumDescriptions": [( localize(4128, "Each editor is displayed as a tab in the editor title area.")), ( localize(
+                    4129,
                     "The active editor is displayed as a single large tab in the editor title area."
-                )), ( localize(4108, "The editor title area is not displayed."))],
+                )), ( localize(4130, "The editor title area is not displayed."))],
                 "default": "multiple"
             },
             "zenMode.hideStatusBar": {
                 "type": "boolean",
                 "default": true,
                 "description": ( localize(
-                    4109,
+                    4131,
                     "Controls whether turning on Zen Mode also hides the status bar at the bottom of the workbench."
                 ))
             },
@@ -57,7 +57,7 @@ import { ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingle
                 "type": "boolean",
                 "default": true,
                 "description": ( localize(
-                    4110,
+                    4132,
                     "Controls whether turning on Zen Mode also hides the activity bar either at the left or right of the workbench."
                 ))
             },
@@ -65,7 +65,7 @@ import { ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingle
                 "type": "boolean",
                 "default": true,
                 "description": ( localize(
-                    4111,
+                    4133,
                     "Controls whether turning on Zen Mode also hides the editor line numbers."
                 ))
             },
@@ -73,7 +73,7 @@ import { ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingle
                 "type": "boolean",
                 "default": true,
                 "description": ( localize(
-                    4112,
+                    4134,
                     "Controls whether a window should restore to Zen Mode if it was exited in Zen Mode."
                 ))
             },
@@ -81,7 +81,7 @@ import { ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingle
                 "type": "boolean",
                 "default": true,
                 "description": ( localize(
-                    4113,
+                    4135,
                     "Controls whether notifications do not disturb mode should be enabled while in Zen Mode. If true, only error notifications will pop out."
                 ))
             }
@@ -93,7 +93,7 @@ registerAction2(ZenShowMultipleEditorTabsAction);
 registerAction2(ZenShowSingleEditorTabAction);
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.EditorTabsBarShowTabsZenModeSubmenu,
-    title: ( localize(4114, "Tab Bar")),
+    title: ( localize(4136, "Tab Bar")),
     group: "3_workbench_layout_move",
     order: 10,
     when: InEditorZenModeContext
@@ -103,8 +103,8 @@ registerAction2(class extends Action2 {
         super({
             id: "workbench.action.toggleZenMode",
             title: {
-                ...( localize2(4115, "Toggle Zen Mode")),
-                mnemonicTitle: ( localize(4116, "Zen Mode"))
+                ...( localize2(4137, "Toggle Zen Mode")),
+                mnemonicTitle: ( localize(4138, "Zen Mode"))
             },
             precondition: ( IsAuxiliaryWindowFocusedContext.toNegated()),
             category: Categories.View,

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

@@ -24,11 +24,11 @@ import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/th
 import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 
 var CallHierarchyController_1;
-const _ctxHasCallHierarchyProvider = ( new RawContextKey("editorHasCallHierarchyProvider", false, ( localize(4726, "Whether a call hierarchy provider is available"))));
-const _ctxCallHierarchyVisible = ( new RawContextKey("callHierarchyVisible", false, ( localize(4727, "Whether call hierarchy peek is currently showing"))));
+const _ctxHasCallHierarchyProvider = ( new RawContextKey("editorHasCallHierarchyProvider", false, ( localize(4748, "Whether a call hierarchy provider is available"))));
+const _ctxCallHierarchyVisible = ( new RawContextKey("callHierarchyVisible", false, ( localize(4749, "Whether call hierarchy peek is currently showing"))));
 const _ctxCallHierarchyDirection = ( new RawContextKey("callHierarchyDirection", undefined, {
     type: "string",
-    description: ( localize(4728, "Whether call hierarchy shows incoming or outgoing calls"))
+    description: ( localize(4750, "Whether call hierarchy shows incoming or outgoing calls"))
 }));
 function sanitizedDirection(candidate) {
     return candidate === CallHierarchyDirection.CallsFrom || candidate === CallHierarchyDirection.CallsTo ? candidate : CallHierarchyDirection.CallsTo;
@@ -149,14 +149,14 @@ let CallHierarchyController = class CallHierarchyController {
                 this._sessionDisposables.add(model);
                 this._widget.showModel(model);
             } else {
-                this._widget.showMessage(( localize(4729, "No results")));
+                this._widget.showMessage(( localize(4751, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endCallHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4730, "Failed to show call hierarchy")));
+            this._widget.showMessage(( localize(4752, "Failed to show call hierarchy")));
         });
     }
     showOutgoingCalls() {
@@ -183,7 +183,7 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showCallHierarchy",
-            title: ( localize2(4731, "Peek Call Hierarchy")),
+            title: ( localize2(4753, "Peek Call Hierarchy")),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: "navigation",
@@ -207,8 +207,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showIncomingCalls",
-            title: ( localize2(4732, "Show Incoming Calls")),
-            icon: registerIcon("callhierarchy-incoming", Codicon.callIncoming, ( localize(4733, "Icon for incoming calls in the call hierarchy view."))),
+            title: ( localize2(4754, "Show Incoming Calls")),
+            icon: registerIcon("callhierarchy-incoming", Codicon.callIncoming, ( localize(4755, "Icon for incoming calls in the call hierarchy view."))),
             precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom)))),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -229,8 +229,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showOutgoingCalls",
-            title: ( localize2(4734, "Show Outgoing Calls")),
-            icon: registerIcon("callhierarchy-outgoing", Codicon.callOutgoing, ( localize(4735, "Icon for outgoing calls in the call hierarchy view."))),
+            title: ( localize2(4756, "Show Outgoing Calls")),
+            icon: registerIcon("callhierarchy-outgoing", Codicon.callOutgoing, ( localize(4757, "Icon for outgoing calls in the call hierarchy view."))),
             precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo)))),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -251,7 +251,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.refocusCallHierarchy",
-            title: ( localize2(4736, "Refocus Call Hierarchy")),
+            title: ( localize2(4758, "Refocus Call Hierarchy")),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -267,7 +267,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.closeCallHierarchy",
-            title: ( localize(4737, "Close")),
+            title: ( localize(4759, "Close")),
             icon: Codicon.close,
             precondition: _ctxCallHierarchyVisible,
             keybinding: {

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

@@ -323,12 +323,12 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === CallHierarchyDirection.CallsFrom ? ( localize(4738, "Calls from '{0}'", element.model.root.name)) : ( localize(4739, "Callers of '{0}'", element.model.root.name));
+        const title = this._direction === CallHierarchyDirection.CallsFrom ? ( localize(4760, "Calls from '{0}'", element.model.root.name)) : ( localize(4761, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset["state"] = State.Loading;
-        this.setTitle(( localize(4740, "Loading...")));
+        this.setTitle(( localize(4762, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -346,7 +346,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget 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 === CallHierarchyDirection.CallsFrom ? ( localize(4741, "No calls from '{0}'", model.root.name)) : ( localize(4742, "No callers of '{0}'", model.root.name)));
+            this.showMessage(this._direction === CallHierarchyDirection.CallsFrom ? ( localize(4763, "No calls from '{0}'", model.root.name)) : ( localize(4764, "No callers 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/callHierarchy/browser/callHierarchyTree.js

@@ -131,13 +131,13 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(4743, "Call Hierarchy");
+        return localize(4765, "Call Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
-            return localize(4744, "calls from {0}", element.item.name);
+            return localize(4766, "calls from {0}", element.item.name);
         } else {
-            return localize(4745, "callers of {0}", element.item.name);
+            return localize(4767, "callers of {0}", element.item.name);
         }
     }
 }

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

@@ -149,9 +149,7 @@ let CustomEditorService = class CustomEditorService extends Disposable {
                     id: contributedEditor.id,
                     label: contributedEditor.displayName,
                     detail: contributedEditor.providerDisplayName,
-                    priority: contributedEditor.priority,
-                    diffEditorPriority: contributedEditor.diffEditorPriority,
-                    mergeEditorPriority: contributedEditor.mergeEditorPriority
+                    priority: contributedEditor.priority
                 }, {
                     singlePerResource: () => !(this.getCustomEditorCapabilities(contributedEditor.id)?.supportsMultipleEditorsPerDocument ?? false)
                 }, {
@@ -399,7 +397,7 @@ let CustomEditorService = class CustomEditorService extends Disposable {
             return;
         }
         const possibleEditors = this.getAllCustomEditors(newResource);
-        if (!( possibleEditors.allEditors.some(editor => editor.priority !== RegisteredEditorPriority.option))) {
+        if (!( possibleEditors.allEditors.some(editor => editor.priority.editor !== RegisteredEditorPriority.option))) {
             return;
         }
         const editorsToReplace = ( new Map());

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

@@ -23,7 +23,7 @@ class ContributedCustomEditors extends Disposable {
         this._memento = ( new Memento(ContributedCustomEditors.CUSTOM_EDITORS_STORAGE_ID, storageService));
         const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
         for (const info of mementoObject[ContributedCustomEditors.CUSTOM_EDITORS_ENTRY_ID] || []) {
-            this.add(( new CustomEditorInfo(info)));
+            this.add(( new CustomEditorInfo(normalizeStoredCustomEditorDescriptor(info))));
         }
         this._register(customEditorsExtensionPoint.setHandler(extensions => {
             this.update(extensions);
@@ -34,14 +34,17 @@ class ContributedCustomEditors extends Disposable {
         for (const extension of extensions) {
             const hasCustomEditorPriorityProposal = extension.description.enabledApiProposals?.includes("customEditorPriority") ?? false;
             for (const webviewEditorContribution of extension.value) {
+                const priority = getPriorityFromContribution(
+                    webviewEditorContribution.priority,
+                    extension.description,
+                    hasCustomEditorPriorityProposal
+                );
                 this.add(( new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localize(8485, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(8570, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
                     selector: webviewEditorContribution.selector || [],
-                    priority: getPriorityFromContribution(webviewEditorContribution, extension.description, "priority") ?? RegisteredEditorPriority.default,
-                    diffEditorPriority: hasCustomEditorPriorityProposal ? getPriorityFromContribution(webviewEditorContribution, extension.description, "diffEditorPriority") : undefined,
-                    mergeEditorPriority: hasCustomEditorPriorityProposal ? getPriorityFromContribution(webviewEditorContribution, extension.description, "mergeEditorPriority") : undefined
+                    priority
                 })));
             }
         }
@@ -67,8 +70,35 @@ class ContributedCustomEditors extends Disposable {
         this._editors.set(info.id, info);
     }
 }
-function getPriorityFromContribution(contribution, extension, field) {
-    const value = contribution[field];
+function normalizeStoredCustomEditorDescriptor(descriptor) {
+    return {
+        id: descriptor.id,
+        displayName: descriptor.displayName,
+        providerDisplayName: descriptor.providerDisplayName,
+        selector: descriptor.selector,
+        priority: typeof descriptor.priority === "string" ? {
+            editor: descriptor.priority,
+            diff: descriptor.priority,
+            merge: descriptor.priority
+        } : {
+            editor: descriptor.priority.editor,
+            diff: descriptor.priority.diff ?? descriptor.priority.editor,
+            merge: descriptor.priority.merge ?? descriptor.priority.editor
+        }
+    };
+}
+function getPriorityFromContribution(contribution, extension, includeDiffAndMergePriority) {
+    const editorPriority = getSinglePriorityFromContribution(
+        typeof contribution === "string" ? contribution : contribution?.editor,
+        extension
+    ) ?? RegisteredEditorPriority.default;
+    return {
+        editor: editorPriority,
+        diff: includeDiffAndMergePriority && typeof contribution !== "string" ? getSinglePriorityFromContribution(contribution?.diff, extension) ?? editorPriority : editorPriority,
+        merge: includeDiffAndMergePriority && typeof contribution !== "string" ? getSinglePriorityFromContribution(contribution?.merge, extension) ?? editorPriority : editorPriority
+    };
+}
+function getSinglePriorityFromContribution(value, extension) {
     switch (value) {
     case CustomEditorPriority.default:
         return RegisteredEditorPriority.default;

package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.d.ts

@@ -4,7 +4,7 @@ import { IDisposable, IReference } from "@codingame/monaco-vscode-api/vscode/vs/
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IRevertOptions, ISaveOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { RegisteredEditorPriority } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
+import { RegisteredEditorPriorityInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
 export declare const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID: RawContextKey<string>;
 export declare const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE: RawContextKey<boolean>;
 export interface CustomEditorCapabilities {
@@ -47,22 +47,19 @@ export declare enum CustomEditorDiffEditorLayout {
 export interface CustomEditorSelector {
     readonly filenamePattern?: string;
 }
+export type CustomEditorPriorityInfo = RegisteredEditorPriorityInfo;
 export interface CustomEditorDescriptor {
     readonly id: string;
     readonly displayName: string;
     readonly providerDisplayName: string;
-    readonly priority: RegisteredEditorPriority;
-    readonly diffEditorPriority?: RegisteredEditorPriority;
-    readonly mergeEditorPriority?: RegisteredEditorPriority;
+    readonly priority: CustomEditorPriorityInfo;
     readonly selector: readonly CustomEditorSelector[];
 }
 export declare class CustomEditorInfo implements CustomEditorDescriptor {
     readonly id: string;
     readonly displayName: string;
     readonly providerDisplayName: string;
-    readonly priority: RegisteredEditorPriority;
-    readonly diffEditorPriority?: RegisteredEditorPriority;
-    readonly mergeEditorPriority?: RegisteredEditorPriority;
+    readonly priority: CustomEditorPriorityInfo;
     readonly selector: readonly CustomEditorSelector[];
     constructor(descriptor: CustomEditorDescriptor);
     matches(resource: URI): boolean;

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

@@ -6,7 +6,7 @@ import { globMatchesResource, RegisteredEditorPriority, priorityToRank } from '@
 
 const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = ( new RawContextKey("activeCustomEditorId", "", {
     type: "string",
-    description: ( localize(8486, "The viewType of the currently active custom editor."))
+    description: ( localize(8571, "The viewType of the currently active custom editor."))
 }));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( new RawContextKey("focusedCustomEditorIsEditable", false));
 var CustomEditorPriority;
@@ -26,8 +26,6 @@ class CustomEditorInfo {
         this.displayName = descriptor.displayName;
         this.providerDisplayName = descriptor.providerDisplayName;
         this.priority = descriptor.priority;
-        this.diffEditorPriority = descriptor.diffEditorPriority;
-        this.mergeEditorPriority = descriptor.mergeEditorPriority;
         this.selector = descriptor.selector;
     }
     matches(resource) {
@@ -45,7 +43,7 @@ class CustomEditorInfoCollection {
     }
     get defaultEditor() {
         return this.allEditors.find(editor => {
-            switch (editor.priority) {
+            switch (editor.priority.editor) {
             case RegisteredEditorPriority.default:
             case RegisteredEditorPriority.builtin:
                 return this.allEditors.every(
@@ -58,13 +56,13 @@ class CustomEditorInfoCollection {
     }
     get bestAvailableEditor() {
         const editors = Array.from(this.allEditors).sort((a, b) => {
-            return priorityToRank(a.priority) - priorityToRank(b.priority);
+            return priorityToRank(a.priority.editor) - priorityToRank(b.priority.editor);
         });
         return editors[0];
     }
 }
 function isLowerPriority(otherEditor, editor) {
-    return priorityToRank(otherEditor.priority) < priorityToRank(editor.priority);
+    return priorityToRank(otherEditor.priority.editor) < priorityToRank(editor.priority.editor);
 }
 
 export { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorDiffEditorLayout, CustomEditorInfo, CustomEditorInfoCollection, CustomEditorPriority };