@codingame/monaco-vscode-api 36.2.7 → 37.1.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -106,7 +106,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return localize(12237, "Merging: {0}", super.getName());
+        return localize(14215, "Merging: {0}", super.getName());
     }
     async resolve() {
         if (!this._inputModel) {
@@ -190,13 +190,13 @@ MergeEditorInput = MergeEditorInput_1 = ( __decorate([( __param(4, IInstantiatio
 function alertFocusedEditor(editor) {
     switch (editor) {
     case "input1":
-        alert(( localize(12238, "Incoming, Left Input")));
+        alert(( localize(14216, "Incoming, Left Input")));
         break;
     case "input2":
-        alert(( localize(12239, "Current, Right Input")));
+        alert(( localize(14217, "Current, Right Input")));
         break;
     case "result":
-        alert(( localize(12240, "Merge Result")));
+        alert(( localize(14218, "Merge Result")));
         break;
     }
 }

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -134,32 +134,32 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         if (someDirty) {
             const isMany = inputModels.length > 1;
             const message = isMany ? ( localize(
-                12241,
+                14219,
                 "Do you want keep the merge result of {0} files?",
                 inputModels.length
             )) : ( localize(
-                12242,
+                14220,
                 "Do you want keep the merge result of {0}?",
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
             const hasUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
             const buttons = [{
-                label: hasUnhandledConflicts ? ( localize(12243, "&&Save With Conflicts")) : ( localize(12244, "&&Save")),
+                label: hasUnhandledConflicts ? ( localize(14221, "&&Save With Conflicts")) : ( localize(14222, "&&Save")),
                 run: () => ConfirmResult.SAVE
             }, {
-                label: ( localize(12245, "Do&&n't Save")),
+                label: ( localize(14223, "Do&&n't Save")),
                 run: () => ConfirmResult.DONT_SAVE
             }];
             choice = (await this.dialogService.prompt({
                 type: Severity$1.Info,
                 message,
                 detail: hasUnhandledConflicts ? isMany ? ( localize(
-                    12246,
+                    14224,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 )) : ( localize(
-                    12247,
+                    14225,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
-                )) : isMany ? ( localize(12248, "The merge results will be lost if you don't save them.")) : ( localize(12249, "The merge result will be lost if you don't save it.")),
+                )) : isMany ? ( localize(14226, "The merge results will be lost if you don't save them.")) : ( localize(14227, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => ConfirmResult.CANCEL
@@ -184,12 +184,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const {
                 confirmed
             } = await this.dialogService.confirm({
-                message: ( localize(12250, "Do you want to accept the merge result?")),
+                message: ( localize(14228, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    12251,
+                    14229,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(12252, "&&Accept Merge"))
+                primaryButton: ( localize(14230, "&&Accept Merge"))
             });
             if (confirmed) {
                 await this.accept();
@@ -221,7 +221,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._languageService = _languageService;
     }
     static {
-        this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource("merge-editor.source", ( localize(12253, "Before Resolving Conflicts In Merge Editor")));
+        this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource("merge-editor.source", ( localize(14231, "Before Resolving Conflicts In Merge Editor")));
     }
     async createInputModel(args) {
         const store = ( new DisposableStore());
@@ -356,11 +356,11 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         const someUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
         if (someDirty) {
             const message = isMany ? ( localize(
-                12254,
+                14232,
                 "Do you want to save the changes you made to {0} files?",
                 inputModels.length
             )) : ( localize(
-                12255,
+                14233,
                 "Do you want to save the changes you made to {0}?",
                 basename(inputModels[0].resultUri)
             ));
@@ -370,17 +370,17 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 type: Severity$1.Info,
                 message,
                 detail: someUnhandledConflicts ? isMany ? ( localize(
-                    12256,
+                    14234,
                     "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                 )) : ( localize(
-                    12257,
+                    14235,
                     "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
-                )) : isMany ? ( localize(12258, "Your changes will be lost if you don't save them.")) : ( localize(12259, "Your changes will be lost if you don't save them.")),
+                )) : isMany ? ( localize(14236, "Your changes will be lost if you don't save them.")) : ( localize(14237, "Your changes will be lost if you don't save them.")),
                 buttons: [{
-                    label: someUnhandledConflicts ? ( localize(12260, "&&Save with Conflicts")) : ( localize(12261, "&&Save")),
+                    label: someUnhandledConflicts ? ( localize(14238, "&&Save with Conflicts")) : ( localize(14239, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 }, {
-                    label: ( localize(12262, "Do&&n't Save")),
+                    label: ( localize(14240, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }],
                 cancelButton: {
@@ -393,15 +393,15 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 confirmed,
                 checkboxChecked
             } = await this._dialogService.confirm({
-                message: isMany ? ( localize(12263, "Do you want to close {0} merge editors?", inputModels.length)) : ( localize(
-                    12264,
+                message: isMany ? ( localize(14241, "Do you want to close {0} merge editors?", inputModels.length)) : ( localize(
+                    14242,
                     "Do you want to close the merge editor for {0}?",
                     basename(inputModels[0].resultUri)
                 )),
-                detail: someUnhandledConflicts ? isMany ? ( localize(12265, "The files contain unhandled conflicts.")) : ( localize(12266, "The file contains unhandled conflicts.")) : undefined,
-                primaryButton: someUnhandledConflicts ? ( localize(12267, "&&Close with Conflicts")) : ( localize(12268, "&&Close")),
+                detail: someUnhandledConflicts ? isMany ? ( localize(14243, "The files contain unhandled conflicts.")) : ( localize(14244, "The file contains unhandled conflicts.")) : undefined,
+                primaryButton: someUnhandledConflicts ? ( localize(14245, "&&Close with Conflicts")) : ( localize(14246, "&&Close")),
                 checkbox: {
-                    label: ( localize(12269, "Do not ask me again"))
+                    label: ( localize(14247, "Do not ask me again"))
                 }
             });
             if (checkboxChecked) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -403,7 +403,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: UndoRedoElementType.Resource,
             resource: this.resultTextModel.uri,
             code: "setInputHandled",
-            label: ( localize(12270, "Set Input Handled")),
+            label: ( localize(14248, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -628,7 +628,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = "undoMarkAsHandled";
-        this.label = ( localize(12271, "Undo Mark As Handled"));
+        this.label = ( localize(14249, "Undo Mark As Handled"));
         this.type = UndoRedoElementType.Resource;
     }
     redo() {

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

@@ -4,35 +4,35 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 
 const ctxIsMergeEditor = ( new RawContextKey("isMergeEditor", false, {
     type: "boolean",
-    description: ( localize(12323, "The editor is a merge editor"))
+    description: ( localize(14301, "The editor is a merge editor"))
 }));
 const ctxIsMergeResultEditor = ( new RawContextKey("isMergeResultEditor", false, {
     type: "boolean",
-    description: ( localize(12324, "The editor is a the result editor of a merge editor."))
+    description: ( localize(14302, "The editor is a the result editor of a merge editor."))
 }));
 const ctxMergeEditorLayout = ( new RawContextKey("mergeEditorLayout", "mixed", {
     type: "string",
-    description: ( localize(12325, "The layout mode of a merge editor"))
+    description: ( localize(14303, "The layout mode of a merge editor"))
 }));
 const ctxMergeEditorShowBase = ( new RawContextKey("mergeEditorShowBase", false, {
     type: "boolean",
-    description: ( localize(12326, "If the merge editor shows the base version"))
+    description: ( localize(14304, "If the merge editor shows the base version"))
 }));
 const ctxMergeEditorShowBaseAtTop = ( new RawContextKey("mergeEditorShowBaseAtTop", false, {
     type: "boolean",
-    description: ( localize(12327, "If base should be shown at the top"))
+    description: ( localize(14305, "If base should be shown at the top"))
 }));
 const ctxMergeEditorShowNonConflictingChanges = ( new RawContextKey("mergeEditorShowNonConflictingChanges", false, {
     type: "boolean",
-    description: ( localize(12328, "If the merge editor shows non-conflicting changes"))
+    description: ( localize(14306, "If the merge editor shows non-conflicting changes"))
 }));
 const ctxMergeBaseUri = ( new RawContextKey("mergeEditorBaseUri", "", {
     type: "string",
-    description: ( localize(12329, "The uri of the baser of a merge editor"))
+    description: ( localize(14307, "The uri of the baser of a merge editor"))
 }));
 const ctxMergeResultUri = ( new RawContextKey("mergeEditorResultUri", "", {
     type: "string",
-    description: ( localize(12330, "The uri of the result of a merge editor"))
+    description: ( localize(14308, "The uri of the result of a merge editor"))
 }));
 const StorageCloseWithConflicts = "mergeEditorCloseWithConflicts";
 

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

@@ -20,7 +20,7 @@ registerAction2(class ConfigureMeteredConnectionAction extends Action2 {
     constructor() {
         super({
             id: ConfigureMeteredConnectionAction.ID,
-            title: ( localize2(12331, "Configure Metered Connection")),
+            title: ( localize2(14309, "Configure Metered Connection")),
             f1: true
         });
     }
@@ -30,22 +30,22 @@ registerAction2(class ConfigureMeteredConnectionAction extends Action2 {
         const currentValue = configurationService.getValue(METERED_CONNECTION_SETTING_KEY);
         const picks = [{
             value: "auto",
-            label: ( localize(12332, "Auto")),
-            description: ( localize(12333, "Detect metered connections automatically")),
+            label: ( localize(14310, "Auto")),
+            description: ( localize(14311, "Detect metered connections automatically")),
             picked: currentValue === "auto"
         }, {
             value: "on",
-            label: ( localize(12334, "On")),
-            description: ( localize(12335, "Always treat the connection as metered")),
+            label: ( localize(14312, "On")),
+            description: ( localize(14313, "Always treat the connection as metered")),
             picked: currentValue === "on"
         }, {
             value: "off",
-            label: ( localize(12336, "Off")),
-            description: ( localize(12337, "Never treat the connection as metered")),
+            label: ( localize(14314, "Off")),
+            description: ( localize(14315, "Never treat the connection as metered")),
             picked: currentValue === "off"
         }];
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localize(12338, "Select Metered Connection Mode")),
+            placeHolder: ( localize(14316, "Select Metered Connection Mode")),
             activeItem: picks.find(p => p.picked)
         });
         if (pick) {

package/vscode/src/vs/workbench/contrib/meteredConnection/browser/meteredConnectionStatus.js

@@ -42,16 +42,17 @@ let MeteredConnectionStatusContribution = class MeteredConnectionStatusContribut
     }
     getStatusBarEntry() {
         return {
-            name: ( localize(12339, "Metered Connection")),
+            name: ( localize(14317, "Metered Connection")),
             text: "$(radio-tower)",
-            ariaLabel: ( localize(12340, "Metered Connection Enabled")),
+            ariaLabel: ( localize(14318, "Metered Connection Enabled")),
             tooltip: ( localize(
-                12341,
-                "Metered connection enabled. Some automatic features like extension updates, Settings Sync, and automatic Git operations are paused to reduce data usage."
+                14319,
+                "Metered connection enabled. Some background network activity, including updates, Settings Sync, inline completions, telemetry, and automatic Git operations, is paused to reduce data usage."
             )),
+            kind: "warning",
             command: {
                 id: "workbench.action.configureMeteredConnection",
-                title: ( localize(12342, "Configure"))
+                title: ( localize(14320, "Configure"))
             },
             showInAllWindows: true
         };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js

@@ -3,6 +3,6 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const MultiDiffEditorIcon = registerIcon("multi-diff-editor-label-icon", Codicon.diffMultiple, ( localize(12348, "Icon of the multi diff editor label.")));
+const MultiDiffEditorIcon = registerIcon("multi-diff-editor-label-icon", Codicon.diffMultiple, ( localize(14331, "Icon of the multi diff editor label.")));
 
 export { MultiDiffEditorIcon };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.d.ts

@@ -2,6 +2,7 @@ import * as DOM from "../../../../base/browser/dom.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { ITextResourceConfigurationService } from "../../../../editor/common/services/textResourceConfiguration.service.js";
 import { InstantiationService } from "../../../../platform/instantiation/common/instantiationService.js";
+import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
 import { ITelemetryService } from "../../../../platform/telemetry/common/telemetry.service.js";
 import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
@@ -15,19 +16,25 @@ import { IEditorGroupsService } from "../../../services/editor/common/editorGrou
 import { IEditorService } from "../../../services/editor/common/editorService.service.js";
 import { URI } from "../../../../base/common/uri.js";
 import { MultiDiffEditorViewModel } from "../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js";
-import { IMultiDiffEditorOptions, IMultiDiffEditorViewState } from "../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js";
+import { IMultiDiffEditorLayoutDebugState, IMultiDiffEditorViewState } from "../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js";
 import { ICodeEditor } from "../../../../editor/browser/editorBrowser.js";
 import { IDiffEditor } from "../../../../editor/common/editorCommon.js";
+import { DiffEditorViewMode } from "../../../../editor/common/config/editorOptions.js";
+import { IMultiDiffEditorOptions } from "../../../../editor/common/multiDiffEditor.js";
 import { MultiDiffEditorItem } from "./multiDiffSourceResolverService.js";
 import { IEditorProgressService } from "../../../../platform/progress/common/progress.service.js";
+import { ILogService } from "../../../../platform/log/common/log.service.js";
+import { IObservable } from "../../../../base/common/observable.js";
 export declare class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEditorViewState> {
     private editorProgressService;
     static readonly ID = "multiDiffEditor";
     private _multiDiffEditorWidget;
     private _viewModel;
     private _contentOverlay;
+    private readonly _logger;
     get viewModel(): MultiDiffEditorViewModel | undefined;
-    constructor(group: IEditorGroup, instantiationService: InstantiationService, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, editorService: IEditorService, editorGroupService: IEditorGroupsService, textResourceConfigurationService: ITextResourceConfigurationService, editorProgressService: IEditorProgressService);
+    get scopedContextKeyService(): IContextKeyService | undefined;
+    constructor(group: IEditorGroup, instantiationService: InstantiationService, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, editorService: IEditorService, editorGroupService: IEditorGroupsService, textResourceConfigurationService: ITextResourceConfigurationService, editorProgressService: IEditorProgressService, logService: ILogService);
     protected createEditor(parent: HTMLElement): void;
     setInput(input: MultiDiffEditorInput, options: IMultiDiffEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
     setOptions(options: IMultiDiffEditorOptions | undefined): void;
@@ -35,6 +42,8 @@ export declare class MultiDiffEditor extends AbstractEditorWithViewState<IMultiD
     clearInput(): Promise<void>;
     layout(dimension: DOM.Dimension): void;
     getControl(): ICompositeControl | undefined;
+    setDiffEditorLayoutOptions(mode: DiffEditorViewMode, wordWrap: "off" | "on" | "inherit"): void;
+    resetDiffEditorWidthBasedLayout(): void;
     focus(): void;
     hasFocus(): boolean;
     protected computeEditorViewState(resource: URI): IMultiDiffEditorViewState | undefined;
@@ -47,5 +56,6 @@ export declare class MultiDiffEditor extends AbstractEditorWithViewState<IMultiD
     findDocumentDiffItem(resource: URI): MultiDiffEditorItem | undefined;
     goToNextChange(): void;
     goToPreviousChange(): void;
+    getLayoutDebugState(): IObservable<IMultiDiffEditorLayoutDebugState>;
     showWhile(promise: Promise<unknown>): Promise<void>;
 }

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.js

@@ -2,21 +2,22 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { MultiDiffEditorWidget } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.js';
+import { MultiDiffEditorVariant } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorOptions.js';
+import { MultiDiffEditorLogger } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorLogging.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.service.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { ResourceLabel } from '../../../browser/labels.js';
-import { IsSessionsWindowContext } from '../../../common/contextkeys.js';
 import { AbstractEditorWithViewState } from '../../../browser/parts/editor/editorWithViewState.js';
 import { MultiDiffEditorInput } from './multiDiffEditorInput.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
 import '../../../../base/common/observableInternal/index.js';
 import { FloatingEditorToolbarWidget } from '../../../../editor/contrib/floatingMenu/browser/floatingMenu.js';
 import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
@@ -34,6 +35,9 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     get viewModel() {
         return this._viewModel;
     }
+    get scopedContextKeyService() {
+        return this._multiDiffEditorWidget?.getContextKeyService();
+    }
     constructor(
         group,
         instantiationService,
@@ -43,7 +47,8 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
         editorService,
         editorGroupService,
         textResourceConfigurationService,
-        editorProgressService
+        editorProgressService,
+        logService
     ) {
         super(
             MultiDiffEditor_1.ID,
@@ -59,12 +64,16 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
         );
         this.editorProgressService = editorProgressService;
         this._multiDiffEditorWidget = undefined;
+        this._logger = this._register(( new MultiDiffEditorLogger(logService)));
     }
     createEditor(parent) {
         this._multiDiffEditorWidget = this._register(this.instantiationService.createInstance(
             MultiDiffEditorWidget,
             parent,
-            this.instantiationService.createInstance(WorkbenchUIElementFactory)
+            this.instantiationService.createInstance(WorkbenchUIElementFactory),
+            {
+                variant: MultiDiffEditorVariant.Compact
+            }
         ));
         this._register(this._multiDiffEditorWidget.onDidChangeActiveControl(() => {
             this._onDidChangeControl.fire();
@@ -79,13 +88,17 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
         await super.setInput(input, options, context, token);
         this._viewModel = await input.getViewModel();
         this._contentOverlay?.updateResource(input.resource);
+        const viewState = this.loadEditorViewState(input, context);
+        this._logger.log("editor set input", {
+            resource: input.resource,
+            preserveFocus: !!options?.preserveFocus,
+            hasPersistedViewState: !!viewState,
+            reveal: options?.viewState?.revealData?.resource.modified ?? options?.viewState?.revealData?.resource.original
+        });
         this._multiDiffEditorWidget.setViewModel(this._viewModel, {
-            preserveFocus: options?.preserveFocus
+            preserveFocus: options?.preserveFocus,
+            viewState
         });
-        const viewState = this.loadEditorViewState(input, context);
-        if (viewState) {
-            this._multiDiffEditorWidget.setViewState(viewState);
-        }
         this._applyOptions(options);
     }
     setOptions(options) {
@@ -102,6 +115,7 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
         });
     }
     async clearInput() {
+        this._logger.log("editor clear input");
         await super.clearInput();
         this._contentOverlay?.updateResource(undefined);
         this._multiDiffEditorWidget.setViewModel(undefined);
@@ -112,9 +126,15 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     getControl() {
         return this._multiDiffEditorWidget.getActiveControl();
     }
+    setDiffEditorLayoutOptions(mode, wordWrap) {
+        this._multiDiffEditorWidget?.setDiffLayoutOptions(mode, wordWrap);
+    }
+    resetDiffEditorWidthBasedLayout() {
+        this._multiDiffEditorWidget?.resetWidthBasedLayout();
+    }
     focus() {
         super.focus();
-        this._multiDiffEditorWidget?.getActiveControl()?.focus();
+        this._multiDiffEditorWidget?.focus();
     }
     hasFocus() {
         return this._multiDiffEditorWidget?.getActiveControl()?.hasTextFocus() || super.hasFocus();
@@ -145,11 +165,14 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     goToPreviousChange() {
         this._multiDiffEditorWidget?.goToPreviousChange();
     }
+    getLayoutDebugState() {
+        return this._multiDiffEditorWidget.getLayoutDebugState();
+    }
     async showWhile(promise) {
         return this.editorProgressService.showWhile(promise);
     }
 };
-MultiDiffEditor = MultiDiffEditor_1 = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, ITelemetryService)), ( __param(3, IThemeService)), ( __param(4, IStorageService)), ( __param(5, IEditorService)), ( __param(6, IEditorGroupsService)), ( __param(7, ITextResourceConfigurationService)), ( __param(8, IEditorProgressService))], MultiDiffEditor));
+MultiDiffEditor = MultiDiffEditor_1 = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, ITelemetryService)), ( __param(3, IThemeService)), ( __param(4, IStorageService)), ( __param(5, IEditorService)), ( __param(6, IEditorGroupsService)), ( __param(7, ITextResourceConfigurationService)), ( __param(8, IEditorProgressService)), ( __param(9, ILogService))], MultiDiffEditor));
 class MultiDiffEditorContentMenuOverlay extends Disposable {
     constructor(root, contextKeyService, instantiationService) {
         super();
@@ -183,11 +206,11 @@ class MultiDiffEditorContentMenuOverlay extends Disposable {
     }
 }
 let WorkbenchUIElementFactory = class WorkbenchUIElementFactory {
-    constructor(_instantiationService, contextKeyService) {
+    constructor(_instantiationService, editorService) {
         this._instantiationService = _instantiationService;
-        this.headerClickToCollapse = IsSessionsWindowContext.getValue(contextKeyService) === true;
+        this.editorService = editorService;
     }
-    createResourceLabel(element) {
+    createResourceLabel(element, _kind) {
         const label = this._instantiationService.createInstance(ResourceLabel, element, {});
         return {
             setUri(uri, options = {}) {
@@ -204,7 +227,20 @@ let WorkbenchUIElementFactory = class WorkbenchUIElementFactory {
             }
         };
     }
+    openDiffEditor(original, modified) {
+        void this.editorService.openEditor({
+            original: {
+                resource: original
+            },
+            modified: {
+                resource: modified
+            },
+            options: {
+                pinned: true
+            }
+        });
+    }
 };
-WorkbenchUIElementFactory = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IContextKeyService))], WorkbenchUIElementFactory));
+WorkbenchUIElementFactory = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IEditorService))], WorkbenchUIElementFactory));
 
 export { MultiDiffEditor };