@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -2,7 +2,7 @@ import { h } from '../../../../../base/browser/dom.js';
 import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
 import { Action } from '../../../../../base/common/actions.js';
 import { tieBreakComparators, compareBy, numberComparator, booleanComparator } from '../../../../../base/common/arrays.js';
-import { findMaxIdxBy } from '../../../../../base/common/arraysFind.js';
+import { findMaxIdx } from '../../../../../base/common/arraysFind.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../base/common/observableInternal/base.js';
@@ -14,6 +14,7 @@ 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";
 class MovedBlocksLinesFeature extends Disposable {
     static { this.movedCodeBlockPadding = 4; }
     constructor(_rootElement, _diffModel, _originalEditorLayoutInfo, _modifiedEditorLayoutInfo, _editors) {
@@ -46,7 +47,7 @@ class MovedBlocksLinesFeature extends Disposable {
             }
             this._modifiedViewZonesChangedSignal.read(reader);
             this._originalViewZonesChangedSignal.read(reader);
-            const lines = ( moves.map((move) => {
+            const lines = ( (moves.map((move) => {
                 function computeLineStart(range, editor) {
                     const t1 = editor.getTopForLineNumber(range.startLineNumber, true);
                     const t2 = editor.getTopForLineNumber(range.endLineNumberExclusive, true);
@@ -60,10 +61,10 @@ class MovedBlocksLinesFeature extends Disposable {
                 const to = end - endOffset;
                 const top = Math.min(start, end);
                 const bottom = Math.max(start, end);
-                return { range: ( new OffsetRange(top, bottom)), from, to, fromWithoutScroll: start, toWithoutScroll: end, move };
-            }));
+                return { range: ( (new OffsetRange(top, bottom))), from, to, fromWithoutScroll: start, toWithoutScroll: end, move };
+            })));
             lines.sort(tieBreakComparators(compareBy(l => l.fromWithoutScroll > l.toWithoutScroll, booleanComparator), compareBy(l => l.fromWithoutScroll > l.toWithoutScroll ? l.fromWithoutScroll : -l.toWithoutScroll, numberComparator)));
-            const layout = LinesLayout.compute(( lines.map(l => l.range)));
+            const layout = LinesLayout.compute(( (lines.map(l => l.range))));
             const padding = 10;
             const lineAreaLeft = infoOrig.verticalScrollbarWidth;
             const lineAreaWidth = (layout.getTrackCount() - 1) * 10 + padding * 2;
@@ -123,31 +124,37 @@ class MovedBlocksLinesFeature extends Disposable {
             if (!d) {
                 return [];
             }
-            return ( d.movedTexts.map(move => ({
-                move,
-                original: ( new PlaceholderViewZone(constObservable(move.lineRangeMapping.original.startLineNumber - 1), 18)),
-                modified: ( new PlaceholderViewZone(constObservable(move.lineRangeMapping.modified.startLineNumber - 1), 18)),
-            })));
+            return (
+                 (d.movedTexts.map(move => ({
+                    move,
+                    original: ( (new PlaceholderViewZone(constObservable(move.lineRangeMapping.original.startLineNumber - 1), 18))),
+                    modified: ( (new PlaceholderViewZone(constObservable(move.lineRangeMapping.modified.startLineNumber - 1), 18))),
+                })))
+            );
         });
-        this._register(applyViewZones(this._editors.original, ( movedBlockViewZones.map(zones => (  zones.map(z => z.original))))));
-        this._register(applyViewZones(this._editors.modified, ( movedBlockViewZones.map(zones => (  zones.map(z => z.modified))))));
+        this._register(applyViewZones(this._editors.original, ( (movedBlockViewZones.map(
+            zones => (  (zones.map(z => z.original)))
+        )))));
+        this._register(applyViewZones(this._editors.modified, ( (movedBlockViewZones.map(
+            zones => (  (zones.map(z => z.modified)))
+        )))));
         this._register(autorunWithStore((reader, store) => {
             const blocks = movedBlockViewZones.read(reader);
             for (const b of blocks) {
-                store.add(( new MovedBlockOverlayWidget(
+                store.add(( (new MovedBlockOverlayWidget(
                     this._editors.original,
                     b.original,
                     b.move,
                     'original',
                     this._diffModel.get()
-                )));
-                store.add(( new MovedBlockOverlayWidget(
+                ))));
+                store.add(( (new MovedBlockOverlayWidget(
                     this._editors.modified,
                     b.modified,
                     b.move,
                     'modified',
                     this._diffModel.get()
-                )));
+                ))));
             }
         }));
         const originalHasFocus = observableSignalFromEvent('original.onDidFocusEditorWidget', e => this._editors.original.onDidFocusEditorWidget(() => setTimeout(() => e(undefined), 0)));
@@ -201,17 +208,19 @@ class LinesLayout {
             if (trackIdx === -1) {
                 const maxTrackCount = 6;
                 if (setsPerTrack.length >= maxTrackCount) {
-                    trackIdx = findMaxIdxBy(setsPerTrack, compareBy(set => set.intersectWithRangeLength(line), numberComparator));
+                    trackIdx = findMaxIdx(setsPerTrack, compareBy(set => set.intersectWithRangeLength(line), numberComparator));
                 }
                 else {
                     trackIdx = setsPerTrack.length;
-                    setsPerTrack.push(( new OffsetRangeSet()));
+                    setsPerTrack.push(( (new OffsetRangeSet())));
                 }
             }
             setsPerTrack[trackIdx].addRange(line);
             trackPerLineIdx.push(trackIdx);
         }
-        return ( new LinesLayout(setsPerTrack.length, trackPerLineIdx));
+        return (
+             (new LinesLayout(setsPerTrack.length, trackPerLineIdx))
+        );
     }
     constructor(_trackCount, trackPerLineIdx) {
         this._trackCount = _trackCount;
@@ -239,19 +248,19 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         root.root.appendChild(this._nodes.root);
         const editorLayout = observableFromEvent(this._editor.onDidLayoutChange, () => this._editor.getLayoutInfo());
         this._register(applyStyle(this._nodes.root, {
-            paddingRight: ( editorLayout.map(l => l.verticalScrollbarWidth))
+            paddingRight: ( (editorLayout.map(l => l.verticalScrollbarWidth)))
         }));
         let text;
         if (_move.changes.length > 0) {
             text = this._kind === 'original' ? ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
-                'codeMovedToWithChanges',
+                _moduleId,
+                0,
                 'Code moved with changes to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
-                'codeMovedFromWithChanges',
+                _moduleId,
+                1,
                 'Code moved with changes from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1
@@ -259,25 +268,25 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         }
         else {
             text = this._kind === 'original' ? ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
-                'codeMovedTo',
+                _moduleId,
+                2,
                 'Code moved to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
-                'codeMovedFrom',
+                _moduleId,
+                3,
                 'Code moved from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1
             ));
         }
-        const actionBar = this._register(( new ActionBar(this._nodes.actionBar, {
+        const actionBar = this._register(( (new ActionBar(this._nodes.actionBar, {
             highlightToggledItems: true,
-        })));
-        const caption = ( new Action('', text, '', false));
+        }))));
+        const caption = ( (new Action('', text, '', false)));
         actionBar.push(caption, { icon: false, label: true });
-        const actionCompare = ( new Action(
+        const actionCompare = ( (new Action(
             '',
             'Compare',
             ThemeIcon.asClassName(Codicon.compareChanges),
@@ -286,7 +295,7 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
                 this._editor.focus();
                 this._diffModel.movedTextToCompare.set(this._diffModel.movedTextToCompare.get() === _move ? undefined : this._move, undefined);
             }
-        ));
+        )));
         this._register(autorun(reader => {
             const isActive = this._diffModel.movedTextToCompare.read(reader) === _move;
             actionCompare.checked = isActive;

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

@@ -3,6 +3,7 @@ import { h, addStandardDisposableListener, addDisposableListener, EventType } fr
 import { createFastDomNode } from '../../../../../base/browser/fastDomNode.js';
 import { ScrollbarState } from '../../../../../base/browser/ui/scrollbar/scrollbarState.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/arrays.js';
 import { derived } from '../../../../../base/common/observableInternal/derived.js';
 import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observableInternal/utils.js';

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

@@ -2,6 +2,7 @@ import { h, addDisposableListener, EventType } from '../../../../../base/browser
 import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/arrays.js';
 import { derived } from '../../../../../base/common/observableInternal/derived.js';
 import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/utils.js';
@@ -11,6 +12,7 @@ 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";
 const emptyArr = [];
 class RevertButtonsFeature extends Disposable {
     constructor(_editors, _diffModel, _options, _widget) {
@@ -29,12 +31,12 @@ class RevertButtonsFeature extends Disposable {
             if (selections.every(s => s.isEmpty())) {
                 return emptyArr;
             }
-            const selectedLineNumbers = ( new LineRangeSet(( selections.map(s => LineRange.fromRangeInclusive(s)))));
+            const selectedLineNumbers = ( (new LineRangeSet( (selections.map(s => LineRange.fromRangeInclusive(s))))));
             const selectedMappings = diff.mappings.filter(m => m.lineRangeMapping.innerChanges && selectedLineNumbers.intersects(m.lineRangeMapping.modified));
-            const result = ( selectedMappings.map(mapping => ({
+            const result = ( (selectedMappings.map(mapping => ({
                 mapping,
-                rangeMappings: mapping.lineRangeMapping.innerChanges.filter(c => ( selections.some(s => Range.areIntersecting(c.modifiedRange, s))))
-            })));
+                rangeMappings: mapping.lineRangeMapping.innerChanges.filter(c => ( (selections.some(s => Range.areIntersecting(c.modifiedRange, s)))))
+            }))));
             if (result.length === 0 || result.every(r => r.rangeMappings.length === 0)) {
                 return emptyArr;
             }
@@ -54,29 +56,29 @@ class RevertButtonsFeature extends Disposable {
             }
             const glyphWidgetsModified = [];
             const selectedDiffs = this._selectedDiffs.read(reader);
-            const selectedDiffsSet = ( new Set(( selectedDiffs.map(d => d.mapping))));
+            const selectedDiffsSet = ( (new Set( (selectedDiffs.map(d => d.mapping)))));
             if (selectedDiffs.length > 0) {
                 const selections = this._editors.modifiedSelections.read(reader);
-                const btn = store.add(( new RevertButton(
+                const btn = store.add(( (new RevertButton(
                     selections[selections.length - 1].positionLineNumber,
                     this._widget,
                     selectedDiffs.flatMap(d => d.rangeMappings),
                     true
-                )));
+                ))));
                 this._editors.modified.addGlyphMarginWidget(btn);
                 glyphWidgetsModified.push(btn);
             }
             for (const m of diff.mappings) {
-                if (( selectedDiffsSet.has(m))) {
+                if (( (selectedDiffsSet.has(m)))) {
                     continue;
                 }
                 if (!m.lineRangeMapping.modified.isEmpty && m.lineRangeMapping.innerChanges) {
-                    const btn = store.add(( new RevertButton(
+                    const btn = store.add(( (new RevertButton(
                         m.lineRangeMapping.modified.startLineNumber,
                         this._widget,
                         m.lineRangeMapping,
                         false
-                    )));
+                    ))));
                     this._editors.modified.addGlyphMarginWidget(btn);
                     glyphWidgetsModified.push(btn);
                 }
@@ -101,16 +103,8 @@ class RevertButton extends Disposable {
         this._id = `revertButton${RevertButton.counter++}`;
         this._domNode = h('div.revertButton', {
             title: this._revertSelection
-                ? ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature',
-                'revertSelectedChanges',
-                'Revert Selected Changes'
-            ))
-                : ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature',
-                'revertChange',
-                'Revert Change'
-            ))
+                ? ( localizeWithPath(_moduleId, 0, 'Revert Selected Changes'))
+                : ( localizeWithPath(_moduleId, 1, '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

@@ -14,31 +14,20 @@ 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', { dark: '#8b8b8b9c', light: '#8b8b8b9c', hcDark: '#8b8b8b9c', hcLight: '#8b8b8b9c', }, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffEditor.move.border',
+    _moduleId,
+    0,
     'The border color for text that got moved in the diff editor.'
 )));
 registerColor('diffEditor.moveActive.border', { dark: '#FFA500', light: '#FFA500', hcDark: '#FFA500', hcLight: '#FFA500', }, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffEditor.moveActive.border',
+    _moduleId,
+    1,
     '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(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffEditor.unchangedRegionShadow',
-    'The color of the shadow around unchanged region widgets.'
-)));
-const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffInsertIcon',
-    'Line decoration for inserts in the diff editor.'
-)));
-const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffRemoveIcon',
-    'Line decoration for removals 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.')));
 const diffLineAddDecorationBackgroundWithIndicator = ModelDecorationOptions.register({
     className: 'line-insert',
     description: 'line-insert',

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

@@ -5,6 +5,7 @@ import '../../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent, observableSignalFromEvent, observableSignal } from '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/arrays.js';
 import { LineRange } from '../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../common/core/offsetRange.js';
 class EditorGutter extends Disposable {

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

@@ -6,6 +6,7 @@ import { observableValue, transaction } from '../../../../base/common/observable
 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/arrays.js';
 import { ElementSizeObserver } from '../../config/elementSizeObserver.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';

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

@@ -10,18 +10,7 @@ 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';
-registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localizeWithPath(
- 'vs/editor/browser/widget/multiDiffEditor/colors',
- 'multiDiffEditor.headerBackground',
- 'The background color of the diff editor\'s header'
-)));
-registerColor('multiDiffEditor.background', { dark: 'editorBackground', light: 'editorBackground', hcDark: 'editorBackground', hcLight: 'editorBackground', }, ( localizeWithPath(
- 'vs/editor/browser/widget/multiDiffEditor/colors',
- 'multiDiffEditor.background',
- 'The background color of the multi file diff editor'
-)));
-registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localizeWithPath(
- 'vs/editor/browser/widget/multiDiffEditor/colors',
- 'multiDiffEditor.border',
- 'The border color of the multi file diff editor'
-)));
+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', { dark: 'editorBackground', light: 'editorBackground', hcDark: 'editorBackground', hcLight: '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')));

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

