@codingame/monaco-vscode-api 7.0.11 → 7.1.1

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js

@@ -10,10 +10,9 @@ import { observableCodeEditor } from '../../../observableCodeEditor.js';
 import { OverviewRulerFeature } from '../features/overviewRulerFeature.js';
 import { EditorOptions } from '../../../../common/config/editorOptions.js';
 import { Position } from '../../../../common/core/position.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
-const _moduleId = "vs/editor/browser/widget/diffEditor/components/diffEditorEditors";
 let DiffEditorEditors = class DiffEditorEditors extends Disposable {
     get onDidContentSizeChange() { return this._onDidContentSizeChange.event; }
     constructor(originalEditorElement, modifiedEditorElement, _options, _argCodeEditorWidgetOptions, _createInnerEditor, _instantiationService, _keybindingService) {
@@ -30,7 +29,9 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         this._onDidContentSizeChange = this._register(( (new Emitter())));
         this.modifiedScrollTop = observableFromEvent(this, this.modified.onDidScrollChange, () =>  this.modified.getScrollTop());
         this.modifiedScrollHeight = observableFromEvent(this, this.modified.onDidScrollChange, () =>  this.modified.getScrollHeight());
-        this.modifiedModel = observableCodeEditor(this.modified).model;
+        this.modifiedObs = observableCodeEditor(this.modified);
+        this.originalObs = observableCodeEditor(this.original);
+        this.modifiedModel = this.modifiedObs.model;
         this.modifiedSelections = observableFromEvent(this, this.modified.onDidChangeCursorSelection, () => this.modified.getSelections() ?? []);
         this.modifiedCursor = derivedOpts({ owner: this, equalsFn: Position.equals }, reader => this.modifiedSelections.read(reader)[0]?.getPosition() ?? ( (new Position(1, 1))));
         this.originalCursor = observableFromEvent(this, this.original.onDidChangeCursorPosition, () => this.original.getPosition() ?? ( (new Position(1, 1))));
@@ -141,9 +142,8 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         if (!ariaLabel) {
             ariaLabel = '';
         }
-        const ariaNavigationTip = ( localizeWithPath(
-            _moduleId,
-            0,
+        const ariaNavigationTip = ( localize(
+            4689,
             ' use {0} to open the accessibility help.',
             this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getAriaLabel()
         ));

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js

@@ -141,7 +141,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             const mightContainRTL = this._editors.original.getModel()?.mightContainRTL() ?? false;
             const renderOptions = RenderOptions.fromEditor(this._editors.modified);
             for (const a of alignmentsVal) {
-                if (a.diff && !renderSideBySide) {
+                if (a.diff && !renderSideBySide && (!this._options.useTrueInlineDiffRendering.read(reader) || !allowsTrueInlineDiffRendering(a.diff))) {
                     if (!a.originalRange.isEmpty) {
                         originalModelTokenizationCompleted.read(reader);
                         const deletedCodeDomNode = document.createElement('div');
@@ -490,4 +490,13 @@ function getAdditionalLineHeights(editor, viewZonesToIgnore) {
     const result = joinCombine(viewZoneHeights, wrappingZoneHeights, v => v.lineNumber, (v1, v2) => ({ lineNumber: v1.lineNumber, heightInPx: v1.heightInPx + v2.heightInPx }));
     return result;
 }
-export { DiffEditorViewZones };
+function allowsTrueInlineDiffRendering(mapping) {
+    if (!mapping.innerChanges) {
+        return false;
+    }
+    return mapping.innerChanges.every(c => rangeIsSingleLine(c.modifiedRange) && rangeIsSingleLine(c.originalRange));
+}
+function rangeIsSingleLine(range) {
+    return range.startLineNumber === range.endLineNumber;
+}
+export { DiffEditorViewZones, allowsTrueInlineDiffRendering };

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js

@@ -7,8 +7,7 @@ import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { MouseTargetType } from '../../../../editorBrowser.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { EndOfLineSequence } from '../../../../../common/model.js';
-import { localizeWithPath } from '../../../../../../nls.js';
-const _moduleId = "vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin";
+import { localize } from '../../../../../../nls.js';
 class InlineDiffDeletedCodeMargin extends Disposable {
     get visibility() {
         return this._visibility;
@@ -52,25 +51,23 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     const isDeletion = _diff.modified.isEmpty;
                     actions.push(( (new Action('diff.clipboard.copyDeletedContent', isDeletion
                         ? (_diff.original.length > 1
-                            ? ( localizeWithPath(_moduleId, 0, "Copy deleted lines"))
-                            : ( localizeWithPath(_moduleId, 1, "Copy deleted line")))
+                            ? ( localize(9842, "Copy deleted lines"))
+                            : ( localize(9843, "Copy deleted line")))
                         : (_diff.original.length > 1
-                            ? ( localizeWithPath(_moduleId, 2, "Copy changed lines"))
-                            : ( localizeWithPath(_moduleId, 3, "Copy changed line"))), undefined, true, async () => {
+                            ? ( localize(9844, "Copy changed lines"))
+                            : ( localize(9845, "Copy changed line"))), undefined, true, async () => {
                         const originalText = this._originalTextModel.getValueInRange(_diff.original.toExclusiveRange());
                         await this._clipboardService.writeText(originalText);
                     }))));
                     if (_diff.original.length > 1) {
                         actions.push(( (new Action('diff.clipboard.copyDeletedLineContent', isDeletion
-                            ? ( localizeWithPath(
-                            _moduleId,
-                            4,
+                            ? ( localize(
+                            9846,
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         ))
-                            : ( localizeWithPath(
-                            _moduleId,
-                            5,
+                            : ( localize(
+                            9847,
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )), undefined, true, async () => {
@@ -84,7 +81,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     }
                     const readOnly = _modifiedEditor.getOption(EditorOption.readOnly);
                     if (!readOnly) {
-                        actions.push(( (new Action('diff.inline.revertChange', ( localizeWithPath(_moduleId, 6, "Revert this change")), undefined, true, async () => {
+                        actions.push(( (new Action('diff.inline.revertChange', ( localize(9848, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
                         }))));
                     }

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js

@@ -1,19 +1,18 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ToggleUseInlineViewWhenSpaceIsLimited, ToggleShowMovedCodeBlocks, RevertHunkOrSelection, AccessibleDiffViewerNext, AccessibleDiffViewerPrev, ToggleCollapseUnchangedRegions, SwitchSide, ExitCompareMove, CollapseAllUnchangedRegions, ShowAllUnchangedRegions } from './commands.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerAction2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ContextKeyExpr, ContextKeyEqualsExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import './registrations.contribution.js';
-const _moduleId = "vs/editor/browser/widget/diffEditor/diffEditor.contribution";
 registerAction2(ToggleCollapseUnchangedRegions);
 registerAction2(ToggleShowMovedCodeBlocks);
 registerAction2(ToggleUseInlineViewWhenSpaceIsLimited);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( (new ToggleUseInlineViewWhenSpaceIsLimited())).desc.id,
-        title: ( localizeWithPath(_moduleId, 0, "Use Inline View When Space Is Limited")),
+        title: ( localize(1648, "Use Inline View When Space Is Limited")),
         toggled: ( (ContextKeyExpr.has('config.diffEditor.useInlineViewWhenSpaceIsLimited'))),
         precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
@@ -27,7 +26,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( (new ToggleShowMovedCodeBlocks())).desc.id,
-        title: ( localizeWithPath(_moduleId, 1, "Show Moved Code Blocks")),
+        title: ( localize(1649, "Show Moved Code Blocks")),
         icon: Codicon.move,
         toggled: ContextKeyEqualsExpr.create('config.diffEditor.experimental.showMoves', true),
         precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
@@ -44,7 +43,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorHunkToolbar, {
         command: {
             id: ( (new RevertHunkOrSelection())).desc.id,
-            title: ( localizeWithPath(_moduleId, 2, "Revert Block")),
+            title: ( localize(1650, "Revert Block")),
             icon: ctx.icon,
         },
         when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
@@ -54,7 +53,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorSelectionToolbar, {
         command: {
             id: ( (new RevertHunkOrSelection())).desc.id,
-            title: ( localizeWithPath(_moduleId, 3, "Revert Selection")),
+            title: ( localize(1651, "Revert Selection")),
             icon: ctx.icon,
         },
         when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
@@ -69,7 +68,7 @@ registerAction2(ShowAllUnchangedRegions);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: AccessibleDiffViewerNext.id,
-        title: ( localizeWithPath(_moduleId, 4, "Open Accessible Diff Viewer")),
+        title: ( localize(1652, "Open Accessible Diff Viewer")),
         precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
     order: 10,

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.js

@@ -2,10 +2,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
 import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { observableFromEvent, derivedConstOnceDefined } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import '../../../../base/common/arrays.js';
 import { Constants } from '../../../../base/common/uint.js';
+import { allowsTrueInlineDiffRendering } from './components/diffEditorViewZones/diffEditorViewZones.js';
 import { diffEditorDefaultOptions } from '../../../common/config/diffEditor.js';
 import { boolean, clampedFloat, clampedInt, stringSet } from '../../../common/config/editorOptions.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
@@ -17,8 +18,15 @@ let DiffEditorOptions = class DiffEditorOptions {
         this._screenReaderMode = observableFromEvent(this, this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
         this.couldShowInlineViewBecauseOfSize = derived(this, reader => this._options.read(reader).renderSideBySide && this._diffEditorWidth.read(reader) <= this._options.read(reader).renderSideBySideInlineBreakpoint);
         this.renderOverviewRuler = derived(this, reader => this._options.read(reader).renderOverviewRuler);
-        this.renderSideBySide = derived(this, reader => this._options.read(reader).renderSideBySide
-            && !(this._options.read(reader).useInlineViewWhenSpaceIsLimited && this.couldShowInlineViewBecauseOfSize.read(reader) && !this._screenReaderMode.read(reader)));
+        this.renderSideBySide = derived(this, reader => {
+            if (this.compactMode.read(reader)) {
+                if (this.shouldRenderInlineViewInSmartMode.read(reader)) {
+                    return false;
+                }
+            }
+            return this._options.read(reader).renderSideBySide
+                && !(this._options.read(reader).useInlineViewWhenSpaceIsLimited && this.couldShowInlineViewBecauseOfSize.read(reader) && !this._screenReaderMode.read(reader));
+        });
         this.readOnly = derived(this, reader => this._options.read(reader).readOnly);
         this.shouldRenderOldRevertArrows = derived(this, reader => {
             if (!this._options.read(reader).renderMarginRevertIcon) {
@@ -50,10 +58,22 @@ let DiffEditorOptions = class DiffEditorOptions {
         this.diffAlgorithm = derived(this, reader => this._options.read(reader).diffAlgorithm);
         this.showEmptyDecorations = derived(this, reader => this._options.read(reader).experimental.showEmptyDecorations);
         this.onlyShowAccessibleDiffViewer = derived(this, reader => this._options.read(reader).onlyShowAccessibleDiffViewer);
+        this.compactMode = derived(this, reader => this._options.read(reader).compactMode);
+        this.trueInlineDiffRenderingEnabled = derived(this, reader => this._options.read(reader).experimental.useTrueInlineView);
+        this.useTrueInlineDiffRendering = derived(this, reader => !this.renderSideBySide.read(reader) && this.trueInlineDiffRenderingEnabled.read(reader));
         this.hideUnchangedRegions = derived(this, reader => this._options.read(reader).hideUnchangedRegions.enabled);
         this.hideUnchangedRegionsRevealLineCount = derived(this, reader => this._options.read(reader).hideUnchangedRegions.revealLineCount);
         this.hideUnchangedRegionsContextLineCount = derived(this, reader => this._options.read(reader).hideUnchangedRegions.contextLineCount);
         this.hideUnchangedRegionsMinimumLineCount = derived(this, reader => this._options.read(reader).hideUnchangedRegions.minimumLineCount);
+        this._model = observableValue(this, undefined);
+        this.shouldRenderInlineViewInSmartMode = ( ( this._model
+            .map(this, model => derivedConstOnceDefined(this, reader => {
+            const diffs = model?.diff.read(reader);
+            return diffs ? isSimpleDiff(diffs, this.trueInlineDiffRenderingEnabled.read(reader)) : undefined;
+        })))
+            .flatten()
+            .map(this, v => !!v));
+        this.inlineViewHideOriginalLineNumbers = this.compactMode;
         const optionsCopy = { ...options, ...validateDiffEditorOptions(options, diffEditorDefaultOptions) };
         this._options = observableValue(this, optionsCopy);
     }
@@ -65,10 +85,22 @@ let DiffEditorOptions = class DiffEditorOptions {
     setWidth(width) {
         this._diffEditorWidth.set(width, undefined);
     }
+    setModel(model) {
+        this._model.set(model, undefined);
+    }
 };
 DiffEditorOptions = ( __decorate([
     ( __param(1, IAccessibilityService))
 ], DiffEditorOptions));
+function isSimpleDiff(diff, supportsTrueDiffRendering) {
+    return diff.mappings.every(m => isInsertion(m.lineRangeMapping) || isDeletion(m.lineRangeMapping) || (supportsTrueDiffRendering && allowsTrueInlineDiffRendering(m.lineRangeMapping)));
+}
+function isInsertion(mapping) {
+    return mapping.original.length === 0;
+}
+function isDeletion(mapping) {
+    return mapping.modified.length === 0;
+}
 function validateDiffEditorOptions(options, defaults) {
     return {
         enableSplitViewResizing: boolean(options.enableSplitViewResizing, defaults.enableSplitViewResizing),
@@ -88,6 +120,7 @@ function validateDiffEditorOptions(options, defaults) {
         experimental: {
             showMoves: boolean(options.experimental?.showMoves, defaults.experimental.showMoves),
             showEmptyDecorations: boolean(options.experimental?.showEmptyDecorations, defaults.experimental.showEmptyDecorations),
+            useTrueInlineView: boolean(options.experimental?.useTrueInlineView, defaults.experimental.useTrueInlineView),
         },
         hideUnchangedRegions: {
             enabled: boolean(options.hideUnchangedRegions?.enabled ?? options.experimental?.collapseUnchangedRegions, defaults.hideUnchangedRegions.enabled),
@@ -100,6 +133,7 @@ function validateDiffEditorOptions(options, defaults) {
         renderSideBySideInlineBreakpoint: clampedInt(options.renderSideBySideInlineBreakpoint, defaults.renderSideBySideInlineBreakpoint, 0, Constants.MAX_SAFE_SMALL_INTEGER),
         useInlineViewWhenSpaceIsLimited: boolean(options.useInlineViewWhenSpaceIsLimited, defaults.useInlineViewWhenSpaceIsLimited),
         renderGutterMenu: boolean(options.renderGutterMenu, defaults.renderGutterMenu),
+        compactMode: boolean(options.compactMode, defaults.compactMode),
     };
 }
 export { DiffEditorOptions };

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.js

@@ -9,7 +9,8 @@ import { observableSignalFromEvent, observableSignal } from '../../../../base/co
 import { waitForState } from '../../../../base/common/observableInternal/promise.js';
 import { groupAdjacentBy } from '../../../../base/common/arrays.js';
 import { IDiffProviderFactoryService } from './diffProviderFactoryService.js';
-import { readHotReloadableExport, filterWithPrevious } from './utils.js';
+import { filterWithPrevious } from './utils.js';
+import { readHotReloadableExport } from '../../../../base/common/hotReloadHelpers.js';
 import { LineRange, LineRangeSet } from '../../../common/core/lineRange.js';
 import { DefaultLinesDiffComputer } from '../../../common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js';
 import { DetailedLineRangeMapping, LineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
@@ -299,7 +300,8 @@ function normalizeDocumentDiff(diff, original, modified) {
 function normalizeRangeMapping(rangeMapping, original, modified) {
     let originalRange = rangeMapping.originalRange;
     let modifiedRange = rangeMapping.modifiedRange;
-    if ((originalRange.endColumn !== 1 || modifiedRange.endColumn !== 1) &&
+    if (originalRange.startColumn === 1 && modifiedRange.startColumn === 1 &&
+        (originalRange.endColumn !== 1 || modifiedRange.endColumn !== 1) &&
         originalRange.endColumn === original.getLineMaxColumn(originalRange.endLineNumber)
         && modifiedRange.endColumn === modified.getLineMaxColumn(modifiedRange.endLineNumber)
         && originalRange.endLineNumber < original.getLineCount()

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js

@@ -4,7 +4,7 @@ import { findLast } from '../../../../base/common/arraysFind.js';
 import { onUnexpectedError, BugIndicatingError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
-import { observableValue, subtransaction, transaction } from '../../../../base/common/observableInternal/base.js';
+import { disposableObservableValue, observableValue, subtransaction, transaction } from '../../../../base/common/observableInternal/base.js';
 import { derived, derivedDisposable } from '../../../../base/common/observableInternal/derived.js';
 import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
 import { recomputeInitiallyAndOnChange, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
@@ -24,7 +24,8 @@ import { HideUnchangedRegionsFeature } from './features/hideUnchangedRegionsFeat
 import { MovedBlocksLinesFeature } from './features/movedBlocksLinesFeature.js';
 import { OverviewRulerFeature } from './features/overviewRulerFeature.js';
 import { RevertButtonsFeature } from './features/revertButtonsFeature.js';
-import { ObservableElementSizeObserver, applyViewZones, applyStyle, translatePosition, readHotReloadableExport } from './utils.js';
+import { ObservableElementSizeObserver, applyViewZones, applyStyle, RefCounted, translatePosition } from './utils.js';
+import { readHotReloadableExport } from '../../../../base/common/hotReloadHelpers.js';
 import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
@@ -57,8 +58,8 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
             h('div.editor.modified@modified', { style: { position: 'absolute', height: '100%', } }),
             h('div.accessibleDiffViewer@accessibleDiffViewer', { style: { position: 'absolute', height: '100%' } }),
         ]);
-        this._diffModel = observableValue(this, undefined);
-        this._shouldDisposeDiffModel = false;
+        this._diffModelSrc = this._register(disposableObservableValue(this, undefined));
+        this._diffModel = derived(this, reader => this._diffModelSrc.read(reader)?.object);
         this.onDidChangeModel = Event.fromObservableLight(this._diffModel);
         this._contextKeyService = this._register(this._parentContextKeyService.createScoped(this._domElement));
         this._instantiationService = this._register(this._parentInstantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService]))));
@@ -94,8 +95,14 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
             }
             else {
                 gutterLeft = 0;
+                const shouldHideOriginalLineNumbers = this._options.inlineViewHideOriginalLineNumbers.read(reader);
                 originalLeft = gutterWidth;
-                originalWidth = Math.max(5, this._editors.original.getLayoutInfo().decorationsLeft);
+                if (shouldHideOriginalLineNumbers) {
+                    originalWidth = 0;
+                }
+                else {
+                    originalWidth = Math.max(5, this._editors.originalObs.layoutInfoDecorationsLeft.read(reader));
+                }
                 modifiedLeft = gutterWidth + originalWidth;
                 modifiedWidth = fullWidth - modifiedLeft - overviewRulerPartWidth;
             }
@@ -214,11 +221,6 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
                 store.add(toDisposable(() => r.done()));
             }
         }));
-        this._register(toDisposable(() => {
-            if (this._shouldDisposeDiffModel) {
-                this._diffModel.get()?.dispose();
-            }
-        }));
         this._register(autorunWithStore((reader, store) => {
             store.add(new (readHotReloadableExport(RevertButtonsFeature, reader))(this._editors, this._diffModel, this._options, this));
         }));
@@ -234,6 +236,9 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
                 }));
             }
         }));
+        this._register(autorun(reader => {
+            this._options.setModel(this._diffModel.read(reader));
+        }));
     }
     getViewWidth() {
         return this._rootSizeObserver.width.get();
@@ -297,24 +302,29 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         return this._instantiationService.createInstance(DiffEditorViewModel, model, this._options);
     }
     getModel() { return this._diffModel.get()?.model ?? null; }
-    setModel(model, tx) {
-        if (!model && this._diffModel.get()) {
+    setModel(model) {
+        const vm = !model ? null
+            : ('model' in model) ? RefCounted.create(model).createNewRef(this)
+                : RefCounted.create(this.createViewModel(model), this);
+        this.setDiffModel(vm);
+    }
+    setDiffModel(viewModel, tx) {
+        const currentModel = this._diffModel.get();
+        if (!viewModel && currentModel) {
             this._accessibleDiffViewer.get().close();
         }
-        const vm = model ? ('model' in model) ? { model, shouldDispose: false } : { model: this.createViewModel(model), shouldDispose: true } : undefined;
-        if (this._diffModel.get() !== vm?.model) {
+        if (this._diffModel.get() !== viewModel?.object) {
             subtransaction(tx, tx => {
+                const vm = viewModel?.object;
                 observableFromEvent.batchEventsGlobally(tx, () => {
-                    this._editors.original.setModel(vm ? vm.model.model.original : null);
-                    this._editors.modified.setModel(vm ? vm.model.model.modified : null);
+                    this._editors.original.setModel(vm ? vm.model.original : null);
+                    this._editors.modified.setModel(vm ? vm.model.modified : null);
                 });
-                const prevValue = this._diffModel.get();
-                const shouldDispose = this._shouldDisposeDiffModel;
-                this._shouldDisposeDiffModel = vm?.shouldDispose ?? false;
-                this._diffModel.set(vm?.model, tx);
-                if (shouldDispose) {
-                    prevValue?.dispose();
-                }
+                const prevValueRef = this._diffModelSrc.get()?.createNewRef(this);
+                this._diffModelSrc.set(viewModel?.createNewRef(this), tx);
+                setTimeout(() => {
+                    prevValueRef?.dispose();
+                }, 0);
             });
         }
     }

package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js

@@ -7,11 +7,12 @@ import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
 import { derivedDisposable, derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
 import '../../../../../base/common/arrays.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { isDefined } from '../../../../../base/common/types.js';
+import { observableCodeEditor } from '../../../observableCodeEditor.js';
 import { RevealPreference } from '../diffEditorViewModel.js';
 import { applyObservableDecorations, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
@@ -20,13 +21,18 @@ import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
 import { CursorChangeReason } from '../../../../common/cursorEvents.js';
 import { SymbolKinds } from '../../../../common/languages.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 var HideUnchangedRegionsFeature_1;
-const _moduleId = "vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature";
 let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disposable {
     static { HideUnchangedRegionsFeature_1 = this; }
-    static { this._breadcrumbsSourceFactory = observableValue('breadcrumbsSourceFactory', undefined); }
+    static { this._breadcrumbsSourceFactory = observableValue(HideUnchangedRegionsFeature_1, () => ({
+        dispose() {
+        },
+        getBreadcrumbItems(startRange, reader) {
+            return [];
+        },
+    })); }
     static setBreadcrumbsSourceFactory(factory) {
         this._breadcrumbsSourceFactory.set(factory, undefined);
     }
@@ -82,40 +88,61 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
             const origViewZones = [];
             const modViewZones = [];
             const sideBySide = this._options.renderSideBySide.read(reader);
+            const compactMode = this._options.compactMode.read(reader);
             const curUnchangedRegions = unchangedRegions.read(reader);
-            for (const r of curUnchangedRegions) {
+            for (let i = 0; i < curUnchangedRegions.length; i++) {
+                const r = curUnchangedRegions[i];
                 if (r.shouldHideControls(reader)) {
                     continue;
                 }
-                {
-                    const d = derived(this, reader =>  r.getHiddenOriginalRange(reader).startLineNumber - 1);
-                    const origVz = ( (new PlaceholderViewZone(d, 24)));
-                    origViewZones.push(origVz);
-                    store.add(( (new CollapsedCodeOverlayWidget(
-                        this._editors.original,
-                        origVz,
-                        r,
-                        r.originalUnchangedRange,
-                        !sideBySide,
-                        modifiedOutlineSource,
-                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
-                        this._options
-                    ))));
+                if (compactMode && (i === 0 || i === curUnchangedRegions.length - 1)) {
+                    continue;
+                }
+                if (compactMode) {
+                    {
+                        const d = derived(this, reader =>  r.getHiddenOriginalRange(reader).startLineNumber - 1);
+                        const origVz = ( (new PlaceholderViewZone(d, 12)));
+                        origViewZones.push(origVz);
+                        store.add(( (new CompactCollapsedCodeOverlayWidget(this._editors.original, origVz, r, !sideBySide))));
+                    }
+                    {
+                        const d = derived(this, reader =>  r.getHiddenModifiedRange(reader).startLineNumber - 1);
+                        const modViewZone = ( (new PlaceholderViewZone(d, 12)));
+                        modViewZones.push(modViewZone);
+                        store.add(( (new CompactCollapsedCodeOverlayWidget(this._editors.modified, modViewZone, r))));
+                    }
                 }
-                {
-                    const d = derived(this, reader =>  r.getHiddenModifiedRange(reader).startLineNumber - 1);
-                    const modViewZone = ( (new PlaceholderViewZone(d, 24)));
-                    modViewZones.push(modViewZone);
-                    store.add(( (new CollapsedCodeOverlayWidget(
-                        this._editors.modified,
-                        modViewZone,
-                        r,
-                        r.modifiedUnchangedRange,
-                        false,
-                        modifiedOutlineSource,
-                        l => this._diffModel.get().ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
-                        this._options
-                    ))));
+                else {
+                    {
+                        const d = derived(this, reader =>  r.getHiddenOriginalRange(reader).startLineNumber - 1);
+                        const origVz = ( (new PlaceholderViewZone(d, 24)));
+                        origViewZones.push(origVz);
+                        store.add(( (new CollapsedCodeOverlayWidget(
+                            this._editors.original,
+                            origVz,
+                            r,
+                            r.originalUnchangedRange,
+                            !sideBySide,
+                            modifiedOutlineSource,
+                            l => this._diffModel.get().ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
+                            this._options
+                        ))));
+                    }
+                    {
+                        const d = derived(this, reader =>  r.getHiddenModifiedRange(reader).startLineNumber - 1);
+                        const modViewZone = ( (new PlaceholderViewZone(d, 24)));
+                        modViewZones.push(modViewZone);
+                        store.add(( (new CollapsedCodeOverlayWidget(
+                            this._editors.modified,
+                            modViewZone,
+                            r,
+                            r.modifiedUnchangedRange,
+                            false,
+                            modifiedOutlineSource,
+                            l => this._diffModel.get().ensureModifiedLineIsVisible(l, RevealPreference.FromBottom, undefined),
+                            this._options
+                        ))));
+                    }
                 }
             }
             return { origViewZones, modViewZones, };
@@ -128,7 +155,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         const unchangedLinesDecorationShow = {
             description: 'Fold Unchanged',
             glyphMarginHoverMessage: ( (new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true })))
-                .appendMarkdown(( localizeWithPath(_moduleId, 0, 'Fold Unchanged Region'))),
+                .appendMarkdown(( localize(4677, 'Fold Unchanged Region'))),
             glyphMarginClassName: 'fold-unchanged ' + ThemeIcon.asClassName(Codicon.fold),
             zIndex: 10001,
         };
@@ -212,6 +239,30 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
 HideUnchangedRegionsFeature = HideUnchangedRegionsFeature_1 = ( (__decorate([
     ( (__param(3, IInstantiationService)))
 ], HideUnchangedRegionsFeature)));
+class CompactCollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
+    constructor(editor, _viewZone, _unchangedRegion, _hide = false) {
+        const root = h('div.diff-hidden-lines-widget');
+        super(editor, _viewZone, root.root);
+        this._unchangedRegion = _unchangedRegion;
+        this._hide = _hide;
+        this._nodes = h('div.diff-hidden-lines-compact', [
+            h('div.line-left', []),
+            h('div.text@text', []),
+            h('div.line-right', [])
+        ]);
+        root.root.appendChild(this._nodes.root);
+        if (this._hide) {
+            this._nodes.root.replaceChildren();
+        }
+        this._register(autorun(reader => {
+            if (!this._hide) {
+                const lineCount = this._unchangedRegion.getHiddenModifiedRange(reader).length;
+                const linesHiddenText = ( localize(4678, '{0} hidden lines', lineCount));
+                this._nodes.text.innerText = linesHiddenText;
+            }
+        }));
+    }
+}
 class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
     constructor(_editor, _viewZone, _unchangedRegion, _unchangedRegionRange, _hide, _modifiedOutlineSource, _revealModifiedHiddenLine, _options) {
         const root = h('div.diff-hidden-lines-widget');
@@ -224,17 +275,16 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._revealModifiedHiddenLine = _revealModifiedHiddenLine;
         this._options = _options;
         this._nodes = h('div.diff-hidden-lines', [
-            h('div.top@top', { title: ( localizeWithPath(_moduleId, 1, 'Click or drag to show more above')) }),
+            h('div.top@top', { title: ( localize(4679, 'Click or drag to show more above')) }),
             h('div.center@content', { style: { display: 'flex' } }, [
-                h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localizeWithPath(_moduleId, 2, 'Show Unchanged Region')), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
+                h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localize(4680, 'Show Unchanged Region')), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
                 h('div@others', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center' } }),
             ]),
-            h('div.bottom@bottom', { title: ( localizeWithPath(_moduleId, 3, 'Click or drag to show more below')), role: 'button' }),
+            h('div.bottom@bottom', { title: ( localize(4681, 'Click or drag to show more below')), role: 'button' }),
         ]);
         root.root.appendChild(this._nodes.root);
-        const layoutInfo = observableFromEvent(this._editor.onDidLayoutChange, () => this._editor.getLayoutInfo());
         if (!this._hide) {
-            this._register(applyStyle(this._nodes.first, { width: ( (layoutInfo.map((l) => l.contentLeft))) }));
+            this._register(applyStyle(this._nodes.first, { width: observableCodeEditor(this._editor).layoutInfoContentLeft }));
         }
         else {
             reset(this._nodes.first);
@@ -340,8 +390,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
             const children = [];
             if (!this._hide) {
                 const lineCount = _unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localizeWithPath(_moduleId, 4, '{0} hidden lines', lineCount));
-                const span = $('span', { title: ( localizeWithPath(_moduleId, 5, 'Double click to unfold')) }, linesHiddenText);
+                const linesHiddenText = ( localize(4681, '{0} hidden lines', lineCount));
+                const span = $('span', { title: ( localize(4682, 'Double click to unfold')) }, linesHiddenText);
                 span.addEventListener('dblclick', e => {
                     if (e.button !== 0) {
                         return;