@codingame/monaco-vscode-api 7.0.11 → 7.1.1

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

@@ -13,8 +13,7 @@ import '../../../../../base/common/cancellation.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { applyViewZones, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';
 import { OffsetRangeSet, OffsetRange } from '../../../../common/core/offsetRange.js';
-import { localizeWithPath } from '../../../../../nls.js';
-const _moduleId = "vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature";
+import { localize } from '../../../../../nls.js';
 class MovedBlocksLinesFeature extends Disposable {
     static { this.movedCodeBlockPadding = 4; }
     constructor(_rootElement, _diffModel, _originalEditorLayoutInfo, _modifiedEditorLayoutInfo, _editors) {
@@ -252,30 +251,26 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         }));
         let text;
         if (_move.changes.length > 0) {
-            text = this._kind === 'original' ? ( localizeWithPath(
-                _moduleId,
-                0,
+            text = this._kind === 'original' ? ( localize(
+                4683,
                 'Code moved with changes to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
-            )) : ( localizeWithPath(
-                _moduleId,
-                1,
+            )) : ( localize(
+                4684,
                 'Code moved with changes from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1
             ));
         }
         else {
-            text = this._kind === 'original' ? ( localizeWithPath(
-                _moduleId,
-                2,
+            text = this._kind === 'original' ? ( localize(
+                4685,
                 'Code moved to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
-            )) : ( localizeWithPath(
-                _moduleId,
-                3,
+            )) : ( localize(
+                4686,
                 'Code moved from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1

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

@@ -28,7 +28,7 @@ var OverviewRulerFeature_1;
 let OverviewRulerFeature = class OverviewRulerFeature extends Disposable {
     static { OverviewRulerFeature_1 = this; }
     static { this.ONE_OVERVIEW_WIDTH = 15; }
-    static { this.ENTIRE_DIFF_OVERVIEW_WIDTH = OverviewRulerFeature_1.ONE_OVERVIEW_WIDTH * 2; }
+    static { this.ENTIRE_DIFF_OVERVIEW_WIDTH = this.ONE_OVERVIEW_WIDTH * 2; }
     constructor(_editors, _rootElement, _diffModel, _rootWidth, _rootHeight, _modifiedEditorLayoutInfo, _themeService) {
         super();
         this._editors = _editors;

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

@@ -11,8 +11,7 @@ import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
 import { Range } from '../../../../common/core/range.js';
 import { LineRangeMapping } from '../../../../common/diff/rangeMapping.js';
 import { GlyphMarginLane } from '../../../../common/model.js';
-import { localizeWithPath } from '../../../../../nls.js';
-const _moduleId = "vs/editor/browser/widget/diffEditor/features/revertButtonsFeature";
+import { localize } from '../../../../../nls.js';
 const emptyArr = [];
 class RevertButtonsFeature extends Disposable {
     constructor(_editors, _diffModel, _options, _widget) {
@@ -103,8 +102,8 @@ class RevertButton extends Disposable {
         this._id = `revertButton${RevertButton.counter++}`;
         this._domNode = h('div.revertButton', {
             title: this._revertSelection
-                ? ( localizeWithPath(_moduleId, 0, 'Revert Selected Changes'))
-                : ( localizeWithPath(_moduleId, 1, 'Revert Change'))
+                ? ( localize(4687, 'Revert Selected Changes'))
+                : ( localize(4688, 'Revert Change'))
         }, [renderIcon(Codicon.arrowRight)]).root;
         this._register(addDisposableListener(this._domNode, EventType.MOUSE_DOWN, e => {
             if (e.button !== 2) {

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

@@ -1,7 +1,7 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -14,20 +14,14 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const _moduleId = "vs/editor/browser/widget/diffEditor/registrations.contribution";
-registerColor('diffEditor.move.border', '#8b8b8b9c', ( localizeWithPath(
-    _moduleId,
-    0,
-    'The border color for text that got moved in the diff editor.'
-)));
-registerColor('diffEditor.moveActive.border', '#FFA500', ( localizeWithPath(
-    _moduleId,
-    1,
+registerColor('diffEditor.move.border', '#8b8b8b9c', ( localize(5030, 'The border color for text that got moved in the diff editor.')));
+registerColor('diffEditor.moveActive.border', '#FFA500', ( localize(
+    5031,
     'The active border color for text that got moved in the diff editor.'
 )));
-registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localizeWithPath(_moduleId, 2, 'The color of the shadow around unchanged region widgets.')));
-const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localizeWithPath(_moduleId, 3, 'Line decoration for inserts in the diff editor.')));
-const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localizeWithPath(_moduleId, 4, 'Line decoration for removals in the diff editor.')));
+registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localize(5032, 'The color of the shadow around unchanged region widgets.')));
+const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localize(5033, 'Line decoration for inserts in the diff editor.')));
+const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localize(5034, 'Line decoration for removals in the diff editor.')));
 const diffLineAddDecorationBackgroundWithIndicator = ModelDecorationOptions.register({
     className: 'line-insert',
     description: 'line-insert',

package/vscode/src/vs/editor/browser/widget/diffEditor/style.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .diff-hidden-lines-widget{width:100%}.monaco-editor .diff-hidden-lines{font-size:13px;height:0;line-height:14px;transform:translateY(-10px)}.monaco-editor .diff-hidden-lines .bottom.dragging,.monaco-editor .diff-hidden-lines .top.dragging,.monaco-editor .diff-hidden-lines:not(.dragging) .bottom:hover,.monaco-editor .diff-hidden-lines:not(.dragging) .top:hover{background-color:var(--vscode-focusBorder)}.monaco-editor .diff-hidden-lines .bottom,.monaco-editor .diff-hidden-lines .top{background-clip:padding-box;background-color:transparent;border-bottom:2px solid transparent;border-top:4px solid transparent;height:4px;transition:background-color .1s ease-out}.monaco-editor .diff-hidden-lines .bottom.canMoveTop:not(.canMoveBottom),.monaco-editor .diff-hidden-lines .top.canMoveTop:not(.canMoveBottom),.monaco-editor.draggingUnchangedRegion.canMoveTop:not(.canMoveBottom) *{cursor:n-resize!important}.monaco-editor .diff-hidden-lines .bottom:not(.canMoveTop).canMoveBottom,.monaco-editor .diff-hidden-lines .top:not(.canMoveTop).canMoveBottom,.monaco-editor.draggingUnchangedRegion:not(.canMoveTop).canMoveBottom *{cursor:s-resize!important}.monaco-editor .diff-hidden-lines .bottom.canMoveTop.canMoveBottom,.monaco-editor .diff-hidden-lines .top.canMoveTop.canMoveBottom,.monaco-editor.draggingUnchangedRegion.canMoveTop.canMoveBottom *{cursor:ns-resize!important}.monaco-editor .diff-hidden-lines .top{transform:translateY(4px)}.monaco-editor .diff-hidden-lines .bottom{transform:translateY(-6px)}.monaco-editor .diff-unchanged-lines{background:var(--vscode-diffEditor-unchangedCodeBackground)}.monaco-editor .noModificationsOverlay{align-items:center;background:var(--vscode-editor-background);display:flex;justify-content:center;z-index:1}.monaco-editor .diff-hidden-lines .center{background:var(--vscode-diffEditor-unchangedRegionBackground);box-shadow:inset 0 -5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow),inset 0 5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow);color:var(--vscode-diffEditor-unchangedRegionForeground);display:block;height:24px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-editor .diff-hidden-lines .center span.codicon{vertical-align:middle}.monaco-editor .diff-hidden-lines .center a:hover .codicon{color:var(--vscode-editorLink-activeForeground)!important;cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item{cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item:hover{color:var(--vscode-editorLink-activeForeground)}.monaco-editor .movedModified,.monaco-editor .movedOriginal{border:2px solid var(--vscode-diffEditor-move-border)}.monaco-editor .movedModified.currentMove,.monaco-editor .movedOriginal.currentMove{border:2px solid var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path.currentMove{stroke:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path{pointer-events:visiblestroke}.monaco-diff-editor .moved-blocks-lines .arrow{fill:var(--vscode-diffEditor-move-border)}.monaco-diff-editor .moved-blocks-lines .arrow.currentMove{fill:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines .arrow-rectangle{fill:var(--vscode-editor-background)}.monaco-diff-editor .moved-blocks-lines{pointer-events:none;position:absolute}.monaco-diff-editor .moved-blocks-lines path{fill:none;stroke:var(--vscode-diffEditor-move-border);stroke-width:2}.monaco-editor .char-delete.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-removedTextBackground);margin-left:-1px}.monaco-editor .char-insert.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-insertedTextBackground)}.monaco-editor .fold-unchanged{cursor:pointer}.monaco-diff-editor .diff-moved-code-block{display:flex;justify-content:flex-end;margin-top:-4px}.monaco-diff-editor .diff-moved-code-block .action-bar .action-label.codicon{font-size:12px;height:12px;width:12px}.monaco-diff-editor .diffOverview{z-index:9}.monaco-diff-editor .diffOverview .diffViewport{z-index:10}.monaco-diff-editor.vs\t\t\t.diffOverview{background:rgba(0,0,0,.03)}.monaco-diff-editor.vs-dark\t\t.diffOverview{background:hsla(0,0%,100%,.01)}.monaco-scrollable-element.modified-in-monaco-diff-editor.vs\t\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.vs-dark\t.scrollbar{background:transparent}.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-black\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-light\t.scrollbar{background:none}.monaco-scrollable-element.modified-in-monaco-diff-editor .slider{z-index:10}.modified-in-monaco-diff-editor\t\t\t\t.slider.active{background:hsla(0,0%,67%,.4)}.modified-in-monaco-diff-editor.hc-black\t.slider.active,.modified-in-monaco-diff-editor.hc-light\t.slider.active{background:none}.monaco-diff-editor .delete-sign,.monaco-diff-editor .insert-sign,.monaco-editor .delete-sign,.monaco-editor .insert-sign{align-items:center;display:flex!important;font-size:11px!important;opacity:.7!important}.monaco-diff-editor.hc-black .delete-sign,.monaco-diff-editor.hc-black .insert-sign,.monaco-diff-editor.hc-light .delete-sign,.monaco-diff-editor.hc-light .insert-sign,.monaco-editor.hc-black .delete-sign,.monaco-editor.hc-black .insert-sign,.monaco-editor.hc-light .delete-sign,.monaco-editor.hc-light .insert-sign{opacity:1}.monaco-editor .inline-added-margin-view-zone,.monaco-editor .inline-deleted-margin-view-zone{text-align:right}.monaco-editor .arrow-revert-change{position:absolute;z-index:10}.monaco-editor .arrow-revert-change:hover{cursor:pointer}.monaco-editor .view-zones .view-lines .view-line span{display:inline-block}.monaco-editor .margin-view-zones .lightbulb-glyph:hover{cursor:pointer}.monaco-diff-editor .char-insert,.monaco-editor .char-insert{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-diff-editor .line-insert,.monaco-editor .line-insert{background-color:var(--vscode-diffEditor-insertedLineBackground,var(--vscode-diffEditor-insertedTextBackground))}.monaco-editor .char-insert,.monaco-editor .line-insert{border:1px solid var(--vscode-diffEditor-insertedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-insert,.monaco-editor.hc-black .line-insert,.monaco-editor.hc-light .char-insert,.monaco-editor.hc-light .line-insert{border-style:dashed}.monaco-editor .char-delete,.monaco-editor .line-delete{border:1px solid var(--vscode-diffEditor-removedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-delete,.monaco-editor.hc-black .line-delete,.monaco-editor.hc-light .char-delete,.monaco-editor.hc-light .line-delete{border-style:dashed}.monaco-diff-editor .gutter-insert,.monaco-editor .gutter-insert,.monaco-editor .inline-added-margin-view-zone{background-color:var(--vscode-diffEditorGutter-insertedLineBackground,var(--vscode-diffEditor-insertedLineBackground),var(--vscode-diffEditor-insertedTextBackground))}.monaco-diff-editor .char-delete,.monaco-editor .char-delete{background-color:var(--vscode-diffEditor-removedTextBackground)}.monaco-diff-editor .line-delete,.monaco-editor .line-delete{background-color:var(--vscode-diffEditor-removedLineBackground,var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor .gutter-delete,.monaco-editor .gutter-delete,.monaco-editor .inline-deleted-margin-view-zone{background-color:var(--vscode-diffEditorGutter-removedLineBackground,var(--vscode-diffEditor-removedLineBackground),var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor.side-by-side .editor.modified{border-left:1px solid var(--vscode-diffEditor-border);box-shadow:-6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor.side-by-side .editor.original{border-right:1px solid var(--vscode-diffEditor-border);box-shadow:6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor .diffViewport{background:var(--vscode-scrollbarSlider-background)}.monaco-diff-editor .diffViewport:hover{background:var(--vscode-scrollbarSlider-hoverBackground)}.monaco-diff-editor .diffViewport:active{background:var(--vscode-scrollbarSlider-activeBackground)}.monaco-editor .diagonal-fill{background-image:linear-gradient(-45deg,var(--vscode-diffEditor-diagonalFill) 12.5%,#0000 12.5%,#0000 50%,var(--vscode-diffEditor-diagonalFill) 50%,var(--vscode-diffEditor-diagonalFill) 62.5%,#0000 62.5%,#0000 100%);background-size:8px 8px}.monaco-diff-editor .gutter{flex-grow:0;flex-shrink:0;overflow:hidden;position:relative;&>div{position:absolute}.gutterItem{opacity:0;transition:opacity .7s;&.showAlways{opacity:1}&.noTransition,&.showAlways{transition:none}}&:hover .gutterItem{opacity:1;transition:opacity .1s ease-in-out}.gutterItem{.background{border-left:2px solid var(--vscode-menu-border);height:100%;left:50%;position:absolute;width:1px}.buttons{align-items:center;display:flex;justify-content:center;position:absolute;width:100%;.monaco-toolbar{height:fit-content;.monaco-action-bar{line-height:1;.actions-container{background:var(--vscode-editorGutter-commentRangeForeground);border-radius:4px;width:fit-content;.action-item{&:hover{background:var(--vscode-toolbar-hoverBackground)}.action-label{padding:1px 2px}}}}}}}}";
+var css = ".monaco-editor .diff-hidden-lines-widget{width:100%}.monaco-editor .diff-hidden-lines{font-size:13px;height:0;line-height:14px;transform:translateY(-10px)}.monaco-editor .diff-hidden-lines .bottom.dragging,.monaco-editor .diff-hidden-lines .top.dragging,.monaco-editor .diff-hidden-lines:not(.dragging) .bottom:hover,.monaco-editor .diff-hidden-lines:not(.dragging) .top:hover{background-color:var(--vscode-focusBorder)}.monaco-editor .diff-hidden-lines .bottom,.monaco-editor .diff-hidden-lines .top{background-clip:padding-box;background-color:transparent;border-bottom:2px solid transparent;border-top:4px solid transparent;height:4px;transition:background-color .1s ease-out}.monaco-editor .diff-hidden-lines .bottom.canMoveTop:not(.canMoveBottom),.monaco-editor .diff-hidden-lines .top.canMoveTop:not(.canMoveBottom),.monaco-editor.draggingUnchangedRegion.canMoveTop:not(.canMoveBottom) *{cursor:n-resize!important}.monaco-editor .diff-hidden-lines .bottom:not(.canMoveTop).canMoveBottom,.monaco-editor .diff-hidden-lines .top:not(.canMoveTop).canMoveBottom,.monaco-editor.draggingUnchangedRegion:not(.canMoveTop).canMoveBottom *{cursor:s-resize!important}.monaco-editor .diff-hidden-lines .bottom.canMoveTop.canMoveBottom,.monaco-editor .diff-hidden-lines .top.canMoveTop.canMoveBottom,.monaco-editor.draggingUnchangedRegion.canMoveTop.canMoveBottom *{cursor:ns-resize!important}.monaco-editor .diff-hidden-lines .top{transform:translateY(4px)}.monaco-editor .diff-hidden-lines .bottom{transform:translateY(-6px)}.monaco-editor .diff-unchanged-lines{background:var(--vscode-diffEditor-unchangedCodeBackground)}.monaco-editor .noModificationsOverlay{align-items:center;background:var(--vscode-editor-background);display:flex;justify-content:center;z-index:1}.monaco-editor .diff-hidden-lines .center{background:var(--vscode-diffEditor-unchangedRegionBackground);box-shadow:inset 0 -5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow),inset 0 5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow);color:var(--vscode-diffEditor-unchangedRegionForeground);display:block;height:24px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-editor .diff-hidden-lines .center span.codicon{vertical-align:middle}.monaco-editor .diff-hidden-lines .center a:hover .codicon{color:var(--vscode-editorLink-activeForeground)!important;cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item{cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item:hover{color:var(--vscode-editorLink-activeForeground)}.monaco-editor .movedModified,.monaco-editor .movedOriginal{border:2px solid var(--vscode-diffEditor-move-border)}.monaco-editor .movedModified.currentMove,.monaco-editor .movedOriginal.currentMove{border:2px solid var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path.currentMove{stroke:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path{pointer-events:visiblestroke}.monaco-diff-editor .moved-blocks-lines .arrow{fill:var(--vscode-diffEditor-move-border)}.monaco-diff-editor .moved-blocks-lines .arrow.currentMove{fill:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines .arrow-rectangle{fill:var(--vscode-editor-background)}.monaco-diff-editor .moved-blocks-lines{pointer-events:none;position:absolute}.monaco-diff-editor .moved-blocks-lines path{fill:none;stroke:var(--vscode-diffEditor-move-border);stroke-width:2}.monaco-editor .char-delete.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-removedTextBackground);margin-left:-1px}.monaco-editor .char-insert.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-insertedTextBackground)}.monaco-editor .fold-unchanged{cursor:pointer}.monaco-diff-editor .diff-moved-code-block{display:flex;justify-content:flex-end;margin-top:-4px}.monaco-diff-editor .diff-moved-code-block .action-bar .action-label.codicon{font-size:12px;height:12px;width:12px}.monaco-diff-editor .diffOverview{z-index:9}.monaco-diff-editor .diffOverview .diffViewport{z-index:10}.monaco-diff-editor.vs\t\t\t.diffOverview{background:rgba(0,0,0,.03)}.monaco-diff-editor.vs-dark\t\t.diffOverview{background:hsla(0,0%,100%,.01)}.monaco-scrollable-element.modified-in-monaco-diff-editor.vs\t\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.vs-dark\t.scrollbar{background:transparent}.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-black\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-light\t.scrollbar{background:none}.monaco-scrollable-element.modified-in-monaco-diff-editor .slider{z-index:10}.modified-in-monaco-diff-editor\t\t\t\t.slider.active{background:hsla(0,0%,67%,.4)}.modified-in-monaco-diff-editor.hc-black\t.slider.active,.modified-in-monaco-diff-editor.hc-light\t.slider.active{background:none}.monaco-diff-editor .delete-sign,.monaco-diff-editor .insert-sign,.monaco-editor .delete-sign,.monaco-editor .insert-sign{align-items:center;display:flex!important;font-size:11px!important;opacity:.7!important}.monaco-diff-editor.hc-black .delete-sign,.monaco-diff-editor.hc-black .insert-sign,.monaco-diff-editor.hc-light .delete-sign,.monaco-diff-editor.hc-light .insert-sign,.monaco-editor.hc-black .delete-sign,.monaco-editor.hc-black .insert-sign,.monaco-editor.hc-light .delete-sign,.monaco-editor.hc-light .insert-sign{opacity:1}.monaco-editor .inline-added-margin-view-zone,.monaco-editor .inline-deleted-margin-view-zone{text-align:right}.monaco-editor .arrow-revert-change{position:absolute;z-index:10}.monaco-editor .arrow-revert-change:hover{cursor:pointer}.monaco-editor .view-zones .view-lines .view-line span{display:inline-block}.monaco-editor .margin-view-zones .lightbulb-glyph:hover{cursor:pointer}.monaco-diff-editor .char-insert,.monaco-editor .char-insert{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-diff-editor .line-insert,.monaco-editor .line-insert{background-color:var(--vscode-diffEditor-insertedLineBackground,var(--vscode-diffEditor-insertedTextBackground))}.monaco-editor .char-insert,.monaco-editor .line-insert{border:1px solid var(--vscode-diffEditor-insertedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-insert,.monaco-editor.hc-black .line-insert,.monaco-editor.hc-light .char-insert,.monaco-editor.hc-light .line-insert{border-style:dashed}.monaco-editor .char-delete,.monaco-editor .line-delete{border:1px solid var(--vscode-diffEditor-removedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-delete,.monaco-editor.hc-black .line-delete,.monaco-editor.hc-light .char-delete,.monaco-editor.hc-light .line-delete{border-style:dashed}.monaco-diff-editor .gutter-insert,.monaco-editor .gutter-insert,.monaco-editor .inline-added-margin-view-zone{background-color:var(--vscode-diffEditorGutter-insertedLineBackground,var(--vscode-diffEditor-insertedLineBackground),var(--vscode-diffEditor-insertedTextBackground))}.monaco-diff-editor .char-delete,.monaco-editor .char-delete,.monaco-editor .inline-deleted-text{background-color:var(--vscode-diffEditor-removedTextBackground)}.monaco-editor .inline-deleted-text{text-decoration:line-through}.monaco-diff-editor .line-delete,.monaco-editor .line-delete{background-color:var(--vscode-diffEditor-removedLineBackground,var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor .gutter-delete,.monaco-editor .gutter-delete,.monaco-editor .inline-deleted-margin-view-zone{background-color:var(--vscode-diffEditorGutter-removedLineBackground,var(--vscode-diffEditor-removedLineBackground),var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor.side-by-side .editor.modified{border-left:1px solid var(--vscode-diffEditor-border);box-shadow:-6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor.side-by-side .editor.original{border-right:1px solid var(--vscode-diffEditor-border);box-shadow:6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor .diffViewport{background:var(--vscode-scrollbarSlider-background)}.monaco-diff-editor .diffViewport:hover{background:var(--vscode-scrollbarSlider-hoverBackground)}.monaco-diff-editor .diffViewport:active{background:var(--vscode-scrollbarSlider-activeBackground)}.monaco-editor .diagonal-fill{background-image:linear-gradient(-45deg,var(--vscode-diffEditor-diagonalFill) 12.5%,#0000 12.5%,#0000 50%,var(--vscode-diffEditor-diagonalFill) 50%,var(--vscode-diffEditor-diagonalFill) 62.5%,#0000 62.5%,#0000 100%);background-size:8px 8px}.monaco-diff-editor .gutter{flex-grow:0;flex-shrink:0;overflow:hidden;position:relative;&>div{position:absolute}.gutterItem{opacity:0;transition:opacity .7s;&.showAlways{opacity:1}&.noTransition,&.showAlways{transition:none}}&:hover .gutterItem{opacity:1;transition:opacity .1s ease-in-out}.gutterItem{.background{border-left:2px solid var(--vscode-menu-border);height:100%;left:50%;position:absolute;width:1px}.buttons{align-items:center;display:flex;justify-content:center;position:absolute;width:100%;.monaco-toolbar{height:fit-content;.monaco-action-bar{line-height:1;.actions-container{background:var(--vscode-editorGutter-commentRangeForeground);border-radius:4px;width:fit-content;.action-item{&:hover{background:var(--vscode-toolbar-hoverBackground)}.action-label{padding:1px 2px}}}}}}}}.monaco-diff-editor .diff-hidden-lines-compact{display:flex;height:11px;.line-left,.line-right{border-top:1px solid;border-color:var(--vscode-editorCodeLens-foreground);height:1px;margin:auto;opacity:.5;width:100%}.line-left{width:20px}.text{text-wrap:nowrap;color:var(--vscode-editorCodeLens-foreground);font-size:11px;line-height:11px;margin:0 4px}}";
 n(css,{});
 export { css, css as default };

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

@@ -1,11 +1,10 @@
 import { findLast } from '../../../../base/common/arraysFind.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { isHotReloadEnabled, registerHotReloadHandler } from '../../../../base/common/hotReload.js';
 import { toDisposable, Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
 import '../../../../base/common/observableInternal/derived.js';
 import { autorunOpts, autorun, autorunWithStore, autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
-import { observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/arrays.js';
 import { ElementSizeObserver } from '../../config/elementSizeObserver.js';
 import { Position } from '../../../common/core/position.js';
@@ -207,24 +206,6 @@ function applyStyle(domNode, style) {
         }
     });
 }
-function readHotReloadableExport(value, reader) {
-    observeHotReloadableExports([value], reader);
-    return value;
-}
-function observeHotReloadableExports(values, reader) {
-    if (isHotReloadEnabled()) {
-        const o = observableSignalFromEvent('reload', event => registerHotReloadHandler(({ oldExports }) => {
-            if (!( [...( Object.values(oldExports))].some(v => values.includes(v)))) {
-                return undefined;
-            }
-            return (_newExports) => {
-                event(undefined);
-                return true;
-            };
-        }));
-        o.read(reader);
-    }
-}
 function applyViewZones(editor, viewZones, setIsUpdating, zoneIds) {
     const store = ( new DisposableStore());
     const lastViewZoneIds = [];
@@ -345,4 +326,82 @@ function filterWithPrevious(arr, filter) {
         return result;
     });
 }
-export { DisposableCancellationTokenSource, ManagedOverlayWidget, ObservableElementSizeObserver, PlaceholderViewZone, ViewZoneOverlayWidget, animatedObservable, appendRemoveOnDispose, applyObservableDecorations, applyStyle, applyViewZones, filterWithPrevious, joinCombine, observeHotReloadableExports, prependRemoveOnDispose, readHotReloadableExport, translatePosition };
+class RefCounted {
+    static create(value, debugOwner = undefined) {
+        return ( new BaseRefCounted(value, value, debugOwner));
+    }
+    static createWithDisposable(value, disposable, debugOwner = undefined) {
+        const store = ( new DisposableStore());
+        store.add(disposable);
+        store.add(value);
+        return ( new BaseRefCounted(value, store, debugOwner));
+    }
+    static createOfNonDisposable(value, disposable, debugOwner = undefined) {
+        return ( new BaseRefCounted(value, disposable, debugOwner));
+    }
+}
+class BaseRefCounted extends RefCounted {
+    constructor(object, _disposable, _debugOwner) {
+        super();
+        this.object = object;
+        this._disposable = _disposable;
+        this._debugOwner = _debugOwner;
+        this._refCount = 1;
+        this._isDisposed = false;
+        this._owners = [];
+        if (_debugOwner) {
+            this._addOwner(_debugOwner);
+        }
+    }
+    _addOwner(debugOwner) {
+        if (debugOwner) {
+            this._owners.push(debugOwner);
+        }
+    }
+    createNewRef(debugOwner) {
+        this._refCount++;
+        if (debugOwner) {
+            this._addOwner(debugOwner);
+        }
+        return ( new ClonedRefCounted(this, debugOwner));
+    }
+    dispose() {
+        if (this._isDisposed) {
+            return;
+        }
+        this._isDisposed = true;
+        this._decreaseRefCount(this._debugOwner);
+    }
+    _decreaseRefCount(debugOwner) {
+        this._refCount--;
+        if (this._refCount === 0) {
+            this._disposable.dispose();
+        }
+        if (debugOwner) {
+            const idx = this._owners.indexOf(debugOwner);
+            if (idx !== -1) {
+                this._owners.splice(idx, 1);
+            }
+        }
+    }
+}
+class ClonedRefCounted extends RefCounted {
+    constructor(_base, _debugOwner) {
+        super();
+        this._base = _base;
+        this._debugOwner = _debugOwner;
+        this._isDisposed = false;
+    }
+    get object() { return this._base.object; }
+    createNewRef(debugOwner) {
+        return this._base.createNewRef(debugOwner);
+    }
+    dispose() {
+        if (this._isDisposed) {
+            return;
+        }
+        this._isDisposed = true;
+        this._base._decreaseRefCount(this._debugOwner);
+    }
+}
+export { DisposableCancellationTokenSource, ManagedOverlayWidget, ObservableElementSizeObserver, PlaceholderViewZone, RefCounted, ViewZoneOverlayWidget, animatedObservable, appendRemoveOnDispose, applyObservableDecorations, applyStyle, applyViewZones, filterWithPrevious, joinCombine, prependRemoveOnDispose, translatePosition };

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -10,7 +10,6 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-const _moduleId = "vs/editor/browser/widget/multiDiffEditor/colors";
-registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localizeWithPath(_moduleId, 0, 'The background color of the diff editor\'s header')));
-registerColor('multiDiffEditor.background', 'editorBackground', ( localizeWithPath(_moduleId, 1, 'The background color of the multi file diff editor')));
-registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localizeWithPath(_moduleId, 2, 'The border color of the multi file diff editor')));
+registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localize(9833, 'The background color of the diff editor\'s header')));
+registerColor('multiDiffEditor.background', 'editorBackground', ( localize(9834, 'The background color of the multi file diff editor')));
+registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localize(9835, 'The border color of the multi file diff editor')));

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.js

@@ -6,15 +6,16 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
 import { observableValue, globalTransaction } from '../../../../base/common/observableInternal/base.js';
 import { 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 { observableCodeEditor } from '../../observableCodeEditor.js';
 import { DiffEditorWidget } from '../diffEditor/diffEditorWidget.js';
+import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ActionRunnerWithContext } from './utils.js';
-import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 class TemplateData {
     constructor(viewModel, deltaScrollVertical) {
         this.viewModel = viewModel;
@@ -71,8 +72,8 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         this.editor = this._register(this._instantiationService.createInstance(DiffEditorWidget, this._elements.editor, {
             overflowWidgetsDomNode: this._overflowWidgetsDomNode,
         }, {}));
-        this.isModifedFocused = isFocused(this.editor.getModifiedEditor());
-        this.isOriginalFocused = isFocused(this.editor.getOriginalEditor());
+        this.isModifedFocused = observableCodeEditor(this.editor.getModifiedEditor()).isFocused;
+        this.isOriginalFocused = observableCodeEditor(this.editor.getOriginalEditor()).isFocused;
         this.isFocused = derived(this, reader => this.isModifedFocused.read(reader) || this.isOriginalFocused.read(reader));
         this._resourceLabel = this._workbenchUIElementFactory.createResourceLabel
             ? this._register(this._workbenchUIElementFactory.createResourceLabel(this._elements.primaryPath))
@@ -163,12 +164,15 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
                 overviewRulerBorder: false,
             };
         }
-        const value = data.viewModel.entry.value;
-        if (value.onOptionsDidChange) {
-            this._dataStore.add(value.onOptionsDidChange(() => {
-                this.editor.updateOptions(updateOptions(value.options ?? {}));
-            }));
+        if (!data) {
+            globalTransaction(tx => {
+                this._viewModel.set(undefined, tx);
+                this.editor.setDiffModel(null, tx);
+                this._dataStore.clear();
+            });
+            return;
         }
+        const value = data.viewModel.documentDiffItem;
         globalTransaction(tx => {
             this._resourceLabel?.setUri(data.viewModel.modifiedUri ?? data.viewModel.originalUri, { strikethrough: data.viewModel.modifiedUri === undefined });
             let isRenamed = false;
@@ -194,9 +198,19 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
             this._resourceLabel2?.setUri(isRenamed ? data.viewModel.originalUri : undefined, { strikethrough: true });
             this._dataStore.clear();
             this._viewModel.set(data.viewModel, tx);
-            this.editor.setModel(data.viewModel.diffEditorViewModel, tx);
+            this.editor.setDiffModel(data.viewModel.diffEditorViewModelRef, tx);
             this.editor.updateOptions(updateOptions(value.options ?? {}));
         });
+        if (value.onOptionsDidChange) {
+            this._dataStore.add(value.onOptionsDidChange(() => {
+                this.editor.updateOptions(updateOptions(value.options ?? {}));
+            }));
+        }
+        data.viewModel.isAlive.recomputeInitiallyAndOnChange(this._dataStore, value => {
+            if (!value) {
+                this.setData(undefined);
+            }
+        });
     }
     render(verticalRange, width, editorScroll, viewPort) {
         this._elements.root.style.visibility = 'visible';
@@ -232,12 +246,4 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
 DiffEditorItemTemplate = ( __decorate([
     ( __param(3, IInstantiationService))
 ], DiffEditorItemTemplate));
-function isFocused(editor) {
-    return observableFromEvent(h => {
-        const store = ( new DisposableStore());
-        store.add(editor.onDidFocusEditorWidget(() => h(true)));
-        store.add(editor.onDidBlurEditorWidget(() => h(false)));
-        return store;
-    }, () => editor.hasTextFocus());
-}
 export { DiffEditorItemTemplate, TemplateData };

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { transaction, observableValue } from '../../../../base/common/observableInternal/base.js';
 import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
@@ -8,6 +8,7 @@ import '../../../../base/common/cancellation.js';
 import '../../../../base/common/arrays.js';
 import { DiffEditorOptions } from '../diffEditor/diffEditorOptions.js';
 import { DiffEditorViewModel } from '../diffEditor/diffEditorViewModel.js';
+import { RefCounted } from '../diffEditor/utils.js';
 import { IModelService } from '../../../common/services/model.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 class MultiDiffEditorViewModel extends Disposable {
@@ -45,14 +46,19 @@ class MultiDiffEditorViewModel extends Disposable {
     }
 }
 let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposable {
-    get originalUri() { return this.entry.value.original?.uri; }
-    get modifiedUri() { return this.entry.value.modified?.uri; }
+    get diffEditorViewModel() {
+        return this.diffEditorViewModelRef.object;
+    }
+    get originalUri() { return this.documentDiffItem.original?.uri; }
+    get modifiedUri() { return this.documentDiffItem.modified?.uri; }
     setIsFocused(source, tx) {
         this._isFocusedSource.set(source, tx);
     }
-    constructor(entry, _editorViewModel, _instantiationService, _modelService) {
+    get documentDiffItem() {
+        return this.documentDiffItemRef.object;
+    }
+    constructor(documentDiffItem, _editorViewModel, _instantiationService, _modelService) {
         super();
-        this.entry = entry;
         this._editorViewModel = _editorViewModel;
         this._instantiationService = _instantiationService;
         this._modelService = _modelService;
@@ -61,6 +67,11 @@ let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposab
         this.isActive = derived(this, reader => this._editorViewModel.activeDiffItem.read(reader) === this);
         this._isFocusedSource = observableValue(this, constObservable(false));
         this.isFocused = derived(this, reader => this._isFocusedSource.read(reader).read(reader));
+        this.isAlive = observableValue(this, true);
+        this._register(toDisposable(() => {
+            this.isAlive.set(false, undefined);
+        }));
+        this.documentDiffItemRef = this._register(documentDiffItem.createNewRef(this));
         function updateOptions(options) {
             return {
                 ...options,
@@ -69,18 +80,20 @@ let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposab
                 },
             };
         }
-        const options = this._instantiationService.createInstance(DiffEditorOptions, updateOptions(this.entry.value.options || {}));
-        if (this.entry.value.onOptionsDidChange) {
-            this._register(this.entry.value.onOptionsDidChange(() => {
-                options.updateOptions(updateOptions(this.entry.value.options || {}));
+        const options = this._instantiationService.createInstance(DiffEditorOptions, updateOptions(this.documentDiffItem.options || {}));
+        if (this.documentDiffItem.onOptionsDidChange) {
+            this._register(this.documentDiffItem.onOptionsDidChange(() => {
+                options.updateOptions(updateOptions(this.documentDiffItem.options || {}));
             }));
         }
-        const originalTextModel = this.entry.value.original ?? this._register(this._modelService.createModel('', null));
-        const modifiedTextModel = this.entry.value.modified ?? this._register(this._modelService.createModel('', null));
-        this.diffEditorViewModel = this._register(this._instantiationService.createInstance(DiffEditorViewModel, {
+        const diffEditorViewModelStore = ( new DisposableStore());
+        const originalTextModel = this.documentDiffItem.original ?? diffEditorViewModelStore.add(this._modelService.createModel('', null));
+        const modifiedTextModel = this.documentDiffItem.modified ?? diffEditorViewModelStore.add(this._modelService.createModel('', null));
+        diffEditorViewModelStore.add(this.documentDiffItemRef.createNewRef(this));
+        this.diffEditorViewModelRef = this._register(RefCounted.createWithDisposable(this._instantiationService.createInstance(DiffEditorViewModel, {
             original: originalTextModel,
             modified: modifiedTextModel,
-        }, options));
+        }, options), diffEditorViewModelStore, this));
     }
     getKey() {
         return JSON.stringify([

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.js

@@ -6,7 +6,7 @@ import '../../../../base/common/observableInternal/autorun.js';
 import { recomputeInitiallyAndOnChange } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import '../../../../base/common/arrays.js';
-import { readHotReloadableExport } from '../diffEditor/utils.js';
+import { readHotReloadableExport } from '../../../../base/common/hotReloadHelpers.js';
 import { MultiDiffEditorWidgetImpl } from './multiDiffEditorWidgetImpl.js';
 import { MultiDiffEditorViewModel } from './multiDiffEditorViewModel.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -53,6 +53,9 @@ let MultiDiffEditorWidget = class MultiDiffEditorWidget extends Disposable {
     tryGetCodeEditor(resource) {
         return this._widgetImpl.get().tryGetCodeEditor(resource);
     }
+    findDocumentDiffItem(resource) {
+        return this._widgetImpl.get().findDocumentDiffItem(resource);
+    }
 };
 MultiDiffEditorWidget = ( __decorate([
     ( __param(2, IInstantiationService))

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js

@@ -21,8 +21,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { DiffEditorItemTemplate, TemplateData } from './diffEditorItemTemplate.js';
 import { ObjectPool } from './objectPool.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl";
+import { localize } from '../../../../nls.js';
 let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposable {
     constructor(_element, _dimension, _viewModel, _workbenchUIElementFactory, _parentContextKeyService, _parentInstantiationService) {
         super();
@@ -52,7 +51,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         }, this._scrollable))));
         this._elements = h('div.monaco-component.multiDiffEditor', {}, [
             h('div', {}, [this._scrollableElement.getDomNode()]),
-            h('div.placeholder@placeholder', {}, [h('div', [( localizeWithPath(_moduleId, 0, 'No Changed Files'))])]),
+            h('div.placeholder@placeholder', {}, [h('div', [( localize(9832, 'No Changed Files'))])]),
         ]);
         this._sizeObserver = this._register(( (new ObservableElementSizeObserver(this._element, undefined))));
         this._objectPool = this._register(( (new ObjectPool((data) => {
@@ -206,6 +205,11 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
             }
         });
     }
+    findDocumentDiffItem(resource) {
+        const item = this._viewItems.get().find(v => ( (v.viewModel.diffEditorViewModel.model.modified.uri.toString())) === ( (resource.toString()))
+            || ( (v.viewModel.diffEditorViewModel.model.original.uri.toString())) === ( (resource.toString())));
+        return item?.viewModel.documentDiffItem;
+    }
     tryGetCodeEditor(resource) {
         const item = this._viewItems.get().find(v => ( (v.viewModel.diffEditorViewModel.model.modified.uri.toString())) === ( (resource.toString()))
             || ( (v.viewModel.diffEditorViewModel.model.original.uri.toString())) === ( (resource.toString())));
@@ -304,7 +308,7 @@ class VirtualizedViewItem extends Disposable {
         super.dispose();
     }
     toString() {
-        return `VirtualViewItem(${this.viewModel.entry.value.modified?.uri.toString()})`;
+        return `VirtualViewItem(${this.viewModel.documentDiffItem.modified?.uri.toString()})`;
     }
     getKey() {
         return this.viewModel.getKey();

package/vscode/src/vs/editor/common/config/diffEditor.js

@@ -17,6 +17,7 @@ const diffEditorDefaultOptions = {
     experimental: {
         showMoves: false,
         showEmptyDecorations: true,
+        useTrueInlineView: false,
     },
     hideUnchangedRegions: {
         enabled: false,
@@ -28,5 +29,6 @@ const diffEditorDefaultOptions = {
     onlyShowAccessibleDiffViewer: false,
     renderSideBySideInlineBreakpoint: 900,
     useInlineViewWhenSpaceIsLimited: true,
+    compactMode: false,
 };
 export { diffEditorDefaultOptions };