@@ -8,6 +8,7 @@ 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/cancellation.js';
+import '../../../../base/common/arrays.js';
 import { DiffEditorWidget } from '../diffEditor/diffEditorWidget.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
@@ -120,8 +121,8 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
             this._data.deltaScrollVertical(delta);
         }));
         this._register(autorun(reader => {
-            const isFocused = this.isFocused.read(reader);
-            this._elements.root.classList.toggle('focused', isFocused);
+            const isActive = this._viewModel.read(reader)?.isActive.read(reader);
+            this._elements.root.classList.toggle('active', isActive);
         }));
         this._container.appendChild(this._elements.root);
         this._outerEditorHeight = this._headerHeight;

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

@@ -1,10 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { transaction, observableValue } from '../../../../base/common/observableInternal/base.js';
-import '../../../../base/common/observableInternal/derived.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent, mapObservableArrayCached } from '../../../../base/common/observableInternal/utils.js';
+import { observableFromValueWithChangeEvent, mapObservableArrayCached, derivedObservableWithWritableCache, constObservable } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/arrays.js';
 import { DiffEditorOptions } from '../diffEditor/diffEditorOptions.js';
 import { DiffEditorViewModel } from '../diffEditor/diffEditorViewModel.js';
 import { IModelService } from '../../../common/services/model.js';
