@codingame/monaco-vscode-api 2.2.2 → 3.0.0

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

@@ -109,14 +109,11 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     group: '1_diff',
     when: ( ContextKeyExpr.has('isInDiffEditor')),
 });
-const diffEditorCategory = {
-    value: ( localizeWithPath(
-        'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-        'diffEditor',
-        'Diff Editor'
-    )),
-    original: 'Diff Editor',
-};
+const diffEditorCategory = ( localize2WithPath(
+    'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
+    'diffEditor',
+    "Diff Editor"
+));
 class SwitchSide extends EditorAction2 {
     constructor() {
         super({
@@ -219,14 +216,11 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     }
 }
 registerAction2(ShowAllUnchangedRegions);
-const accessibleDiffViewerCategory = {
-    value: ( localizeWithPath(
-        'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-        'accessibleDiffViewer',
-        'Accessible Diff Viewer'
-    )),
-    original: 'Accessible Diff Viewer',
-};
+const accessibleDiffViewerCategory = ( localize2WithPath(
+    'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
+    'accessibleDiffViewer',
+    "Accessible Diff Viewer"
+));
 class AccessibleDiffViewerNext extends Action2 {
     static { this.id = 'editor.action.accessibleDiffViewer.next'; }
     constructor() {

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

@@ -16,7 +16,8 @@ import { softAssert } from '../../../../base/common/assert.js';
 import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
 import { derived } from '../../../../base/common/observableInternal/derived.js';
 import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { waitForState, observableSignalFromEvent, observableSignal } from '../../../../base/common/observableInternal/utils.js';
+import { waitForState } from '../../../../base/common/observableInternal/promise.js';
+import { observableSignalFromEvent, observableSignal } from '../../../../base/common/observableInternal/utils.js';
 let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
     setActiveMovedText(movedText) {
         this._activeMovedText.set(movedText, undefined);

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

@@ -10,7 +10,7 @@ import { EditorExtensionsRegistry } from '../../editorExtensions.js';
 import { ICodeEditorService } from '../../services/codeEditorService.js';
 import { StableEditorScrollState } from '../../stableEditorScroll.js';
 import { CodeEditorWidget } from '../codeEditorWidget.js';
-import { AccessibleDiffViewer } from './components/accessibleDiffViewer.js';
+import { AccessibleDiffViewerModelFromEditors, AccessibleDiffViewer } from './components/accessibleDiffViewer.js';
 import { DiffEditorDecorations } from './components/diffEditorDecorations.js';
 import { DiffEditorSash } from './components/diffEditorSash.js';
 import { HideUnchangedRegionsFeature } from './features/hideUnchangedRegionsFeature.js';
@@ -22,7 +22,7 @@ import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorType } from '../../../common/editorCommon.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { AudioCue, IAudioCueService } from '../../../../platform/audioCues/browser/audioCueService.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
@@ -39,12 +39,12 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
     static { this.ENTIRE_DIFF_OVERVIEW_WIDTH = OverviewRulerFeature.ENTIRE_DIFF_OVERVIEW_WIDTH; }
     get onDidContentSizeChange() { return this._editors.onDidContentSizeChange; }
     get collapseUnchangedRegions() { return this._options.hideUnchangedRegions.get(); }
-    constructor(_domElement, options, codeEditorWidgetOptions, _parentContextKeyService, _parentInstantiationService, codeEditorService, _audioCueService, _editorProgressService) {
+    constructor(_domElement, options, codeEditorWidgetOptions, _parentContextKeyService, _parentInstantiationService, codeEditorService, _accessibilitySignalService, _editorProgressService) {
         super();
         this._domElement = _domElement;
         this._parentContextKeyService = _parentContextKeyService;
         this._parentInstantiationService = _parentInstantiationService;
-        this._audioCueService = _audioCueService;
+        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')]),
@@ -142,7 +142,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
                 scrollState = undefined;
             }
         }, modViewZoneIdsToIgnore));
-        this._accessibleDiffViewer = derivedDisposable(this, reader => this._instantiationService.createInstance(readHotReloadableExport(AccessibleDiffViewer, reader), this.elements.accessibleDiffViewer, this._accessibleDiffViewerVisible, (visible, tx) => this._accessibleDiffViewerShouldBeVisible.set(visible, tx), ( this._options.onlyShowAccessibleDiffViewer.map(v => !v)), this._rootSizeObserver.width, this._rootSizeObserver.height, ( this._diffModel.map((m, r) => m?.diff.read(r)?.mappings.map(m => m.lineRangeMapping))), this._editors)).recomputeInitiallyAndOnChange(this._store);
+        this._accessibleDiffViewer = derivedDisposable(this, reader => this._instantiationService.createInstance(readHotReloadableExport(AccessibleDiffViewer, reader), this.elements.accessibleDiffViewer, this._accessibleDiffViewerVisible, (visible, tx) => this._accessibleDiffViewerShouldBeVisible.set(visible, tx), ( this._options.onlyShowAccessibleDiffViewer.map(v => !v)), this._rootSizeObserver.width, this._rootSizeObserver.height, ( this._diffModel.map((m, r) => m?.diff.read(r)?.mappings.map(m => m.lineRangeMapping))), ( new AccessibleDiffViewerModelFromEditors(this._editors)))).recomputeInitiallyAndOnChange(this._store);
         const visibility = ( this._accessibleDiffViewerVisible.map(v => v ? 'hidden' : 'visible'));
         this._register(applyStyle(this.elements.modified, { visibility }));
         this._register(applyStyle(this.elements.original, { visibility }));
@@ -163,13 +163,13 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
             if (e?.reason === 3 ) {
                 const diff = this._diffModel.get()?.diff.get()?.mappings.find(m => m.lineRangeMapping.modified.contains(e.position.lineNumber));
                 if (diff?.lineRangeMapping.modified.isEmpty) {
-                    this._audioCueService.playAudioCue(AudioCue.diffLineDeleted, { source: 'diffEditor.cursorPositionChanged' });
+                    this._accessibilitySignalService.playSignal(AccessibilitySignal.diffLineDeleted, { source: 'diffEditor.cursorPositionChanged' });
                 }
                 else if (diff?.lineRangeMapping.original.isEmpty) {
-                    this._audioCueService.playAudioCue(AudioCue.diffLineInserted, { source: 'diffEditor.cursorPositionChanged' });
+                    this._accessibilitySignalService.playSignal(AccessibilitySignal.diffLineInserted, { source: 'diffEditor.cursorPositionChanged' });
                 }
                 else if (diff) {
-                    this._audioCueService.playAudioCue(AudioCue.diffLineModified, { source: 'diffEditor.cursorPositionChanged' });
+                    this._accessibilitySignalService.playSignal(AccessibilitySignal.diffLineModified, { source: 'diffEditor.cursorPositionChanged' });
                 }
             }
         }));
