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

package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.d.ts

@@ -14,6 +14,7 @@ export declare class DynamicEditorConfigurations extends Disposable implements I
     private autoLockConfigurationNode;
     private defaultBinaryEditorConfigurationNode;
     private editorAssociationsConfigurationNode;
+    private diffEditorAssociationsConfigurationNode;
     private editorLargeFileConfirmationConfigurationNode;
     constructor(editorResolverService: IEditorResolverService, extensionService: IExtensionService, environmentService: IWorkbenchEnvironmentService);
     private registerListeners;

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 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
+import { RegisteredEditorPriority, 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,19 +33,19 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
         this.AUTO_LOCK_EXTRA_EDITORS = [
         {
             id: "workbench.input.interactive",
-            label: ( localize(3464, "Interactive Window")),
+            label: ( localize(3506, "Interactive Window")),
             priority: RegisteredEditorPriority.builtin
         }, {
             id: "mainThreadWebview-markdown.preview",
-            label: ( localize(3465, "Markdown Preview")),
+            label: ( localize(3507, "Markdown Preview")),
             priority: RegisteredEditorPriority.builtin
         }, {
             id: "mainThreadWebview-simpleBrowser.view",
-            label: ( localize(3466, "Simple Browser")),
+            label: ( localize(3508, "Simple Browser")),
             priority: RegisteredEditorPriority.builtin
         }, {
             id: "mainThreadWebview-browserPreview",
-            label: ( localize(3467, "Live Preview")),
+            label: ( localize(3509, "Live Preview")),
             priority: RegisteredEditorPriority.builtin
         }];
     }
@@ -94,7 +94,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 "workbench.editor.autoLockGroups": {
                     type: "object",
                     description: ( localize(
-                        3468,
+                        3510,
                         "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(
-                        3469,
+                        3511,
                         "The default editor for files detected as binary. If undefined, the user will be presented with a picker."
                     ))
                 }
@@ -122,10 +122,10 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
         this.editorAssociationsConfigurationNode = {
             ...workbenchConfigurationNodeBase,
             properties: {
-                "workbench.editorAssociations": {
+                [editorsAssociationsSettingId]: {
                     type: "object",
                     markdownDescription: ( localize(
-                        3470,
+                        3512,
                         "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
                     )),
                     patternProperties: {
@@ -137,6 +137,25 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 }
             }
         };
+        const oldDiffEditorAssociationsConfigurationNode = this.diffEditorAssociationsConfigurationNode;
+        this.diffEditorAssociationsConfigurationNode = {
+            ...workbenchConfigurationNodeBase,
+            properties: {
+                [diffEditorsAssociationsSettingId]: {
+                    type: "object",
+                    markdownDescription: ( localize(
+                        3513,
+                        "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: {
+                        ".*": {
+                            type: "string",
+                            enum: binaryEditorCandidates
+                        }
+                    }
+                }
+            }
+        };
         const oldEditorLargeFileConfirmationConfigurationNode = this.editorLargeFileConfirmationConfigurationNode;
         this.editorLargeFileConfirmationConfigurationNode = {
             ...workbenchConfigurationNodeBase,
@@ -147,7 +166,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     minimum: 1,
                     scope: ConfigurationScope.RESOURCE,
                     markdownDescription: ( localize(
-                        3471,
+                        3514,
                         "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."
                     ))
                 }
@@ -158,12 +177,14 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 this.autoLockConfigurationNode,
                 this.defaultBinaryEditorConfigurationNode,
                 this.editorAssociationsConfigurationNode,
+                this.diffEditorAssociationsConfigurationNode,
                 this.editorLargeFileConfirmationConfigurationNode
             ],
             remove: coalesce([
                 oldAutoLockConfigurationNode,
                 oldDefaultBinaryEditorConfigurationNode,
                 oldEditorAssociationsConfigurationNode,
+                oldDiffEditorAssociationsConfigurationNode,
                 oldEditorLargeFileConfirmationConfigurationNode
             ])
         });

package/vscode/src/vs/workbench/browser/parts/titlebar/menubar.contribution.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/browser/parts/titlebar/menubar.contribution.js

