@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js

@@ -0,0 +1,80 @@
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { isString, isFunction } from '../../../../base/common/types.js';
+import { localizeWithPath } from '../../../../nls.js';
+const _moduleId = "vs/editor/browser/services/hoverService/updatableHoverWidget";
+class UpdatableHoverWidget {
+    constructor(hoverDelegate, target, fadeInAnimation) {
+        this.hoverDelegate = hoverDelegate;
+        this.target = target;
+        this.fadeInAnimation = fadeInAnimation;
+    }
+    async update(content, focus, options) {
+        if (this._cancellationTokenSource) {
+            this._cancellationTokenSource.dispose(true);
+            this._cancellationTokenSource = undefined;
+        }
+        if (this.isDisposed) {
+            return;
+        }
+        let resolvedContent;
+        if (content === undefined || isString(content) || content instanceof HTMLElement) {
+            resolvedContent = content;
+        }
+        else if (!isFunction(content.markdown)) {
+            resolvedContent = content.markdown ?? content.markdownNotSupportedFallback;
+        }
+        else {
+            if (!this._hoverWidget) {
+                this.show(( localizeWithPath(_moduleId, 0, "Loading...")), focus);
+            }
+            this._cancellationTokenSource = ( (new CancellationTokenSource()));
+            const token = this._cancellationTokenSource.token;
+            resolvedContent = await content.markdown(token);
+            if (resolvedContent === undefined) {
+                resolvedContent = content.markdownNotSupportedFallback;
+            }
+            if (this.isDisposed || token.isCancellationRequested) {
+                return;
+            }
+        }
+        this.show(resolvedContent, focus, options);
+    }
+    show(content, focus, options) {
+        const oldHoverWidget = this._hoverWidget;
+        if (this.hasContent(content)) {
+            const hoverOptions = {
+                content,
+                target: this.target,
+                appearance: {
+                    showPointer: this.hoverDelegate.placement === 'element',
+                    skipFadeInAnimation: !this.fadeInAnimation || !!oldHoverWidget,
+                },
+                position: {
+                    hoverPosition: 2 ,
+                },
+                ...options
+            };
+            this._hoverWidget = this.hoverDelegate.showHover(hoverOptions, focus);
+        }
+        oldHoverWidget?.dispose();
+    }
+    hasContent(content) {
+        if (!content) {
+            return false;
+        }
+        if (isMarkdownString(content)) {
+            return !!content.value;
+        }
+        return true;
+    }
+    get isDisposed() {
+        return this._hoverWidget?.isDisposed;
+    }
+    dispose() {
+        this._hoverWidget?.dispose();
+        this._cancellationTokenSource?.dispose(true);
+        this._cancellationTokenSource = undefined;
+    }
+}
+export { UpdatableHoverWidget };

package/vscode/src/vs/editor/browser/stableEditorScroll.js

@@ -47,4 +47,40 @@ class StableEditorScrollState {
         editor.setScrollTop(editor.getScrollTop() + offset);
     }
 }
-export { StableEditorScrollState };
+class StableEditorBottomScrollState {
+    static capture(editor) {
+        if (editor.hasPendingScrollAnimation()) {
+            return ( new StableEditorBottomScrollState(editor.getScrollTop(), editor.getContentHeight(), null, 0));
+        }
+        let visiblePosition = null;
+        let visiblePositionScrollDelta = 0;
+        const visibleRanges = editor.getVisibleRanges();
+        if (visibleRanges.length > 0) {
+            visiblePosition = visibleRanges.at(-1).getEndPosition();
+            const visiblePositionScrollBottom = editor.getBottomForLineNumber(visiblePosition.lineNumber);
+            visiblePositionScrollDelta = (editor.getScrollTop() + editor.getLayoutInfo().height) - visiblePositionScrollBottom;
+        }
+        return ( new StableEditorBottomScrollState(
+            editor.getScrollTop(),
+            editor.getContentHeight(),
+            visiblePosition,
+            visiblePositionScrollDelta
+        ));
+    }
+    constructor(_initialScrollTop, _initialContentHeight, _visiblePosition, _visiblePositionScrollDelta) {
+        this._initialScrollTop = _initialScrollTop;
+        this._initialContentHeight = _initialContentHeight;
+        this._visiblePosition = _visiblePosition;
+        this._visiblePositionScrollDelta = _visiblePositionScrollDelta;
+    }
+    restore(editor) {
+        if (this._initialContentHeight === editor.getContentHeight() && this._initialScrollTop === editor.getScrollTop()) {
+            return;
+        }
+        if (this._visiblePosition) {
+            const visiblePositionScrollBottom = editor.getBottomForLineNumber(this._visiblePosition.lineNumber);
+            editor.setScrollTop(visiblePositionScrollBottom - (this._visiblePositionScrollDelta + editor.getLayoutInfo().height));
+        }
+    }
+}
+export { StableEditorBottomScrollState, StableEditorScrollState };

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js