@@ -36,22 +37,30 @@ class MultiDiffEditorViewModel extends Disposable {
         super();
         this.model = model;
         this._instantiationService = _instantiationService;
-        this._documents = observableFromEvent(this.model.onDidChange,  () => this.model.documents);
-        this.items = mapObservableArrayCached(this, this._documents, (d, store) => store.add(this._instantiationService.createInstance(DocumentDiffItemViewModel, d)))
+        this._documents = observableFromValueWithChangeEvent(this.model, this.model.documents);
+        this.items = mapObservableArrayCached(this, this._documents, (d, store) => store.add(this._instantiationService.createInstance(DocumentDiffItemViewModel, d, this)))
             .recomputeInitiallyAndOnChange(this._store);
-        this.activeDiffItem = observableValue(this, undefined);
+        this.focusedDiffItem = derived(this, reader => this.items.read(reader).find(i => i.isFocused.read(reader)));
+        this.activeDiffItem = derivedObservableWithWritableCache(this, (reader, lastValue) => this.focusedDiffItem.read(reader) ?? lastValue);
     }
 }
 let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposable {
     get originalUri() { return this.entry.value.original?.uri; }
     get modifiedUri() { return this.entry.value.modified?.uri; }
-    constructor(entry, _instantiationService, _modelService) {
+    setIsFocused(source, tx) {
+        this._isFocusedSource.set(source, tx);
+    }
+    constructor(entry, _editorViewModel, _instantiationService, _modelService) {
         super();
         this.entry = entry;
+        this._editorViewModel = _editorViewModel;
         this._instantiationService = _instantiationService;
         this._modelService = _modelService;
         this.collapsed = observableValue(this, false);
         this.lastTemplateData = observableValue(this, { contentHeight: 500, selections: undefined, });
+        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));
         function updateOptions(options) {
             return {
                 ...options,
@@ -81,7 +90,7 @@ let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposab
     }
 };
 DocumentDiffItemViewModel = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IModelService))
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IModelService))
 ], DocumentDiffItemViewModel));
 export { DocumentDiffItemViewModel, MultiDiffEditorViewModel };

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