@@ -352,13 +352,13 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         }
         this._goTo(diff);
         if (diff.lineRangeMapping.modified.isEmpty) {
-            this._audioCueService.playAudioCue(AudioCue.diffLineDeleted, { source: 'diffEditor.goToDiff' });
+            this._accessibilitySignalService.playSignal(AccessibilitySignal.diffLineDeleted, { source: 'diffEditor.goToDiff' });
         }
         else if (diff.lineRangeMapping.original.isEmpty) {
-            this._audioCueService.playAudioCue(AudioCue.diffLineInserted, { source: 'diffEditor.goToDiff' });
+            this._accessibilitySignalService.playSignal(AccessibilitySignal.diffLineInserted, { source: 'diffEditor.goToDiff' });
         }
         else if (diff) {
-            this._audioCueService.playAudioCue(AudioCue.diffLineModified, { source: 'diffEditor.goToDiff' });
+            this._accessibilitySignalService.playSignal(AccessibilitySignal.diffLineModified, { source: 'diffEditor.goToDiff' });
         }
     }
     revealFirstDiff() {
@@ -440,7 +440,7 @@ DiffEditorWidget = ( __decorate([
     ( __param(3, IContextKeyService)),
     ( __param(4, IInstantiationService)),
     ( __param(5, ICodeEditorService)),
-    ( __param(6, IAudioCueService)),
+    ( __param(6, IAccessibilitySignalService)),
     ( __param(7, IEditorProgressService))
 ], DiffEditorWidget));
 function toLineChanges(state) {

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

@@ -149,8 +149,6 @@ class MovedBlocksLinesFeature extends Disposable {
                 )));
             }
         }));
