@codingame/monaco-vscode-view-common-service-override 31.0.0 → 32.0.0

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.d.ts

@@ -1,6 +1,7 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
@@ -11,12 +12,15 @@ import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/wor
 import { IEditorType } 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 { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 export declare class CustomEditorService extends Disposable implements ICustomEditorService {
     private readonly editorService;
     private readonly editorGroupService;
     private readonly instantiationService;
     private readonly uriIdentityService;
     private readonly editorResolverService;
+    private readonly textResourceConfigurationService;
+    private readonly extensionService;
     _serviceBrand: any;
     private readonly _contributedEditors;
     private _untitledCounter;
@@ -26,11 +30,15 @@ export declare class CustomEditorService extends Disposable implements ICustomEd
     private readonly _onDidChangeEditorTypes;
     readonly onDidChangeEditorTypes: Event<void>;
     private readonly _fileEditorFactory;
-    constructor(fileService: IFileService, storageService: IStorageService, editorService: IEditorService, editorGroupService: IEditorGroupsService, instantiationService: IInstantiationService, uriIdentityService: IUriIdentityService, editorResolverService: IEditorResolverService);
+    constructor(fileService: IFileService, storageService: IStorageService, editorService: IEditorService, editorGroupService: IEditorGroupsService, instantiationService: IInstantiationService, uriIdentityService: IUriIdentityService, editorResolverService: IEditorResolverService, textResourceConfigurationService: ITextResourceConfigurationService, extensionService: IExtensionService);
     getEditorTypes(): IEditorType[];
     private withActiveCustomEditor;
+    private getActiveCustomEditorUndoRedoInput;
     private registerContributionPoints;
     private createDiffEditorInput;
+    private getDiffEditorLayout;
+    private updateCustomDiffEditorsForDiffConfigurationChange;
+    private getCustomEditorDiffInputInfo;
     get models(): ICustomEditorModelManager;
     getCustomEditor(viewType: string): CustomEditorInfo | undefined;
     getContributedCustomEditors(resource: URI): CustomEditorInfoCollection;
@@ -39,6 +47,8 @@ export declare class CustomEditorService extends Disposable implements ICustomEd
     registerCustomEditorCapabilities(viewType: string, options: CustomEditorCapabilities): IDisposable;
     getCustomEditorCapabilities(viewType: string): CustomEditorCapabilities | undefined;
     private getActiveCustomEditorId;
+    private getActiveCustomEditorDiffCanToggleLayout;
+    private getActiveCustomEditorTextDiff;
     private getCustomEditorIsEditable;
     private handleMovedFileInOpenedFileEditors;
 }

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

@@ -9,7 +9,9 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import { extname, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { assertReturnsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { UndoCommand, RedoCommand } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
+import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
 import { FileOperation } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -18,13 +20,16 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { EditorExtensions, DEFAULT_EDITOR_ASSOCIATION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
-import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorInfoCollection } from '../common/customEditor.js';
+import { ActiveCustomEditorDiffCanToggleLayoutContext, ActiveCustomEditorTextDiffContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorDiffEditorLayout, CustomEditorInfoCollection } from '../common/customEditor.js';
 import { CustomEditorModelManager } from '../common/customEditorModelManager.js';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { RegisteredEditorPriority } 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 { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ContributedCustomEditors } from '../common/contributedCustomEditors.js';
+import { CustomEditorDiffInput, CustomEditorSideBySideDiffInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorDiffInput';
 import { CustomEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 
 registerCss(customEditor);
@@ -36,7 +41,9 @@ let CustomEditorService = class CustomEditorService extends Disposable {
         editorGroupService,
         instantiationService,
         uriIdentityService,
-        editorResolverService
+        editorResolverService,
+        textResourceConfigurationService,
+        extensionService
     ) {
         super();
         this.editorService = editorService;
@@ -44,6 +51,8 @@ let CustomEditorService = class CustomEditorService extends Disposable {
         this.instantiationService = instantiationService;
         this.uriIdentityService = uriIdentityService;
         this.editorResolverService = editorResolverService;
+        this.textResourceConfigurationService = textResourceConfigurationService;
+        this.extensionService = extensionService;
         this._untitledCounter = 0;
         this._editorResolverDisposables = this._register(( new DisposableStore()));
         this._editorCapabilities = ( new Map());
@@ -67,12 +76,31 @@ let CustomEditorService = class CustomEditorService extends Disposable {
             getGroupContextKeyValue: group => this.getCustomEditorIsEditable(group),
             onDidChange: this.onDidChangeEditorTypes
         };
+        const customEditorDiffCanToggleLayoutContextKeyProvider = {
+            contextKey: ActiveCustomEditorDiffCanToggleLayoutContext,
+            getGroupContextKeyValue: group => this.getActiveCustomEditorDiffCanToggleLayout(group),
+            onDidChange: this.onDidChangeEditorTypes
+        };
+        const customEditorTextDiffContextKeyProvider = {
+            contextKey: ActiveCustomEditorTextDiffContext,
+            getGroupContextKeyValue: group => this.getActiveCustomEditorTextDiff(group),
+            onDidChange: this.onDidChangeEditorTypes
+        };
         this._register(
             this.editorGroupService.registerContextKeyProvider(activeCustomEditorContextKeyProvider)
         );
         this._register(
             this.editorGroupService.registerContextKeyProvider(customEditorIsEditableContextKeyProvider)
         );
+        this._register(
+            this.editorGroupService.registerContextKeyProvider(customEditorDiffCanToggleLayoutContextKeyProvider)
+        );
+        this._register(
+            this.editorGroupService.registerContextKeyProvider(customEditorTextDiffContextKeyProvider)
+        );
+        this._register(this.textResourceConfigurationService.onDidChangeConfiguration(e => {
+            void this.updateCustomDiffEditorsForDiffConfigurationChange(e);
+        }));
         this._register(fileService.onDidRunOperation(e => {
             if (e.isOperation(FileOperation.MOVE)) {
                 this.handleMovedFileInOpenedFileEditors(e.resource, this.uriIdentityService.asCanonicalUri(e.target.resource));
@@ -90,9 +118,9 @@ let CustomEditorService = class CustomEditorService extends Disposable {
         return [...this._contributedEditors];
     }
     withActiveCustomEditor(f) {
-        const activeEditor = this.editorService.activeEditor;
-        if (activeEditor instanceof CustomEditorInput) {
-            const result = f(activeEditor);
+        const editor = this.getActiveCustomEditorUndoRedoInput();
+        if (editor) {
+            const result = f(editor);
             if (result) {
                 return result;
             }
@@ -100,6 +128,16 @@ let CustomEditorService = class CustomEditorService extends Disposable {
         }
         return false;
     }
+    getActiveCustomEditorUndoRedoInput() {
+        const activeEditor = this.editorService.activeEditor;
+        if (activeEditor instanceof CustomEditorInput || activeEditor instanceof CustomEditorDiffInput || activeEditor instanceof CustomEditorSideBySideDiffInput) {
+            return activeEditor;
+        }
+        if (activeEditor instanceof DiffEditorInput && activeEditor.modified instanceof CustomEditorSideBySideDiffInput) {
+            return activeEditor.modified;
+        }
+        return undefined;
+    }
     registerContributionPoints() {
         this._editorResolverDisposables.clear();
         for (const contributedEditor of this._contributedEditors) {
@@ -111,13 +149,16 @@ let CustomEditorService = class CustomEditorService extends Disposable {
                     id: contributedEditor.id,
                     label: contributedEditor.displayName,
                     detail: contributedEditor.providerDisplayName,
-                    priority: contributedEditor.priority
+                    priority: contributedEditor.priority,
+                    diffEditorPriority: contributedEditor.diffEditorPriority,
+                    mergeEditorPriority: contributedEditor.mergeEditorPriority
                 }, {
                     singlePerResource: () => !(this.getCustomEditorCapabilities(contributedEditor.id)?.supportsMultipleEditorsPerDocument ?? false)
                 }, {
                     createEditorInput: (
                         {
-                            resource
+                            resource,
+                            label
                         },
                         group
                     ) => {
@@ -126,6 +167,7 @@ let CustomEditorService = class CustomEditorService extends Disposable {
                                 resource,
                                 viewType: contributedEditor.id,
                                 webviewTitle: undefined,
+                                preferredName: label,
                                 iconPath: undefined
                             }, group.id)
                         };
@@ -144,32 +186,80 @@ let CustomEditorService = class CustomEditorService extends Disposable {
                                 })),
                                 viewType: contributedEditor.id,
                                 webviewTitle: undefined,
+                                preferredName: undefined,
                                 iconPath: undefined
                             }, group.id)
                         };
                     },
-                    createDiffEditorInput: (diffEditorInput, group) => {
+                    createDiffEditorInput: async (diffEditorInput, group) => {
+                        await this.extensionService.activateByEvent(`onCustomEditor:${contributedEditor.id}`);
                         return {
-                            editor: this.createDiffEditorInput(diffEditorInput, contributedEditor.id, group)
+                            editor: this.createDiffEditorInput(diffEditorInput, contributedEditor, group)
                         };
                     }
                 }));
             }
         }
     }
-    createDiffEditorInput(editor, editorID, group) {
+    createDiffEditorInput(editor, contributedEditor, group) {
+        const originalResource = assertReturnsDefined(editor.original.resource);
+        const modifiedResource = assertReturnsDefined(editor.modified.resource);
+        const diffEditorLayout = this.getDiffEditorLayout(contributedEditor, modifiedResource);
+        if (diffEditorLayout === CustomEditorDiffEditorLayout.Inline) {
+            return CustomEditorDiffInput.create(this.instantiationService, {
+                originalResource,
+                modifiedResource,
+                viewType: contributedEditor.id,
+                label: editor.label,
+                description: editor.description,
+                iconPath: undefined
+            }, group);
+        }
+        if (diffEditorLayout === CustomEditorDiffEditorLayout.SideBySide) {
+            const diffId = generateUuid();
+            const originalOverride = CustomEditorSideBySideDiffInput.create(this.instantiationService, {
+                originalResource,
+                modifiedResource,
+                viewType: contributedEditor.id,
+                diffId,
+                side: "original",
+                label: editor.label,
+                description: editor.description,
+                iconPath: undefined
+            }, group);
+            const modifiedOverride = CustomEditorSideBySideDiffInput.create(this.instantiationService, {
+                originalResource,
+                modifiedResource,
+                viewType: contributedEditor.id,
+                diffId,
+                side: "modified",
+                label: editor.label,
+                description: editor.description,
+                iconPath: undefined
+            }, group);
+            return this.instantiationService.createInstance(
+                DiffEditorInput,
+                editor.label,
+                editor.description,
+                originalOverride,
+                modifiedOverride,
+                true
+            );
+        }
         const modifiedOverride = CustomEditorInput.create(this.instantiationService, {
-            resource: assertReturnsDefined(editor.modified.resource),
-            viewType: editorID,
+            resource: modifiedResource,
+            viewType: contributedEditor.id,
             webviewTitle: undefined,
+            preferredName: undefined,
             iconPath: undefined
         }, group.id, {
             customClasses: "modified"
         });
         const originalOverride = CustomEditorInput.create(this.instantiationService, {
-            resource: assertReturnsDefined(editor.original.resource),
-            viewType: editorID,
+            resource: originalResource,
+            viewType: contributedEditor.id,
             webviewTitle: undefined,
+            preferredName: undefined,
             iconPath: undefined
         }, group.id, {
             customClasses: "original"
@@ -183,6 +273,68 @@ let CustomEditorService = class CustomEditorService extends Disposable {
             true
         );
     }
+    getDiffEditorLayout(contributedEditor, modifiedResource) {
+        const capabilities = this.getCustomEditorCapabilities(contributedEditor.id);
+        const supportsInlineDiff = capabilities?.supportsInlineDiff === true;
+        const supportsSideBySideDiff = capabilities?.supportsSideBySideDiff === true;
+        if (supportsInlineDiff && supportsSideBySideDiff) {
+            return this.textResourceConfigurationService.getValue(modifiedResource, "diffEditor.renderSideBySide") ? CustomEditorDiffEditorLayout.SideBySide : CustomEditorDiffEditorLayout.Inline;
+        }
+        return supportsInlineDiff ? CustomEditorDiffEditorLayout.Inline : supportsSideBySideDiff ? CustomEditorDiffEditorLayout.SideBySide : undefined;
+    }
+    async updateCustomDiffEditorsForDiffConfigurationChange(e) {
+        for (const group of this.editorGroupService.groups) {
+            const replacements = [];
+            for (const editor of group.editors) {
+                const diffInfo = this.getCustomEditorDiffInputInfo(editor);
+                const contributedEditor = diffInfo ? this._contributedEditors.get(diffInfo.viewType) : undefined;
+                if (!diffInfo || !contributedEditor || !e.affectsConfiguration(diffInfo.modifiedResource, "diffEditor.renderSideBySide") || !this.getCustomEditorCapabilities(contributedEditor.id)?.supportsInlineDiff || !this.getCustomEditorCapabilities(contributedEditor.id)?.supportsSideBySideDiff || this.getDiffEditorLayout(contributedEditor, diffInfo.modifiedResource) === diffInfo.layout) {
+                    continue;
+                }
+                replacements.push({
+                    editor,
+                    replacement: {
+                        original: {
+                            resource: diffInfo.originalResource
+                        },
+                        modified: {
+                            resource: diffInfo.modifiedResource
+                        },
+                        label: editor.getName(),
+                        description: editor.getDescription(),
+                        options: {
+                            override: diffInfo.viewType,
+                            pinned: group.isPinned(editor),
+                            sticky: group.isSticky(editor),
+                            preserveFocus: group.activeEditor !== editor
+                        }
+                    }
+                });
+            }
+            if (replacements.length) {
+                await this.editorService.replaceEditors(replacements, group);
+            }
+        }
+    }
+    getCustomEditorDiffInputInfo(input) {
+        if (input instanceof CustomEditorDiffInput) {
+            return {
+                viewType: input.viewType,
+                originalResource: input.originalResource,
+                modifiedResource: input.modifiedResource,
+                layout: CustomEditorDiffEditorLayout.Inline
+            };
+        }
+        if (input instanceof DiffEditorInput && input.original instanceof CustomEditorSideBySideDiffInput && input.modified instanceof CustomEditorSideBySideDiffInput && input.original.side === "original" && input.modified.side === "modified" && input.original.viewType === input.modified.viewType && input.original.diffId === input.modified.diffId) {
+            return {
+                viewType: input.original.viewType,
+                originalResource: input.original.originalResource,
+                modifiedResource: input.original.modifiedResource,
+                layout: CustomEditorDiffEditorLayout.SideBySide
+            };
+        }
+        return undefined;
+    }
     get models() {
         return this._models;
     }
@@ -207,8 +359,10 @@ let CustomEditorService = class CustomEditorService extends Disposable {
             throw ( new Error(`Capabilities for ${viewType} already set`));
         }
         this._editorCapabilities.set(viewType, options);
+        this._onDidChangeEditorTypes.fire();
         return toDisposable(() => {
             this._editorCapabilities.delete(viewType);
+            this._onDidChangeEditorTypes.fire();
         });
     }
     getCustomEditorCapabilities(viewType) {
@@ -216,11 +370,21 @@ let CustomEditorService = class CustomEditorService extends Disposable {
     }
     getActiveCustomEditorId(group) {
         const activeEditorPane = group.activeEditorPane;
-        const resource = activeEditorPane?.input?.resource;
-        if (!resource) {
-            return "";
+        const input = activeEditorPane?.input;
+        const diffInfo = this.getCustomEditorDiffInputInfo(input);
+        if (diffInfo) {
+            return diffInfo.viewType;
         }
-        return activeEditorPane?.input instanceof CustomEditorInput ? activeEditorPane.input.viewType : "";
+        return input instanceof CustomEditorInput && input.resource ? input.viewType : "";
+    }
+    getActiveCustomEditorDiffCanToggleLayout(group) {
+        const diffInfo = this.getCustomEditorDiffInputInfo(group.activeEditorPane?.input);
+        const capabilities = diffInfo ? this.getCustomEditorCapabilities(diffInfo.viewType) : undefined;
+        return capabilities?.supportsInlineDiff === true && capabilities.supportsSideBySideDiff === true;
+    }
+    getActiveCustomEditorTextDiff(group) {
+        const diffInfo = this.getCustomEditorDiffInputInfo(group.activeEditorPane?.input);
+        return !!diffInfo && this.getCustomEditorCapabilities(diffInfo.viewType)?.isTextEditor === true;
     }
     getCustomEditorIsEditable(group) {
         const activeEditorPane = group.activeEditorPane;
@@ -263,6 +427,7 @@ let CustomEditorService = class CustomEditorService extends Disposable {
                         resource: newResource,
                         viewType,
                         webviewTitle: undefined,
+                        preferredName: undefined,
                         iconPath: undefined
                     }, group);
                 } else {
@@ -284,6 +449,6 @@ let CustomEditorService = class CustomEditorService extends Disposable {
         }
     }
 };
-CustomEditorService = ( __decorate([( __param(0, IFileService)), ( __param(1, IStorageService)), ( __param(2, IEditorService)), ( __param(3, IEditorGroupsService)), ( __param(4, IInstantiationService)), ( __param(5, IUriIdentityService)), ( __param(6, IEditorResolverService))], CustomEditorService));
+CustomEditorService = ( __decorate([( __param(0, IFileService)), ( __param(1, IStorageService)), ( __param(2, IEditorService)), ( __param(3, IEditorGroupsService)), ( __param(4, IInstantiationService)), ( __param(5, IUriIdentityService)), ( __param(6, IEditorResolverService)), ( __param(7, ITextResourceConfigurationService)), ( __param(8, IExtensionService))], CustomEditorService));
 
 export { CustomEditorService };

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

@@ -32,13 +32,16 @@ class ContributedCustomEditors extends Disposable {
     update(extensions) {
         this._editors.clear();
         for (const extension of extensions) {
+            const hasCustomEditorPriorityProposal = extension.description.enabledApiProposals?.includes("customEditorPriority") ?? false;
             for (const webviewEditorContribution of extension.value) {
                 this.add(( new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localize(8141, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(8474, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
                     selector: webviewEditorContribution.selector || [],
-                    priority: getPriorityFromContribution(webviewEditorContribution, extension.description)
+                    priority: getPriorityFromContribution(webviewEditorContribution, extension.description, "priority") ?? RegisteredEditorPriority.default,
+                    diffEditorPriority: hasCustomEditorPriorityProposal ? getPriorityFromContribution(webviewEditorContribution, extension.description, "diffEditorPriority") : undefined,
+                    mergeEditorPriority: hasCustomEditorPriorityProposal ? getPriorityFromContribution(webviewEditorContribution, extension.description, "mergeEditorPriority") : undefined
                 })));
             }
         }
@@ -64,8 +67,9 @@ class ContributedCustomEditors extends Disposable {
         this._editors.set(info.id, info);
     }
 }
-function getPriorityFromContribution(contribution, extension) {
-    switch (contribution.priority) {
+function getPriorityFromContribution(contribution, extension, field) {
+    const value = contribution[field];
+    switch (value) {
     case CustomEditorPriority.default:
         return RegisteredEditorPriority.default;
     case CustomEditorPriority.option:
@@ -73,7 +77,7 @@ function getPriorityFromContribution(contribution, extension) {
     case CustomEditorPriority.builtin:
         return extension.isBuiltin ? RegisteredEditorPriority.builtin : RegisteredEditorPriority.default;
     default:
-        return RegisteredEditorPriority.default;
+        return undefined;
     }
 }
 

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

@@ -9,6 +9,9 @@ export declare const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID: RawContextKey<string>;
 export declare const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE: RawContextKey<boolean>;
 export interface CustomEditorCapabilities {
     readonly supportsMultipleEditorsPerDocument?: boolean;
+    readonly isTextEditor?: boolean;
+    readonly supportsInlineDiff?: boolean;
+    readonly supportsSideBySideDiff?: boolean;
 }
 export interface ICustomEditorModelManager {
     getAllModels(resource: URI): Promise<ICustomEditorModel[]>;
@@ -37,6 +40,10 @@ export declare enum CustomEditorPriority {
     builtin = "builtin",
     option = "option"
 }
+export declare enum CustomEditorDiffEditorLayout {
+    Inline = "inline",
+    SideBySide = "sideBySide"
+}
 export interface CustomEditorSelector {
     readonly filenamePattern?: string;
 }
@@ -45,6 +52,8 @@ export interface CustomEditorDescriptor {
     readonly displayName: string;
     readonly providerDisplayName: string;
     readonly priority: RegisteredEditorPriority;
+    readonly diffEditorPriority?: RegisteredEditorPriority;
+    readonly mergeEditorPriority?: RegisteredEditorPriority;
     readonly selector: readonly CustomEditorSelector[];
 }
 export declare class CustomEditorInfo implements CustomEditorDescriptor {
@@ -52,6 +61,8 @@ export declare class CustomEditorInfo implements CustomEditorDescriptor {
     readonly displayName: string;
     readonly providerDisplayName: string;
     readonly priority: RegisteredEditorPriority;
+    readonly diffEditorPriority?: RegisteredEditorPriority;
+    readonly mergeEditorPriority?: RegisteredEditorPriority;
     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(8142, "The viewType of the currently active custom editor."))
+    description: ( localize(8475, "The viewType of the currently active custom editor."))
 }));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( new RawContextKey("focusedCustomEditorIsEditable", false));
 var CustomEditorPriority;
@@ -15,12 +15,19 @@ var CustomEditorPriority;
     CustomEditorPriority["builtin"] = "builtin";
     CustomEditorPriority["option"] = "option";
 })(CustomEditorPriority || (CustomEditorPriority = {}));
+var CustomEditorDiffEditorLayout;
+(function(CustomEditorDiffEditorLayout) {
+    CustomEditorDiffEditorLayout["Inline"] = "inline";
+    CustomEditorDiffEditorLayout["SideBySide"] = "sideBySide";
+})(CustomEditorDiffEditorLayout || (CustomEditorDiffEditorLayout = {}));
 class CustomEditorInfo {
     constructor(descriptor) {
         this.id = descriptor.id;
         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) {
@@ -60,4 +67,4 @@ function isLowerPriority(otherEditor, editor) {
     return priorityToRank(otherEditor.priority) < priorityToRank(editor.priority);
 }
 
-export { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorInfo, CustomEditorInfoCollection, CustomEditorPriority };
+export { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorDiffEditorLayout, CustomEditorInfo, CustomEditorInfoCollection, CustomEditorPriority };

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

@@ -40,7 +40,7 @@ declare const customEditorsContributionSchema: {
         };
         readonly priority: {
             readonly type: "string";
-            readonly markdownDeprecationMessage: string;
+            readonly markdownDescription: string;
             readonly enum: [
                 CustomEditorPriority.default,
                 CustomEditorPriority.option
@@ -51,6 +51,30 @@ declare const customEditorsContributionSchema: {
             ];
             readonly default: CustomEditorPriority.default;
         };
+        readonly diffEditorPriority: {
+            readonly type: "string";
+            readonly markdownDescription: string;
+            readonly enum: [
+                CustomEditorPriority.default,
+                CustomEditorPriority.option
+            ];
+            readonly markdownEnumDescriptions: [
+                string,
+                string
+            ];
+        };
+        readonly mergeEditorPriority: {
+            readonly type: "string";
+            readonly markdownDescription: string;
+            readonly enum: [
+                CustomEditorPriority.default,
+                CustomEditorPriority.option
+            ];
+            readonly markdownEnumDescriptions: [
+                string,
+                string
+            ];
+        };
     };
 };
 export type ICustomEditorsExtensionPoint = TypeFromJsonSchema<typeof customEditorsContributionSchema>;
@@ -61,5 +85,7 @@ export declare const customEditorsExtensionPoint: import("@codingame/monaco-vsco
         readonly filenamePattern: string | undefined;
     }[];
     readonly priority: CustomEditorPriority.default | CustomEditorPriority.option | undefined;
+    readonly diffEditorPriority: CustomEditorPriority.default | CustomEditorPriority.option | undefined;
+    readonly mergeEditorPriority: CustomEditorPriority.default | CustomEditorPriority.option | undefined;
 }[]>;
 export {};