@@ -5,6 +5,7 @@ import { derivedWithStore, derived } from '../../../../base/common/observableInt
 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 { MultiDiffEditorWidgetImpl } from './multiDiffEditorWidgetImpl.js';
 import { MultiDiffEditorViewModel } from './multiDiffEditorViewModel.js';

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

@@ -1,12 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { h, scheduleAtNextAnimationFrame, getWindow } from '../../../../base/browser/dom.js';
 import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
-import { findFirstMaxBy } from '../../../../base/common/arraysFind.js';
+import { compareBy, numberComparator } from '../../../../base/common/arrays.js';
+import { findFirstMax } from '../../../../base/common/arraysFind.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { transaction, globalTransaction, disposableObservableValue, observableValue } from '../../../../base/common/observableInternal/base.js';
+import { globalTransaction, transaction, disposableObservableValue, observableValue } from '../../../../base/common/observableInternal/base.js';
 import { derivedWithStore, derived } from '../../../../base/common/observableInternal/derived.js';
 import { autorunWithStore, autorun } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent, derivedObservableWithCache } from '../../../../base/common/observableInternal/utils.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import { Scrollable } from '../../../../base/common/scrollable.js';
 import './style.css.js';
@@ -19,7 +21,6 @@ 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 { BugIndicatingError } from '../../../../base/common/errors.js';
 let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposable {
     constructor(_element, _dimension, _viewModel, _workbenchUIElementFactory, _parentContextKeyService, _parentInstantiationService) {
         super();
@@ -55,13 +56,14 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         }, this._scrollable)));
         this.scrollTop = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollTop);
         this.scrollLeft = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollLeft);