@@ -52,6 +52,7 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var CodeEditorWidget_1;
 const _moduleId = "vs/editor/browser/widget/codeEditor/codeEditorWidget";
@@ -64,6 +65,9 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     get isSimpleWidget() {
         return this._configuration.isSimpleWidget;
     }
+    get contextMenuId() {
+        return this._configuration.contextMenuId;
+    }
     get contextKeyService() { return this._contextKeyService; }
     constructor(domElement, _options, codeEditorWidgetOptions, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService) {
         super();
@@ -158,7 +162,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         this._decorationTypeKeysToIds = {};
         this._decorationTypeSubtypes = {};
         this._telemetryData = codeEditorWidgetOptions.telemetryData;
-        this._configuration = this._register(this._createConfiguration(codeEditorWidgetOptions.isSimpleWidget || false, codeEditorWidgetOptions.isStandaloneEditor || false, options, accessibilityService));
+        this._configuration = this._register(this._createConfiguration(codeEditorWidgetOptions.isSimpleWidget || false, codeEditorWidgetOptions.contextMenuId ?? (codeEditorWidgetOptions.isSimpleWidget ? MenuId.SimpleEditorContext : MenuId.EditorContext), codeEditorWidgetOptions.isStandaloneEditor || false, options, accessibilityService));
         this._register(this._configuration.onDidChange((e) => {
             this._onDidChangeConfiguration.fire(e);
             const options = this._configuration.options;
@@ -250,10 +254,11 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     writeScreenReaderContent(reason) {
         this._modelData?.view.writeScreenReaderContent(reason);
     }
-    _createConfiguration(isSimpleWidget, isStandaloneEditor, options, accessibilityService) {
+    _createConfiguration(isSimpleWidget, contextMenuId, isStandaloneEditor, options, accessibilityService) {
         return (
              (new EditorConfiguration(
                 isSimpleWidget,
+                contextMenuId,
                 isStandaloneEditor,
                 options,
                 this._domElement,
@@ -1190,7 +1195,9 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         if (!this._modelData || !this._modelData.hasRealView) {
             return;
         }
-        this._modelData.view.render(true, forceRedraw);
+        this._modelData.viewModel.batchEvents(() => {
+            this._modelData.view.render(true, forceRedraw);
+        });
     }
     setAriaOptions(options) {
         if (!this._modelData || !this._modelData.hasRealView) {

package/vscode/src/vs/editor/browser/widget/codeEditor/editor.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = "::-ms-clear{display:none}.monaco-editor .editor-widget input{color:inherit}.monaco-editor{-webkit-text-size-adjust:100%;color:var(--vscode-editor-foreground);overflow:visible;position:relative}.monaco-editor,.monaco-editor-background{background-color:var(--vscode-editor-background)}.monaco-editor .rangeHighlight{background-color:var(--vscode-editor-rangeHighlightBackground);border:1px solid var(--vscode-editor-rangeHighlightBorder);box-sizing:border-box}.monaco-editor.hc-black .rangeHighlight,.monaco-editor.hc-light .rangeHighlight{border-style:dotted}.monaco-editor .symbolHighlight{background-color:var(--vscode-editor-symbolHighlightBackground);border:1px solid var(--vscode-editor-symbolHighlightBorder);box-sizing:border-box}.monaco-editor.hc-black .symbolHighlight,.monaco-editor.hc-light .symbolHighlight{border-style:dotted}.monaco-editor .overflow-guard{overflow:hidden;position:relative}.monaco-editor .view-overlays{position:absolute;top:0}.monaco-editor .margin-view-overlays>div,.monaco-editor .view-overlays>div{position:absolute;width:100%}.monaco-editor .margin-view-overlays>div>div,.monaco-editor .view-overlays>div>div{bottom:0}.monaco-editor .squiggly-error{border-bottom:4px double var(--vscode-editorError-border)}.monaco-editor .squiggly-error:before{background:var(--vscode-editorError-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-warning{border-bottom:4px double var(--vscode-editorWarning-border)}.monaco-editor .squiggly-warning:before{background:var(--vscode-editorWarning-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-info{border-bottom:4px double var(--vscode-editorInfo-border)}.monaco-editor .squiggly-info:before{background:var(--vscode-editorInfo-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-hint{border-bottom:2px dotted var(--vscode-editorHint-border)}.monaco-editor.showUnused .squiggly-unnecessary{border-bottom:2px dashed var(--vscode-editorUnnecessaryCode-border)}.monaco-editor.showDeprecated .squiggly-inline-deprecated{text-decoration:line-through;text-decoration-color:var(--vscode-editor-foreground,inherit)}";
+var css = "::-ms-clear{display:none}.monaco-editor .editor-widget input{color:inherit}.monaco-editor{-webkit-text-size-adjust:100%;color:var(--vscode-editor-foreground);overflow:visible;position:relative}.monaco-editor,.monaco-editor-background{background-color:var(--vscode-editor-background)}.monaco-editor .rangeHighlight{background-color:var(--vscode-editor-rangeHighlightBackground);border:1px solid var(--vscode-editor-rangeHighlightBorder);box-sizing:border-box}.monaco-editor.hc-black .rangeHighlight,.monaco-editor.hc-light .rangeHighlight{border-style:dotted}.monaco-editor .symbolHighlight{background-color:var(--vscode-editor-symbolHighlightBackground);border:1px solid var(--vscode-editor-symbolHighlightBorder);box-sizing:border-box}.monaco-editor.hc-black .symbolHighlight,.monaco-editor.hc-light .symbolHighlight{border-style:dotted}.monaco-editor .overflow-guard{overflow:hidden;position:relative}.monaco-editor .view-overlays{position:absolute;top:0}.monaco-editor .margin-view-overlays>div,.monaco-editor .view-overlays>div{position:absolute;width:100%}.monaco-editor .squiggly-error{border-bottom:4px double var(--vscode-editorError-border)}.monaco-editor .squiggly-error:before{background:var(--vscode-editorError-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-warning{border-bottom:4px double var(--vscode-editorWarning-border)}.monaco-editor .squiggly-warning:before{background:var(--vscode-editorWarning-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-info{border-bottom:4px double var(--vscode-editorInfo-border)}.monaco-editor .squiggly-info:before{background:var(--vscode-editorInfo-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-hint{border-bottom:2px dotted var(--vscode-editorHint-border)}.monaco-editor.showUnused .squiggly-unnecessary{border-bottom:2px dashed var(--vscode-editorUnnecessaryCode-border)}.monaco-editor.showDeprecated .squiggly-inline-deprecated{text-decoration:line-through;text-decoration-color:var(--vscode-editor-foreground,inherit)}";
 n(css,{});
 export { css, css as default };

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

@@ -1,4 +1,5 @@
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/arrays.js';
 import { derived } from '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/utils.js';

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

@@ -1,10 +1,12 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/arrays.js';
 import { derivedOpts, derived } from '../../../../../base/common/observableInternal/derived.js';
 import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
+import { obsCodeEditor } from '../../../observableUtilities.js';
 import { OverviewRulerFeature } from '../features/overviewRulerFeature.js';
 import { EditorOptions } from '../../../../common/config/editorOptions.js';
 import { Position } from '../../../../common/core/position.js';
@@ -28,12 +30,12 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         this._onDidContentSizeChange = this._register(( (new Emitter())));
         this.modifiedScrollTop = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollTop());
         this.modifiedScrollHeight = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollHeight());
-        this.modifiedModel = observableFromEvent(this.modified.onDidChangeModel, () =>  this.modified.getModel());
+        this.modifiedModel = obsCodeEditor(this.modified).model;
         this.modifiedSelections = observableFromEvent(this.modified.onDidChangeCursorSelection, () => this.modified.getSelections() ?? []);
-        this.modifiedCursor = derivedOpts({ owner: this, equalityComparer: Position.equals }, reader => this.modifiedSelections.read(reader)[0]?.getPosition() ?? ( (new Position(1, 1))));
+        this.modifiedCursor = derivedOpts({ owner: this, equalsFn: Position.equals }, reader => this.modifiedSelections.read(reader)[0]?.getPosition() ?? ( (new Position(1, 1))));
         this.originalCursor = observableFromEvent(this.original.onDidChangeCursorPosition, () => this.original.getPosition() ?? ( (new Position(1, 1))));
-        this.isOriginalFocused = observableFromEvent(Event.any(this.original.onDidFocusEditorWidget, this.original.onDidBlurEditorWidget), () => this.original.hasWidgetFocus());
-        this.isModifiedFocused = observableFromEvent(Event.any(this.modified.onDidFocusEditorWidget, this.modified.onDidBlurEditorWidget), () => this.modified.hasWidgetFocus());
+        this.isOriginalFocused = obsCodeEditor(this.original).isFocused;
+        this.isModifiedFocused = obsCodeEditor(this.modified).isFocused;
         this.isFocused = derived(this, reader => this.isOriginalFocused.read(reader) || this.isModifiedFocused.read(reader));
         this._argCodeEditorWidgetOptions = null;
         this._register(autorunHandleChanges({

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

@@ -5,6 +5,7 @@ import { derived } from '../../../../../base/common/observableInternal/derived.j
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/arrays.js';
 class DiffEditorSash extends Disposable {
     constructor(_options, _domNode, _dimensions, _sashes) {
         super();

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

@@ -4,6 +4,7 @@ import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/arrays.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';

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

@@ -217,6 +217,9 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
             if (this._cancellationTokenSource.token.isCancellationRequested) {
                 return;
             }
+            if (model.original.isDisposed() || model.modified.isDisposed()) {
+                return;
+            }
             result = normalizeDocumentDiff(result, model.original, model.modified);
             result = result;
             result = result;

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { h, $, getWindow } from '../../../../base/browser/dom.js';
+import { h, getWindow } from '../../../../base/browser/dom.js';
 import { findLast } from '../../../../base/common/arraysFind.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
@@ -9,6 +9,7 @@ import { derived, derivedDisposable } from '../../../../base/common/observableIn
 import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
 import { recomputeInitiallyAndOnChange, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/arrays.js';
 import './style.css.js';
 import { EditorExtensionsRegistry } from '../../editorExtensions.js';
 import { ICodeEditorService } from '../../services/codeEditorService.js';
@@ -18,6 +19,7 @@ import { AccessibleDiffViewerModelFromEditors, AccessibleDiffViewer } from './co
 import { DiffEditorDecorations } from './components/diffEditorDecorations.js';
 import { DiffEditorSash } from './components/diffEditorSash.js';
 import { DiffEditorViewZones } from './components/diffEditorViewZones/diffEditorViewZones.js';
+import { DiffEditorGutter } from './features/gutterFeature.js';
 import { HideUnchangedRegionsFeature } from './features/hideUnchangedRegionsFeature.js';
 import { MovedBlocksLinesFeature } from './features/movedBlocksLinesFeature.js';
 import { OverviewRulerFeature } from './features/overviewRulerFeature.js';
@@ -37,7 +39,6 @@ import { DiffEditorEditors } from './components/diffEditorEditors.js';
 import { DelegatingEditor } from './delegatingEditorImpl.js';
 import { DiffEditorOptions } from './diffEditorOptions.js';
 import { DiffEditorViewModel } from './diffEditorViewModel.js';
-import { DiffEditorGutter } from './features/gutterFeature.js';
 let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
     static { this.ENTIRE_DIFF_OVERVIEW_WIDTH = OverviewRulerFeature.ENTIRE_DIFF_OVERVIEW_WIDTH; }
     get onDidContentSizeChange() { return this._editors.onDidContentSizeChange; }
@@ -50,7 +51,6 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._accessibilitySignalService = _accessibilitySignalService;
         this._editorProgressService = _editorProgressService;
         this.elements = h('div.monaco-diff-editor.side-by-side', { style: { position: 'relative', height: '100%' } }, [
-            h('div.noModificationsOverlay@overlay', { style: { position: 'absolute', height: '100%', visibility: 'hidden', } }, [$('span', {}, 'No Changes')]),
             h('div.editor.original@original', { style: { position: 'absolute', height: '100%', } }),
             h('div.editor.modified@modified', { style: { position: 'absolute', height: '100%', } }),
             h('div.accessibleDiffViewer@accessibleDiffViewer', { style: { position: 'absolute', height: '100%' } }),
@@ -183,13 +183,6 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         derivedDisposable(this, reader =>  new (readHotReloadableExport(MovedBlocksLinesFeature, reader))(this.elements.root, this._diffModel, ( this._layoutInfo.map(i => i.originalEditor)), ( this._layoutInfo.map(i => i.modifiedEditor)), this._editors)).recomputeInitiallyAndOnChange(this._store, value => {
             this._movedBlocksLinesPart.set(value, undefined);
         });
-        this._register(applyStyle(this.elements.overlay, {
-            width: ( this._layoutInfo.map(
-                (i, r) => i.originalEditor.width + (this._options.renderSideBySide.read(r) ? 0 : i.modifiedEditor.width)
-            )),
-            visibility: derived(reader =>  (this._options.hideUnchangedRegions.read(reader) && this._diffModel.read(reader)?.diff.read(reader)?.mappings.length === 0)
-                ? 'visible' : 'hidden'),
-        }));
         this._register(Event.runAndSubscribe(this._editors.modified.onDidChangeCursorPosition, e => this._handleCursorPositionChange(e, true)));
         this._register(Event.runAndSubscribe(this._editors.original.onDidChangeCursorPosition, e => this._handleCursorPositionChange(e, false)));
         const isInitializingDiff = ( this._diffModel.map(this, (m, reader) => {

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

@@ -40,6 +40,14 @@ let WorkerBasedDocumentDiffProvider = class WorkerBasedDocumentDiffProvider {
         if (typeof this.diffAlgorithm !== 'string') {
             return this.diffAlgorithm.computeDiff(original, modified, options, cancellationToken);
         }
+        if (original.isDisposed() || modified.isDisposed()) {
+            return {
+                changes: [],
+                identical: true,
+                quitEarly: false,
+                moves: [],
+            };
+        }
         if (original.getLineCount() === 1 && original.getLineMaxColumn(1) === 1) {
             if (modified.getLineCount() === 1 && modified.getLineMaxColumn(1) === 1) {
                 return {

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

@@ -6,13 +6,14 @@ import { derived } from '../../../../../base/common/observableInternal/derived.j
 import { autorun, autorunWithStore } 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 { prependRemoveOnDispose, applyStyle, appendRemoveOnDispose } from '../utils.js';
 import { EditorGutter } from '../utils/editorGutter.js';
 import { ActionRunnerWithContext } from '../../multiDiffEditor/utils.js';
 import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../common/core/offsetRange.js';
 import { Range } from '../../../../common/core/range.js';
-import { TextEdit, SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextEdit } from '../../../../common/core/textEdit.js';
 import { DetailedLineRangeMapping } from '../../../../common/diff/rangeMapping.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
@@ -120,11 +121,10 @@ let DiffEditorGutter = class DiffEditorGutter extends Disposable {
     }
     computeStagedValue(mapping) {
         const c = mapping.innerChanges ?? [];
-        const edit = ( new TextEdit(( c.map(c => ( new SingleTextEdit(
-            c.originalRange,
-            this._editors.modifiedModel.get().getValueInRange(c.modifiedRange)
-        ))))));
-        const value = edit.apply(( new TextModelText(this._editors.original.getModel())));
+        const modified = ( new TextModelText(this._editors.modifiedModel.get()));
+        const original = ( new TextModelText(this._editors.original.getModel()));
+        const edit = ( new TextEdit(( c.map(c => c.toTextEdit(modified)))));
+        const value = edit.apply(original);
         return value;
     }
     layout(left) {

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

@@ -9,6 +9,7 @@ import { derivedDisposable, derivedWithStore, derived } from '../../../../../bas
 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 { ThemeIcon } from '../../../../../base/common/themables.js';
 import { isDefined } from '../../../../../base/common/types.js';
 import { applyObservableDecorations, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';

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';
@@ -208,7 +208,7 @@ 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;

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';

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/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';