@@ -0,0 +1,78 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IsMacNativeContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
+
+MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
+    submenu: MenuId.MenubarFileMenu,
+    title: {
+        value: "File",
+        original: "File",
+        mnemonicTitle: ( localize(3774, "&&File"))
+    },
+    order: 1
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
+    submenu: MenuId.MenubarEditMenu,
+    title: {
+        value: "Edit",
+        original: "Edit",
+        mnemonicTitle: ( localize(3775, "&&Edit"))
+    },
+    order: 2
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
+    submenu: MenuId.MenubarSelectionMenu,
+    title: {
+        value: "Selection",
+        original: "Selection",
+        mnemonicTitle: ( localize(3776, "&&Selection"))
+    },
+    order: 3
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
+    submenu: MenuId.MenubarViewMenu,
+    title: {
+        value: "View",
+        original: "View",
+        mnemonicTitle: ( localize(3777, "&&View"))
+    },
+    order: 4
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
+    submenu: MenuId.MenubarGoMenu,
+    title: {
+        value: "Go",
+        original: "Go",
+        mnemonicTitle: ( localize(3778, "&&Go"))
+    },
+    order: 5
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
+    submenu: MenuId.MenubarTerminalMenu,
+    title: {
+        value: "Terminal",
+        original: "Terminal",
+        mnemonicTitle: ( localize(3779, "&&Terminal"))
+    },
+    order: 7
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
+    submenu: MenuId.MenubarHelpMenu,
+    title: {
+        value: "Help",
+        original: "Help",
+        mnemonicTitle: ( localize(3780, "&&Help"))
+    },
+    order: 8
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
+    submenu: MenuId.MenubarPreferencesMenu,
+    title: {
+        value: "Preferences",
+        original: "Preferences",
+        mnemonicTitle: ( localize(3781, "&&Preferences"))
+    },
+    when: IsMacNativeContext,
+    order: 9
+});