-        this._viewItems = derivedWithStore(this, (reader, store) => {
+        this._viewItemsInfo = derivedWithStore(this, (reader, store) => {
             const vm = this._viewModel.read(reader);
             if (!vm) {
-                return [];
+                return { items: [], getItem: _d => { throw ( new BugIndicatingError()); } };
             }
-            const items = vm.items.read(reader);
-            return ( items.map(d => {
+            const viewModels = vm.items.read(reader);
+            const map = ( new Map());
+            const items = ( viewModels.map(d => {
                 const item = store.add(( new VirtualizedViewItem(d, this._objectPool, this.scrollLeft, delta => {
                     this._scrollableElement.setScrollPosition({ scrollTop: this._scrollableElement.getScrollPosition().scrollTop + delta });
                 })));
@@ -71,17 +73,25 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                         item.setViewState(data, tx);
                     });
                 }
+                map.set(d, item);
                 return item;
             }));
+            return { items, getItem: d => map.get(d) };
         });
+        this._viewItems = ( this._viewItemsInfo.map(this, items => items.items));
         this._spaceBetweenPx = 0;
         this._totalHeight = ( this._viewItems.map(
             this,
             (items, reader) => items.reduce((r, i) => r + i.contentHeight.read(reader) + this._spaceBetweenPx, 0)
         ));
-        this.activeDiffItem = derived(this, reader => this._viewItems.read(reader).find(i => i.template.read(reader)?.isFocused.read(reader)));
-        this.lastActiveDiffItem = derivedObservableWithCache((reader, lastValue) => this.activeDiffItem.read(reader) ?? lastValue);
-        this.activeControl = derived(this, reader => this.lastActiveDiffItem.read(reader)?.template.read(reader)?.editor);
+        this.activeControl = derived(this, reader => {
+            const activeDiffItem = this._viewModel.read(reader)?.activeDiffItem.read(reader);
+            if (!activeDiffItem) {
+                return undefined;
+            }
+            const viewItem = this._viewItemsInfo.read(reader).getItem(activeDiffItem);
+            return viewItem.template.read(reader)?.editor;
+        });
         this._contextKeyService = this._register(this._parentContextKeyService.createScoped(this._element));
         this._instantiationService = this._parentInstantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService])));
         this._lastDocStates = {};