-        const originalCursorPosition = observableFromEvent(this._editors.original.onDidChangeCursorPosition, () => this._editors.original.getPosition());
-        const modifiedCursorPosition = observableFromEvent(this._editors.modified.onDidChangeCursorPosition, () => this._editors.modified.getPosition());
         const originalHasFocus = observableSignalFromEvent('original.onDidFocusEditorWidget', e => this._editors.original.onDidFocusEditorWidget(() => setTimeout(() => e(undefined), 0)));
         const modifiedHasFocus = observableSignalFromEvent('modified.onDidFocusEditorWidget', e => this._editors.modified.onDidFocusEditorWidget(() => setTimeout(() => e(undefined), 0)));
         let lastChangedEditor = 'modified';
@@ -175,13 +173,13 @@ class MovedBlocksLinesFeature extends Disposable {
             const diff = m.diff.read(reader);
             let movedText = undefined;
             if (diff && lastChangedEditor === 'original') {
-                const originalPos = originalCursorPosition.read(reader);
+                const originalPos = this._editors.originalCursor.read(reader);
                 if (originalPos) {
                     movedText = diff.movedTexts.find(m => m.lineRangeMapping.original.contains(originalPos.lineNumber));
                 }
             }
             if (diff && lastChangedEditor === 'modified') {
-                const modifiedPos = modifiedCursorPosition.read(reader);
+                const modifiedPos = this._editors.modifiedCursor.read(reader);
                 if (modifiedPos) {
                     movedText = diff.movedTexts.find(m => m.lineRangeMapping.modified.contains(modifiedPos.lineNumber));
                 }

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

@@ -112,7 +112,7 @@ let OverviewRulerFeature = class OverviewRulerFeature extends Disposable {
                     });
                     const scrollTop = this._editors.modifiedScrollTop.read(reader);
                     const scrollHeight = this._editors.modifiedScrollHeight.read(reader);
-                    const scrollBarOptions = this._editors.modified.getOption(102 );
+                    const scrollBarOptions = this._editors.modified.getOption(103 );
                     const state = ( new ScrollbarState(
                         scrollBarOptions.verticalHasArrows ? scrollBarOptions.arrowSize : 0,
                         scrollBarOptions.verticalScrollbarSize,

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

@@ -8,6 +8,7 @@ import { GlyphMarginLane } from '../../../../common/model.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { derived } from '../../../../../base/common/observableInternal/derived.js';
 import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+const emptyArr = [];
 class RevertButtonsFeature extends Disposable {
     constructor(_editors, _diffModel, _options, _widget) {
         super();
@@ -15,8 +16,7 @@ class RevertButtonsFeature extends Disposable {
         this._diffModel = _diffModel;
         this._options = _options;
         this._widget = _widget;
-        const emptyArr = [];
-        const selectedDiffs = derived(this, (reader) => {
+        this._selectedDiffs = derived(this, (reader) => {
             const model = this._diffModel.read(reader);
             const diff = model?.diff.read(reader);
             if (!diff) {
@@ -26,9 +26,9 @@ class RevertButtonsFeature extends Disposable {
             if (selections.every(s => s.isEmpty())) {
                 return emptyArr;
             }
-            const lineRanges = ( new LineRangeSet(( selections.map(s => LineRange.fromRangeInclusive(s)))));
-            const mappings = diff.mappings.filter(m => m.lineRangeMapping.innerChanges && lineRanges.intersects(m.lineRangeMapping.modified));
-            const result = ( mappings.map(mapping => ({
+            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 => ({
                 mapping,
                 rangeMappings: mapping.lineRangeMapping.innerChanges.filter(c => ( selections.some(s => Range.areIntersecting(c.modifiedRange, s))))
             })));
@@ -38,34 +38,33 @@ class RevertButtonsFeature extends Disposable {
             return result;
         });
         this._register(autorunWithStore((reader, store) => {
+            if (!this._options.shouldRenderRevertArrows.read(reader)) {
+                return;
+            }
             const model = this._diffModel.read(reader);
             const diff = model?.diff.read(reader);
             if (!model || !diff) {
                 return;
             }
-            const movedTextToCompare = this._diffModel.read(reader).movedTextToCompare.read(reader);
-            if (movedTextToCompare) {
-                return;
-            }
-            if (!this._options.shouldRenderRevertArrows.read(reader)) {
+            if (model.movedTextToCompare.read(reader)) {
                 return;
             }
             const glyphWidgetsModified = [];
-            const selectedDiffs_ = selectedDiffs.read(reader);
-            const diffsSet = ( new Set(( selectedDiffs_.map(d => d.mapping))));
-            if (selectedDiffs_.length > 0) {
+            const selectedDiffs = this._selectedDiffs.read(reader);
+            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(
                     selections[selections.length - 1].positionLineNumber,
                     this._widget,
-                    selectedDiffs_.flatMap(d => d.rangeMappings),
+                    selectedDiffs.flatMap(d => d.rangeMappings),
                     true
                 )));
                 this._editors.modified.addGlyphMarginWidget(btn);
                 glyphWidgetsModified.push(btn);
             }
             for (const m of diff.mappings) {
-                if (( diffsSet.has(m))) {
+                if (( selectedDiffsSet.has(m))) {
                     continue;
                 }
                 if (!m.lineRangeMapping.modified.isEmpty && m.lineRangeMapping.innerChanges) {
@@ -90,15 +89,15 @@ class RevertButtonsFeature extends Disposable {
 class RevertButton extends Disposable {
     static { this.counter = 0; }
     getId() { return this._id; }
-    constructor(_lineNumber, _widget, _diffs, _selection) {
+    constructor(_lineNumber, _widget, _diffs, _revertSelection) {
         super();
         this._lineNumber = _lineNumber;
         this._widget = _widget;
         this._diffs = _diffs;
-        this._selection = _selection;
+        this._revertSelection = _revertSelection;
         this._id = `revertButton${RevertButton.counter++}`;
         this._domNode = h('div.revertButton', {
-            title: this._selection
+            title: this._revertSelection
                 ? ( localizeWithPath(
                 'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature',
                 'revertSelectedChanges',

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

@@ -336,7 +336,7 @@ function addLength(position, length) {
 }
 function bindContextKey(key, service, computeValue) {
     const boundKey = key.bindTo(service);
-    return autorunOpts({ debugName: () => `Update ${key.key}` }, reader => {
+    return autorunOpts({ debugName: () => `Set Context Key "${key.key}"` }, reader => {
         boundKey.set(computeValue(reader));
     });
 }

package/vscode/src/vs/editor/browser/widget/embeddedCodeEditorWidget.js

@@ -6,7 +6,7 @@ import { DiffEditorWidget } from './diffEditor/diffEditorWidget.js';
 import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
 import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
 import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
-import { IAudioCueService } from '../../../platform/audioCues/browser/audioCueService.js';
+import { IAccessibilitySignalService } from '../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { ICommandService } from '../../../platform/commands/common/commands.js';
 import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
@@ -45,8 +45,8 @@ EmbeddedCodeEditorWidget = ( __decorate([
     ( __param(12, ILanguageFeaturesService))
 ], EmbeddedCodeEditorWidget));
 let EmbeddedDiffEditorWidget = class EmbeddedDiffEditorWidget extends DiffEditorWidget {
-    constructor(domElement, options, codeEditorWidgetOptions, parentEditor, contextKeyService, instantiationService, codeEditorService, audioCueService, editorProgressService) {
-        super(domElement, parentEditor.getRawOptions(), codeEditorWidgetOptions, contextKeyService, instantiationService, codeEditorService, audioCueService, editorProgressService);
+    constructor(domElement, options, codeEditorWidgetOptions, parentEditor, contextKeyService, instantiationService, codeEditorService, accessibilitySignalService, editorProgressService) {
+        super(domElement, parentEditor.getRawOptions(), codeEditorWidgetOptions, contextKeyService, instantiationService, codeEditorService, accessibilitySignalService, editorProgressService);
         this._parentEditor = parentEditor;
         this._overwriteOptions = options;
         super.updateOptions(this._overwriteOptions);
@@ -68,7 +68,7 @@ EmbeddedDiffEditorWidget = ( __decorate([
     ( __param(4, IContextKeyService)),
     ( __param(5, IInstantiationService)),
     ( __param(6, ICodeEditorService)),
-    ( __param(7, IAudioCueService)),
+    ( __param(7, IAccessibilitySignalService)),
     ( __param(8, IEditorProgressService))
 ], EmbeddedDiffEditorWidget));
 export { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget };

package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/renderedMarkdown.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .rendered-markdown kbd{background-color:var(--vscode-keybindingLabel-background);border-color:var(--vscode-keybindingLabel-border);border-bottom-color:var(--vscode-keybindingLabel-bottomBorder);border-radius:3px;border-style:solid;border-width:1px;box-shadow:inset 0 -1px 0 var(--vscode-widget-shadow);color:var(--vscode-keybindingLabel-foreground);padding:1px 3px;vertical-align:middle}";
+var css = ".monaco-editor .rendered-markdown kbd{background-color:var(--vscode-keybindingLabel-background);border-color:var(--vscode-keybindingLabel-border);border-bottom-color:var(--vscode-keybindingLabel-bottomBorder);border-radius:3px;border-style:solid;border-width:1px;box-shadow:inset 0 -1px 0 var(--vscode-widget-shadow);color:var(--vscode-keybindingLabel-foreground);padding:1px 3px;vertical-align:middle}.rendered-markdown li:has(input[type=checkbox]){list-style-type:none}";
 n(css,{});
 export { css, css as default };

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

@@ -1,11 +1,11 @@
 import { localizeWithPath } from '../../../../nls.js';
 import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
-registerColor('multiDiffEditor.headerBackground', { dark: '#808080', light: '#b4b4b4', hcDark: '#808080', hcLight: '#b4b4b4', }, ( localizeWithPath(
+registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localizeWithPath(
  'vs/editor/browser/widget/multiDiffEditorWidget/colors',
  'multiDiffEditor.headerBackground',
  'The background color of the diff editor\'s header'
 )));
-registerColor('multiDiffEditor.background', { dark: '#000000', light: '#e5e5e5', hcDark: '#000000', hcLight: '#e5e5e5', }, ( localizeWithPath(
+registerColor('multiDiffEditor.background', { dark: 'editorBackground', light: 'editorBackground', hcDark: 'editorBackground', hcLight: 'editorBackground', }, ( localizeWithPath(
  'vs/editor/browser/widget/multiDiffEditorWidget/colors',
  'multiDiffEditor.background',
  'The background color of the multi file diff editor'

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

@@ -9,12 +9,14 @@ import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolb
 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';
 import { derived } from '../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 class TemplateData {
-    constructor(viewModel) {
+    constructor(viewModel, deltaScrollVertical) {
         this.viewModel = viewModel;
+        this.deltaScrollVertical = deltaScrollVertical;
     }
     getId() {
         return this.viewModel;
@@ -50,13 +52,15 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         });
         this._elements = h('div.multiDiffEntry', [
             h('div.header@header', [
-                h('div.collapse-button@collapseButton'),
-                h('div.file-path', [
-                    h('div.title.modified.show-file-icons@primaryPath', []),
-                    h('div.status.deleted@status', ['R']),
-                    h('div.title.original.show-file-icons@secondaryPath', []),
+                h('div.header-content', [
+                    h('div.collapse-button@collapseButton'),
+                    h('div.file-path', [
+                        h('div.title.modified.show-file-icons@primaryPath', []),
+                        h('div.status.deleted@status', ['R']),
+                        h('div.title.original.show-file-icons@secondaryPath', []),
+                    ]),
+                    h('div.actions@actions'),
                 ]),
-                h('div.actions@actions'),
             ]),
             h('div.editorParent', [
                 h('div.editorContainer@editor'),
@@ -75,7 +79,9 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
             ? this._register(this._workbenchUIElementFactory.createResourceLabel(this._elements.secondaryPath))
             : undefined;
         this._dataStore = ( new DisposableStore());
-        this._headerHeight = 38;
+        this._headerHeight = 48;
+        this._lastScrollTop = -1;
+        this._isSettingScrollTop = false;
         const btn = ( new Button(this._elements.collapseButton, {}));
         this._register(autorun(reader => {
             btn.element.className = '';
@@ -87,14 +93,14 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         this._register(autorun(reader => {
             this._elements.editor.style.display = this._collapsed.read(reader) ? 'none' : 'block';
         }));
-        this.editor.getModifiedEditor().onDidLayoutChange(e => {
+        this._register(this.editor.getModifiedEditor().onDidLayoutChange(e => {
             const width = this.editor.getModifiedEditor().getLayoutInfo().contentWidth;
             this._modifiedWidth.set(width, undefined);
-        });
-        this.editor.getOriginalEditor().onDidLayoutChange(e => {
+        }));
+        this._register(this.editor.getOriginalEditor().onDidLayoutChange(e => {
             const width = this.editor.getOriginalEditor().getLayoutInfo().contentWidth;
             this._originalWidth.set(width, undefined);
-        });
+        }));
         this._register(this.editor.onDidContentSizeChange(e => {
             globalTransaction(tx => {
                 this._editorContentHeight.set(e.contentHeight, tx);
@@ -102,18 +108,29 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
                 this._originalContentWidth.set(this.editor.getOriginalEditor().getContentWidth(), tx);
             });
         }));
+        this._register(this.editor.getOriginalEditor().onDidScrollChange(e => {
+            if (this._isSettingScrollTop) {
+                return;
+            }
+            if (!e.scrollTopChanged || !this._data) {
+                return;
+            }
+            const delta = e.scrollTop - this._lastScrollTop;
+            this._data.deltaScrollVertical(delta);
+        }));
         this._register(autorun(reader => {
             const isFocused = this.isFocused.read(reader);
             this._elements.root.classList.toggle('focused', isFocused);
         }));
         this._container.appendChild(this._elements.root);
-        this._outerEditorHeight = 38;
+        this._outerEditorHeight = this._headerHeight;
         this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, {
             actionRunner: this._register(( new ActionRunnerWithContext(() => (this._viewModel.get()?.modifiedUri)))),
             menuOptions: {
                 shouldForwardArgs: true,
             },
             toolbarOptions: { primaryGroup: g => g.startsWith('navigation') },
+            actionViewItemProvider: (action, options) => createActionViewItem(_instantiationService, action, options),
         }));
     }
     setScrollLeft(left) {
@@ -125,6 +142,7 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         }
     }
     setData(data) {
+        this._data = data;
         function updateOptions(options) {
             return {
                 ...options,
@@ -184,16 +202,25 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         this._elements.root.style.height = `${verticalRange.length}px`;
         this._elements.root.style.width = `${width}px`;
         this._elements.root.style.position = 'absolute';
-        const delta = Math.max(0, Math.min(verticalRange.length - this._headerHeight, viewPort.start - verticalRange.start));
+        const maxDelta = verticalRange.length - this._headerHeight;
+        const delta = Math.max(0, Math.min(viewPort.start - verticalRange.start, maxDelta));
         this._elements.header.style.transform = `translateY(${delta}px)`;
         globalTransaction(tx => {
             this.editor.layout({
-                width: width,
+                width: width - 2 * 8 - 2 * 1,
                 height: verticalRange.length - this._outerEditorHeight,
             });
         });
-        this.editor.getOriginalEditor().setScrollTop(editorScroll);
+        try {
+            this._isSettingScrollTop = true;
+            this._lastScrollTop = editorScroll;
+            this.editor.getOriginalEditor().setScrollTop(editorScroll);
+        }
+        finally {
+            this._isSettingScrollTop = false;
+        }
         this._elements.header.classList.toggle('shadow', delta > 0 || editorScroll > 0);
+        this._elements.header.classList.toggle('collapsed', delta === maxDelta);
     }
     hide() {
         this._elements.root.style.top = `-100000px`;

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

@@ -26,6 +26,9 @@ let MultiDiffEditorWidget = class MultiDiffEditorWidget extends Disposable {
         this.onDidChangeActiveControl = Event.fromObservableLight(this._activeControl);
         this._register(recomputeInitiallyAndOnChange(this._widgetImpl));
     }
+    reveal(resource, options) {
+        this._widgetImpl.get().reveal(resource, options);
+    }
     createViewModel(model) {
         return ( new MultiDiffEditorViewModel(model, this._instantiationService));
     }

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

@@ -8,13 +8,13 @@ import { Scrollable } from '../../../../base/common/scrollable.js';
 import './style.css.js';
 import { ObservableElementSizeObserver } from '../diffEditor/utils.js';
 import { OffsetRange } from '../../../common/core/offsetRange.js';
+import { Selection } from '../../../common/core/selection.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { DiffEditorItemTemplate, TemplateData } from './diffEditorItemTemplate.js';
 import { ObjectPool } from './objectPool.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
-import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { Selection } from '../../../common/core/selection.js';
 import { observableFromEvent, derivedObservableWithCache } from '../../../../base/common/observableInternal/utils.js';
 import { derivedWithStore, derived } from '../../../../base/common/observableInternal/derived.js';
 import { autorunWithStore, autorun } from '../../../../base/common/observableInternal/autorun.js';
@@ -60,7 +60,9 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
             }
             const items = vm.items.read(reader);
             return ( items.map(d => {
-                const item = store.add(( new VirtualizedViewItem(d, this._objectPool, this.scrollLeft)));
+                const item = store.add(( new VirtualizedViewItem(d, this._objectPool, this.scrollLeft, delta => {
+                    this._scrollableElement.setScrollPosition({ scrollTop: this._scrollableElement.getScrollPosition().scrollTop + delta });
+                })));
                 const data = this._lastDocStates?.[item.getKey()];
                 if (data) {
                     transaction(tx => {
@@ -70,7 +72,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                 return item;
             }));
         });
-        this._spaceBetweenPx = 10;
+        this._spaceBetweenPx = 0;
         this._totalHeight = ( this._viewItems.map(
             this,
             (items, reader) => items.reduce((r, i) => r + i.contentHeight.read(reader) + this._spaceBetweenPx, 0)
@@ -144,6 +146,28 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
     setScrollState(scrollState) {
         this._scrollableElement.setScrollPosition({ scrollLeft: scrollState.left, scrollTop: scrollState.top });
     }
+    reveal(resource, options) {
+        const viewItems = this._viewItems.get();
+        let searchCallback;
+        if ('original' in resource) {
+            searchCallback = (item) => item.viewModel.originalUri?.toString() === ( resource.original.toString());
+        }
+        else {
+            searchCallback = (item) => item.viewModel.modifiedUri?.toString() === ( resource.modified.toString());
+        }
+        const index = viewItems.findIndex(searchCallback);
+        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 editor = 'original' in resource ? diffEditor?.getOriginalEditor() : diffEditor?.getModifiedEditor();
+        if (editor && options?.range) {
+            editor.revealRangeInCenter(options.range);
+            highlightRange(editor, options.range);
+        }
+    }
     getViewState() {
         return {
             scrollState: {
@@ -217,12 +241,22 @@ MultiDiffEditorWidgetImpl = ( __decorate([
     ( __param(4, IContextKeyService)),
     ( __param(5, IInstantiationService))
 ], MultiDiffEditorWidgetImpl));
+function highlightRange(targetEditor, range) {
+    const modelNow = targetEditor.getModel();
+    const decorations = targetEditor.createDecorationsCollection([{ range, options: { description: 'symbol-navigate-action-highlight', className: 'symbolHighlight' } }]);
+    setTimeout(() => {
+        if (targetEditor.getModel() === modelNow) {
+            decorations.clear();
+        }
+    }, 350);
+}
 class VirtualizedViewItem extends Disposable {
-    constructor(viewModel, _objectPool, _scrollLeft) {
+    constructor(viewModel, _objectPool, _scrollLeft, _deltaScrollVertical) {
         super();
         this.viewModel = viewModel;
         this._objectPool = _objectPool;
         this._scrollLeft = _scrollLeft;
+        this._deltaScrollVertical = _deltaScrollVertical;
         this._templateRef = this._register(disposableObservableValue(this, undefined));
         this.contentHeight = derived(this, reader => this._templateRef.read(reader)?.object.contentHeight?.read(reader) ?? this.viewModel.lastTemplateData.read(reader).contentHeight);
         this.maxScroll = derived(this, reader => this._templateRef.read(reader)?.object.maxScroll.read(reader) ?? { maxScroll: 0, scrollWidth: 0 });
@@ -311,7 +345,7 @@ class VirtualizedViewItem extends Disposable {
         this._isHidden.set(false, undefined);
         let ref = this._templateRef.get();
         if (!ref) {
-            ref = this._objectPool.getUnusedObj(( new TemplateData(this.viewModel)));
+            ref = this._objectPool.getUnusedObj(( new TemplateData(this.viewModel, this._deltaScrollVertical)));
             this._templateRef.set(ref, undefined);
             const selections = this.viewModel.lastTemplateData.get().selections;
             if (selections) {

package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/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}.monaco-component .multiDiffEntry{border-bottom:1px solid var(--vscode-multiDiffEditor-border);display:flex;flex:1;flex-direction:column;overflow:hidden}.monaco-component .multiDiffEntry .collapse-button{cursor:pointer;margin:0 5px}.monaco-component .multiDiffEntry .collapse-button a{display:block}.monaco-component .multiDiffEntry .header{align-items:center;background:var(--vscode-editor-background);border-bottom:1px solid var(--vscode-sideBarSectionHeader-border);border-top:1px solid var(--vscode-multiDiffEditor-border);color:var(--vscode-foreground);display:flex;padding:8px 5px;z-index:1000}.monaco-component .multiDiffEntry .header.shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px}.monaco-component .multiDiffEntry .header .file-path{display:flex;flex:1;min-width:0}.monaco-component .multiDiffEntry .header .file-path .title{font-size:14px;line-height:22px}.monaco-component .multiDiffEntry .header .file-path .status{font-weight:600;line-height:22px;margin:0 10px;opacity:.75}.monaco-component .multiDiffEntry .header .file-path .title.original{flex:1;min-width:0;text-overflow:ellipsis}.monaco-component .multiDiffEntry .header .actions{padding:0 8px}.monaco-component .multiDiffEntry .editorParent{display:flex;flex:1;flex-direction:column}.monaco-component .multiDiffEntry .editorContainer{flex:1}";
+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:8px 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}}}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/common/config/editorOptions.d.ts

@@ -404,6 +404,7 @@ interface IEditorOptions {
      */
     suggest?: ISuggestOptions;
     inlineSuggest?: IInlineSuggestOptions;
+    experimentalInlineEdit?: IInlineEditOptions;
     /**
      * Smart select options.
      */
@@ -1195,6 +1196,22 @@ interface IInlineSuggestOptions {
      */
     fontFamily?: string | 'default';
 }
+interface IInlineEditOptions {
+    /**
+     * Enable or disable the rendering of automatic inline edit.
+    */
+    enabled?: boolean;
+    showToolbar?: 'always' | 'onHover' | 'never';
+    /**
+     * Font family for inline suggestions.
+     */
+    fontFamily?: string | 'default';
+    /**
+     * Does not clear active inline suggestions when the editor loses focus.
+     */
+    keepOnBlur?: boolean;
+    backgroundColoring?: boolean;
+}
 interface IBracketPairColorizationOptions {
     /**
      * Enable or disable bracket pair colorization.
@@ -1432,4 +1449,4 @@ interface IPasteAsOptions {
     showPasteSelector?: 'afterPaste' | 'never';
 }
 
-export { type EditorAutoClosingEditStrategy, type EditorAutoClosingStrategy, EditorAutoIndentStrategy, type EditorAutoSurroundStrategy, type GoToLocationValues, type IBracketPairColorizationOptions, type IDiffEditorBaseOptions, type IDiffEditorOptions, type IDropIntoEditorOptions, type IEditorCommentsOptions, type IEditorFindOptions, type IEditorHoverOptions, type IEditorInlayHintsOptions, type IEditorLightbulbOptions, type IEditorMinimapOptions, type IEditorOptions, type IEditorPaddingOptions, type IEditorParameterHintOptions, type IEditorScrollbarOptions, type IEditorStickyScrollOptions, type IGotoLocationOptions, type IGuidesOptions, type IInlineSuggestOptions, type IPasteAsOptions, type IQuickSuggestionsOptions, type IRulerOption, type ISmartSelectOptions, type ISuggestOptions, type IUnicodeHighlightOptions, type InUntrustedWorkspace, type LineNumbersType, type QuickSuggestionsValue, ShowLightbulbIconMode };
+export { type EditorAutoClosingEditStrategy, type EditorAutoClosingStrategy, EditorAutoIndentStrategy, type EditorAutoSurroundStrategy, type GoToLocationValues, type IBracketPairColorizationOptions, type IDiffEditorBaseOptions, type IDiffEditorOptions, type IDropIntoEditorOptions, type IEditorCommentsOptions, type IEditorFindOptions, type IEditorHoverOptions, type IEditorInlayHintsOptions, type IEditorLightbulbOptions, type IEditorMinimapOptions, type IEditorOptions, type IEditorPaddingOptions, type IEditorParameterHintOptions, type IEditorScrollbarOptions, type IEditorStickyScrollOptions, type IGotoLocationOptions, type IGuidesOptions, type IInlineEditOptions, type IInlineSuggestOptions, type IPasteAsOptions, type IQuickSuggestionsOptions, type IRulerOption, type ISmartSelectOptions, type ISuggestOptions, type IUnicodeHighlightOptions, type InUntrustedWorkspace, type LineNumbersType, type QuickSuggestionsValue, ShowLightbulbIconMode };