package/vscode/src/vs/workbench/browser/workbench.zenMode.contribution.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,140 @@
+
+import { KeyChord, KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
+import { registerAction2, MenuRegistry, MenuId, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { KeybindingWeight, KeybindingsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { InEditorZenModeContext, IsAuxiliaryWindowFocusedContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
+import { ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/actions/layoutActions';
+
+(function registerZenModeConfiguration() {
+    const registry = ( Registry.as(Extensions.Configuration));
+    registry.registerConfiguration({
+        "id": "zenMode",
+        "order": 9,
+        "title": ( localize(4102, "Zen Mode")),
+        "type": "object",
+        "properties": {
+            "zenMode.fullScreen": {
+                "type": "boolean",
+                "default": true,
+                "description": ( localize(
+                    4103,
+                    "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."))
+            },
+            "zenMode.showTabs": {
+                "type": "string",
+                "enum": ["multiple", "single", "none"],
+                "description": ( localize(
+                    4105,
+                    "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,
+                    "The active editor is displayed as a single large tab in the editor title area."
+                )), ( localize(4108, "The editor title area is not displayed."))],
+                "default": "multiple"
+            },
+            "zenMode.hideStatusBar": {
+                "type": "boolean",
+                "default": true,
+                "description": ( localize(
+                    4109,
+                    "Controls whether turning on Zen Mode also hides the status bar at the bottom of the workbench."
+                ))
+            },
+            "zenMode.hideActivityBar": {
+                "type": "boolean",
+                "default": true,
+                "description": ( localize(
+                    4110,
+                    "Controls whether turning on Zen Mode also hides the activity bar either at the left or right of the workbench."
+                ))
+            },
+            "zenMode.hideLineNumbers": {
+                "type": "boolean",
+                "default": true,
+                "description": ( localize(
+                    4111,
+                    "Controls whether turning on Zen Mode also hides the editor line numbers."
+                ))
+            },
+            "zenMode.restore": {
+                "type": "boolean",
+                "default": true,
+                "description": ( localize(
+                    4112,
+                    "Controls whether a window should restore to Zen Mode if it was exited in Zen Mode."
+                ))
+            },
+            "zenMode.silentNotifications": {
+                "type": "boolean",
+                "default": true,
+                "description": ( localize(
+                    4113,
+                    "Controls whether notifications do not disturb mode should be enabled while in Zen Mode. If true, only error notifications will pop out."
+                ))
+            }
+        }
+    });
+})();
+registerAction2(ZenHideEditorTabsAction);
+registerAction2(ZenShowMultipleEditorTabsAction);
+registerAction2(ZenShowSingleEditorTabAction);
+MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
+    submenu: MenuId.EditorTabsBarShowTabsZenModeSubmenu,
+    title: ( localize(4114, "Tab Bar")),
+    group: "3_workbench_layout_move",
+    order: 10,
+    when: InEditorZenModeContext
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: "workbench.action.toggleZenMode",
+            title: {
+                ...( localize2(4115, "Toggle Zen Mode")),
+                mnemonicTitle: ( localize(4116, "Zen Mode"))
+            },
+            precondition: ( IsAuxiliaryWindowFocusedContext.toNegated()),
+            category: Categories.View,
+            f1: true,
+            keybinding: {
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyZ)
+            },
+            toggled: InEditorZenModeContext,
+            menu: [{
+                id: MenuId.MenubarAppearanceMenu,
+                group: "1_toggle_view",
+                order: 2
+            }]
+        });
+    }
+    run(accessor) {
+        return accessor.get(IWorkbenchLayoutService).toggleZenMode();
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: "workbench.action.exitZenMode",
+    weight: KeybindingWeight.EditorContrib - 1000,
+    handler(accessor) {
+        const layoutService = accessor.get(IWorkbenchLayoutService);
+        const contextKeyService = accessor.get(IContextKeyService);
+        if (InEditorZenModeContext.getValue(contextKeyService)) {
+            layoutService.toggleZenMode();
+        }
+    },
+    when: InEditorZenModeContext,
+    primary: KeyChord(KeyCode.Escape, KeyCode.Escape)
+});

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(4668, "Whether a call hierarchy provider is available"))));
-const _ctxCallHierarchyVisible = ( new RawContextKey("callHierarchyVisible", false, ( localize(4669, "Whether call hierarchy peek is currently showing"))));
+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 _ctxCallHierarchyDirection = ( new RawContextKey("callHierarchyDirection", undefined, {
     type: "string",
-    description: ( localize(4670, "Whether call hierarchy shows incoming or outgoing calls"))
+    description: ( localize(4728, "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(4671, "No results")));
+                this._widget.showMessage(( localize(4729, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endCallHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4672, "Failed to show call hierarchy")));
+            this._widget.showMessage(( localize(4730, "Failed to show call hierarchy")));
         });
     }
     showOutgoingCalls() {
@@ -183,7 +183,7 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showCallHierarchy",
-            title: ( localize2(4673, "Peek Call Hierarchy")),
+            title: ( localize2(4731, "Peek Call Hierarchy")),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: "navigation",
@@ -207,8 +207,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showIncomingCalls",
-            title: ( localize2(4674, "Show Incoming Calls")),
-            icon: registerIcon("callhierarchy-incoming", Codicon.callIncoming, ( localize(4675, "Icon for incoming calls in the call hierarchy view."))),
+            title: ( localize2(4732, "Show Incoming Calls")),
+            icon: registerIcon("callhierarchy-incoming", Codicon.callIncoming, ( localize(4733, "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(4676, "Show Outgoing Calls")),
-            icon: registerIcon("callhierarchy-outgoing", Codicon.callOutgoing, ( localize(4677, "Icon for outgoing calls in the call hierarchy view."))),
+            title: ( localize2(4734, "Show Outgoing Calls")),
+            icon: registerIcon("callhierarchy-outgoing", Codicon.callOutgoing, ( localize(4735, "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(4678, "Refocus Call Hierarchy")),
+            title: ( localize2(4736, "Refocus Call Hierarchy")),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -267,7 +267,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.closeCallHierarchy",
-            title: ( localize(4679, "Close")),
+            title: ( localize(4737, "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(4680, "Calls from '{0}'", element.model.root.name)) : ( localize(4681, "Callers of '{0}'", element.model.root.name));
+        const title = this._direction === CallHierarchyDirection.CallsFrom ? ( localize(4738, "Calls from '{0}'", element.model.root.name)) : ( localize(4739, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset["state"] = State.Loading;
-        this.setTitle(( localize(4682, "Loading...")));
+        this.setTitle(( localize(4740, "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(4683, "No calls from '{0}'", model.root.name)) : ( localize(4684, "No callers of '{0}'", model.root.name)));
+            this.showMessage(this._direction === CallHierarchyDirection.CallsFrom ? ( localize(4741, "No calls from '{0}'", model.root.name)) : ( localize(4742, "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(4685, "Call Hierarchy");
+        return localize(4743, "Call Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
-            return localize(4686, "calls from {0}", element.item.name);
+            return localize(4744, "calls from {0}", element.item.name);
         } else {
-            return localize(4687, "callers of {0}", element.item.name);
+            return localize(4745, "callers of {0}", element.item.name);
         }
     }
 }

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

@@ -5,17 +5,23 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { EditorPaneDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/editor';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { CustomEditorInputSerializer, ComplexCustomWorkingCopyEditorHandler } from './customEditorInputFactory.js';
+import { CustomEditorInputSerializer, CustomEditorDiffInputSerializer, CustomEditorSideBySideDiffInputSerializer, ComplexCustomWorkingCopyEditorHandler } from './customEditorInputFactory.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { WebviewEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
 import { CustomEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
+import { CustomEditorDiffInput, CustomEditorSideBySideDiffInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorDiffInput';
 import './customEditors.js';
 
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
     EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, "Webview Editor"),
-    [( new SyncDescriptor(CustomEditorInput))]
+    [( new SyncDescriptor(CustomEditorInput)), ( new SyncDescriptor(CustomEditorDiffInput)), ( new SyncDescriptor(CustomEditorSideBySideDiffInput))]
 );
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(CustomEditorInputSerializer.ID, CustomEditorInputSerializer);
+( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(CustomEditorDiffInputSerializer.ID, CustomEditorDiffInputSerializer);
+( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(
+    CustomEditorSideBySideDiffInputSerializer.ID,
+    CustomEditorSideBySideDiffInputSerializer
+);
 registerWorkbenchContribution2(
     ComplexCustomWorkingCopyEditorHandler.ID,
     ComplexCustomWorkingCopyEditorHandler,

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

@@ -2,8 +2,10 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { URI, UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IEditorSerializer } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
 import { CustomEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput";
+import { CustomEditorDiffInput, CustomEditorSideBySideDiffInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorDiffInput";
 import { ICustomEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/common/customEditor.service";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
 import { DeserializedWebview, SerializedWebview, SerializedWebviewOptions, WebviewEditorInputSerializer } from "../../webviewPanel/browser/webviewEditorInputSerializer.js";
@@ -51,6 +53,22 @@ export declare class CustomEditorInputSerializer extends WebviewEditorInputSeria
     protected fromJson(data: SerializedCustomEditor): DeserializedCustomEditor;
     deserialize(_instantiationService: IInstantiationService, serializedEditorInput: string): CustomEditorInput;
 }
+export declare class CustomEditorDiffInputSerializer implements IEditorSerializer {
+    private readonly _instantiationService;
+    static readonly ID = "workbench.editors.customDiffEditor";
+    constructor(_instantiationService: IInstantiationService);
+    canSerialize(input: EditorInput): boolean;
+    serialize(input: CustomEditorDiffInput): string | undefined;
+    deserialize(_instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput;
+}
+export declare class CustomEditorSideBySideDiffInputSerializer implements IEditorSerializer {
+    private readonly _instantiationService;
+    static readonly ID = "workbench.editors.customSideBySideDiffEditor";
+    constructor(_instantiationService: IInstantiationService);
+    canSerialize(input: EditorInput): boolean;
+    serialize(input: CustomEditorSideBySideDiffInput): string | undefined;
+    deserialize(_instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput;
+}
 export declare class ComplexCustomWorkingCopyEditorHandler extends Disposable implements IWorkbenchContribution, IWorkingCopyEditorHandler {
     private readonly _instantiationService;
     private readonly _workingCopyBackupService;

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

@@ -6,6 +6,7 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { CustomEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
+import { CustomEditorDiffInput, CustomEditorSideBySideDiffInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorDiffInput';
 import { ICustomEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/common/customEditor.service';
 import { NotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { WebviewContentPurpose } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
@@ -52,6 +53,7 @@ let CustomEditorInputSerializer = class CustomEditorInputSerializer extends Webv
             resource: data.editorResource,
             viewType: data.viewType,
             webviewTitle: data.title,
+            preferredName: undefined,
             iconPath: data.iconPath
         }, webview, {
             startsDirty: data.dirty,
@@ -64,6 +66,86 @@ let CustomEditorInputSerializer = class CustomEditorInputSerializer extends Webv
     }
 };
 CustomEditorInputSerializer = ( __decorate([( __param(0, IWebviewWorkbenchService)), ( __param(1, IInstantiationService)), ( __param(2, IWebviewService))], CustomEditorInputSerializer));
+let CustomEditorDiffInputSerializer = class CustomEditorDiffInputSerializer {
+    static {
+        this.ID = CustomEditorDiffInput.typeId;
+    }
+    constructor(_instantiationService) {
+        this._instantiationService = _instantiationService;
+    }
+    canSerialize(input) {
+        return input instanceof CustomEditorDiffInput;
+    }
+    serialize(input) {
+        const data = {
+            originalResource: input.originalResource.toJSON(),
+            modifiedResource: input.modifiedResource.toJSON(),
+            viewType: input.viewType,
+            label: input.getName(),
+            description: input.getDescription(),
+            dirty: input.isDirty()
+        };
+        try {
+            return JSON.stringify(data);
+        } catch {
+            return undefined;
+        }
+    }
+    deserialize(_instantiationService, serializedEditorInput) {
+        const data = JSON.parse(serializedEditorInput);
+        return CustomEditorDiffInput.create(this._instantiationService, {
+            originalResource: URI.revive(data.originalResource),
+            modifiedResource: URI.revive(data.modifiedResource),
+            viewType: data.viewType,
+            label: data.label,
+            description: data.description,
+            iconPath: undefined
+        }, undefined);
+    }
+};
+CustomEditorDiffInputSerializer = ( __decorate([( __param(0, IInstantiationService))], CustomEditorDiffInputSerializer));
+let CustomEditorSideBySideDiffInputSerializer = class CustomEditorSideBySideDiffInputSerializer {
+    static {
+        this.ID = CustomEditorSideBySideDiffInput.typeId;
+    }
+    constructor(_instantiationService) {
+        this._instantiationService = _instantiationService;
+    }
+    canSerialize(input) {
+        return input instanceof CustomEditorSideBySideDiffInput;
+    }
+    serialize(input) {
+        const data = {
+            originalResource: input.originalResource.toJSON(),
+            modifiedResource: input.modifiedResource.toJSON(),
+            viewType: input.viewType,
+            label: input.getName(),
+            description: input.getDescription(),
+            dirty: input.isDirty(),
+            diffId: input.diffId,
+            side: input.side
+        };
+        try {
+            return JSON.stringify(data);
+        } catch {
+            return undefined;
+        }
+    }
+    deserialize(_instantiationService, serializedEditorInput) {
+        const data = JSON.parse(serializedEditorInput);
+        return CustomEditorSideBySideDiffInput.create(this._instantiationService, {
+            originalResource: URI.revive(data.originalResource),
+            modifiedResource: URI.revive(data.modifiedResource),
+            viewType: data.viewType,
+            label: data.label,
+            description: data.description,
+            iconPath: undefined,
+            diffId: data.diffId,
+            side: data.side
+        }, undefined);
+    }
+};
+CustomEditorSideBySideDiffInputSerializer = ( __decorate([( __param(0, IInstantiationService))], CustomEditorSideBySideDiffInputSerializer));
 function reviveWebview(webviewService, data) {
     const webview = webviewService.createWebviewOverlay({
         providedViewType: data.viewType,
@@ -147,6 +229,7 @@ let ComplexCustomWorkingCopyEditorHandler = class ComplexCustomWorkingCopyEditor
             resource: URI.revive(backupData.editorResource),
             viewType: backupData.viewType,
             webviewTitle: backupData.customTitle,
+            preferredName: undefined,
             iconPath: reviveWebviewIconPath(backupData.iconPath)
         }, webview, {
             backupId: backupData.backupId
@@ -157,4 +240,4 @@ let ComplexCustomWorkingCopyEditorHandler = class ComplexCustomWorkingCopyEditor
 };
 ComplexCustomWorkingCopyEditorHandler = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IWorkingCopyEditorService)), ( __param(2, IWorkingCopyBackupService)), ( __param(3, IWebviewService)), ( __param(4, ICustomEditorService))], ComplexCustomWorkingCopyEditorHandler));
 
-export { ComplexCustomWorkingCopyEditorHandler, CustomEditorInputSerializer };
+export { ComplexCustomWorkingCopyEditorHandler, CustomEditorDiffInputSerializer, CustomEditorInputSerializer, CustomEditorSideBySideDiffInputSerializer };