@@ -104,12 +114,6 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                 ctxAllCollapsed.set(allCollapsed);
             }
         }));
-        this._register(autorun((reader) => {
-            const lastActiveDiffItem = this.lastActiveDiffItem.read(reader);
-            transaction(tx => {
-                this._viewModel.read(reader)?.activeDiffItem.set(lastActiveDiffItem?.viewModel, tx);
-            });
-        }));
         this._register(autorun((reader) => {
             const dimension = this._dimension.read(reader);
             this._sizeObserver.observe(dimension);
@@ -123,7 +127,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
             const width = this._sizeObserver.width.read(reader);
             let scrollWidth = width;
             const viewItems = this._viewItems.read(reader);
-            const max = findFirstMaxBy(viewItems, i => i.maxScroll.read(reader).maxScroll);
+            const max = findFirstMax(viewItems, compareBy(i => i.maxScroll.read(reader).maxScroll, numberComparator));
             if (max) {
                 const maxScroll = max.maxScroll.read(reader);
                 scrollWidth = width + maxScroll.maxScroll;
@@ -153,14 +157,16 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         const index = viewItems.findIndex((item) => item.viewModel.originalUri?.toString() === resource.original?.toString()
             && item.viewModel.modifiedUri?.toString() === resource.modified?.toString());
         if (index === -1) {
-            throw new BugIndicatingError('Resource not found in diff editor');
+            throw ( new BugIndicatingError('Resource not found in diff editor'));
         }
+        const viewItem = viewItems[index];
+        this._viewModel.get().activeDiffItem.setCache(viewItem.viewModel, undefined);
         let scrollTop = 0;
         for (let i = 0; i < index; i++) {
             scrollTop += viewItems[i].contentHeight.get() + this._spaceBetweenPx;
         }
         this._scrollableElement.setScrollPosition({ scrollTop });
-        const diffEditor = viewItems[index].template.get()?.editor;
+        const diffEditor = viewItem.template.get()?.editor;
         const editor = 'original' in resource ? diffEditor?.getOriginalEditor() : diffEditor?.getModifiedEditor();
         if (editor && options?.range) {
             editor.revealRangeInCenter(options.range);
@@ -261,6 +267,8 @@ class VirtualizedViewItem extends Disposable {
         this.maxScroll = derived(this, reader => this._templateRef.read(reader)?.object.maxScroll.read(reader) ?? { maxScroll: 0, scrollWidth: 0 });
         this.template = derived(this, reader => this._templateRef.read(reader)?.object);
         this._isHidden = observableValue(this, false);
+        this._isFocused = derived(this, reader => this.template.read(reader)?.isFocused.read(reader) ?? false);
+        this.viewModel.setIsFocused(this._isFocused, undefined);
         this._register(autorun((reader) => {
             const scrollLeft = this._scrollLeft.read(reader);
             this._templateRef.read(reader)?.object.setScrollLeft(scrollLeft);

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-component.multiDiffEditor{background:var(--vscode-multiDiffEditor-background);overflow-y:hidden;.focused{--vscode-multiDiffEditor-border:var(--vscode-focusBorder)}.multiDiffEntry{display:flex;flex:1;flex-direction:column;overflow:hidden;.collapse-button{cursor:pointer;margin:0 5px;a{display:block}}.header{background:var(--vscode-editor-background);z-index:1000;&:not(.collapsed) .header-content{border-bottom:1px solid var(--vscode-sideBarSectionHeader-border)}.header-content{align-items:center;background:var(--vscode-multiDiffEditor-headerBackground);border-left:1px solid var(--vscode-multiDiffEditor-border);border-right:1px solid var(--vscode-multiDiffEditor-border);border-top:1px solid var(--vscode-multiDiffEditor-border);border-top-left-radius:2px;border-top-right-radius:2px;color:var(--vscode-foreground);display:flex;margin:8px 8px 0;padding:4px 5px;&.shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px}.file-path{display:flex;flex:1;min-width:0;.title{font-size:14px;line-height:22px;&.original{flex:1;min-width:0;text-overflow:ellipsis}}.status{font-weight:600;line-height:22px;margin:0 10px;opacity:.75}}.actions{padding:0 8px}}}.editorParent{border-bottom:1px solid var(--vscode-multiDiffEditor-border);border-left:1px solid var(--vscode-multiDiffEditor-border);border-radius:2px;border-right:1px solid var(--vscode-multiDiffEditor-border);display:flex;flex:1;flex-direction:column;margin-left:8px;margin-right:8px;overflow:hidden}.editorContainer{flex:1}}}";
+var css = ".monaco-component.multiDiffEditor{background:var(--vscode-multiDiffEditor-background);overflow-y:hidden;.active{--vscode-multiDiffEditor-border:var(--vscode-focusBorder)}.multiDiffEntry{display:flex;flex:1;flex-direction:column;overflow:hidden;.collapse-button{cursor:pointer;margin:0 5px;a{display:block}}.header{background:var(--vscode-editor-background);z-index:1000;&:not(.collapsed) .header-content{border-bottom:1px solid var(--vscode-sideBarSectionHeader-border)}.header-content{align-items:center;background:var(--vscode-multiDiffEditor-headerBackground);border-top:1px solid var(--vscode-multiDiffEditor-border);color:var(--vscode-foreground);display:flex;margin:8px 0 0;padding:4px 5px;&.shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px}.file-path{display:flex;flex:1;min-width:0;.title{font-size:14px;line-height:22px;&.original{flex:1;min-width:0;text-overflow:ellipsis}}.status{font-weight:600;line-height:22px;margin:0 10px;opacity:.75}}.actions{padding:0 8px}}}.editorParent{border-bottom:1px solid var(--vscode-multiDiffEditor-border);display:flex;flex:1;flex-direction:column;overflow:hidden}.editorContainer{flex:1}}}";
 n(css,{});
 export { css, css as default };