@codingame/monaco-vscode-api 2.2.2 → 3.1.0

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

@@ -21,7 +21,7 @@ import { LineTokens } from '../../../../common/tokens/lineTokens.js';
 import { renderViewLine2, RenderLineInput } from '../../../../common/viewLayout/viewLineRenderer.js';
 import { ViewLineRenderingData } from '../../../../common/viewModel.js';
 import { localizeWithPath } from '../../../../../nls.js';
-import { AudioCue, IAudioCueService } from '../../../../../platform/audioCues/browser/audioCueService.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
 import './accessibleDiffViewer.css.js';
@@ -45,7 +45,7 @@ const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.
 )));
 let AccessibleDiffViewer = class AccessibleDiffViewer extends Disposable {
     static { this._ttPolicy = createTrustedTypesPolicy('diffReview', { createHTML: value => value }); }
-    constructor(_parentNode, _visible, _setVisible, _canClose, _width, _height, _diffs, _editors, _instantiationService) {
+    constructor(_parentNode, _visible, _setVisible, _canClose, _width, _height, _diffs, _models, _instantiationService) {
         super();
         this._parentNode = _parentNode;
         this._visible = _visible;
@@ -54,7 +54,7 @@ let AccessibleDiffViewer = class AccessibleDiffViewer extends Disposable {
         this._width = _width;
         this._height = _height;
         this._diffs = _diffs;
-        this._editors = _editors;
+        this._models = _models;
         this._instantiationService = _instantiationService;
         this._state = derivedWithStore(this, (reader, store) => {
             const visible = this._visible.read(reader);
@@ -62,8 +62,8 @@ let AccessibleDiffViewer = class AccessibleDiffViewer extends Disposable {
             if (!visible) {
                 return null;
             }
-            const model = store.add(this._instantiationService.createInstance(ViewModel, this._diffs, this._editors, this._setVisible, this._canClose));
-            const view = store.add(this._instantiationService.createInstance(View, this._parentNode, model, this._width, this._height, this._editors));
+            const model = store.add(this._instantiationService.createInstance(ViewModel, this._diffs, this._models, this._setVisible, this._canClose));
+            const view = store.add(this._instantiationService.createInstance(View, this._parentNode, model, this._width, this._height, this._models));
             return { model, view, };
         }).recomputeInitiallyAndOnChange(this._store);
     }
@@ -92,13 +92,13 @@ AccessibleDiffViewer = ( __decorate([
     ( __param(8, IInstantiationService))
 ], AccessibleDiffViewer));
 let ViewModel = class ViewModel extends Disposable {
-    constructor(_diffs, _editors, _setVisible, canClose, _audioCueService) {
+    constructor(_diffs, _models, _setVisible, canClose, _accessibilitySignalService) {
         super();
         this._diffs = _diffs;
-        this._editors = _editors;
+        this._models = _models;
         this._setVisible = _setVisible;
         this.canClose = canClose;
-        this._audioCueService = _audioCueService;
+        this._accessibilitySignalService = _accessibilitySignalService;
         this._groups = observableValue(this, []);
         this._currentGroupIdx = observableValue(this, 0);
         this._currentElementIdx = observableValue(this, 0);
@@ -112,9 +112,9 @@ let ViewModel = class ViewModel extends Disposable {
                 this._groups.set([], undefined);
                 return;
             }
-            const groups = computeViewElementGroups(diffs, this._editors.original.getModel().getLineCount(), this._editors.modified.getModel().getLineCount());
+            const groups = computeViewElementGroups(diffs, this._models.getOriginalModel().getLineCount(), this._models.getModifiedModel().getLineCount());
             transaction(tx => {
-                const p = this._editors.modified.getPosition();
+                const p = this._models.getModifiedPosition();
                 if (p) {
                     const nextGroup = groups.findIndex(g => p?.lineNumber < g.range.modified.endLineNumberExclusive);
                     if (nextGroup !== -1) {
@@ -127,17 +127,17 @@ let ViewModel = class ViewModel extends Disposable {
         this._register(autorun(reader => {
             const currentViewItem = this.currentElement.read(reader);
             if (currentViewItem?.type === LineType.Deleted) {
-                this._audioCueService.playAudioCue(AudioCue.diffLineDeleted, { source: 'accessibleDiffViewer.currentElementChanged' });
+                this._accessibilitySignalService.playSignal(AccessibilitySignal.diffLineDeleted, { source: 'accessibleDiffViewer.currentElementChanged' });
             }
             else if (currentViewItem?.type === LineType.Added) {
-                this._audioCueService.playAudioCue(AudioCue.diffLineInserted, { source: 'accessibleDiffViewer.currentElementChanged' });
+                this._accessibilitySignalService.playSignal(AccessibilitySignal.diffLineInserted, { source: 'accessibleDiffViewer.currentElementChanged' });
             }
         }));
         this._register(autorun(reader => {
             const currentViewItem = this.currentElement.read(reader);
             if (currentViewItem && currentViewItem.type !== LineType.Header) {
                 const lineNumber = currentViewItem.modifiedLineNumber ?? currentViewItem.diff.modified.startLineNumber;
-                this._editors.modified.setSelection(Range.fromPositions(( new Position(lineNumber, 1))));
+                this._models.modifiedSetSelection(Range.fromPositions(( new Position(lineNumber, 1))));
             }
         }));
     }
@@ -178,30 +178,32 @@ let ViewModel = class ViewModel extends Disposable {
         });
     }
     revealCurrentElementInEditor() {
+        if (!this.canClose.get()) {
+            return;
+        }
         this._setVisible(false, undefined);
         const curElem = this.currentElement.get();
         if (curElem) {
             if (curElem.type === LineType.Deleted) {
-                this._editors.original.setSelection(Range.fromPositions(( new Position(curElem.originalLineNumber, 1))));
-                this._editors.original.revealLine(curElem.originalLineNumber);
-                this._editors.original.focus();
+                this._models.originalReveal(Range.fromPositions(( new Position(curElem.originalLineNumber, 1))));
             }
             else {
-                if (curElem.type !== LineType.Header) {
-                    this._editors.modified.setSelection(Range.fromPositions(( new Position(curElem.modifiedLineNumber, 1))));
-                    this._editors.modified.revealLine(curElem.modifiedLineNumber);
-                }
-                this._editors.modified.focus();
+                this._models.modifiedReveal(curElem.type !== LineType.Header
+                    ? Range.fromPositions(( new Position(curElem.modifiedLineNumber, 1)))
+                    : undefined);
             }
         }
     }
     close() {
+        if (!this.canClose.get()) {
+            return;
+        }
         this._setVisible(false, undefined);
-        this._editors.modified.focus();
+        this._models.modifiedFocus();
     }
 };
 ViewModel = ( __decorate([
-    ( __param(4, IAudioCueService))
+    ( __param(4, IAccessibilitySignalService))
 ], ViewModel));
 const viewElementGroupLineMargin = 3;
 function computeViewElementGroups(diffs, originalLineCount, modifiedLineCount) {
@@ -289,16 +291,16 @@ class UnchangedLineViewElement {
     }
 }
 let View = class View extends Disposable {
-    constructor(_element, _model, _width, _height, _editors, _languageService) {
+    constructor(_element, _model, _width, _height, _models, _languageService) {
         super();
         this._element = _element;
         this._model = _model;
         this._width = _width;
         this._height = _height;
-        this._editors = _editors;
+        this._models = _models;
         this._languageService = _languageService;
         this.domNode = this._element;
-        this.domNode.className = 'diff-review monaco-editor-background';
+        this.domNode.className = 'monaco-component diff-review monaco-editor-background';
         const actionBarContainer = document.createElement('div');
         actionBarContainer.className = 'diff-review-actions';
         this._actionBar = this._register(( new ActionBar(actionBarContainer)));
@@ -317,6 +319,11 @@ let View = class View extends Disposable {
         this._content.setAttribute('role', 'code');
         this._scrollbar = this._register(( new DomScrollableElement(this._content, {})));
         reset(this.domNode, this._scrollbar.getDomNode(), actionBarContainer);
+        this._register(autorun(r => {
+            this._height.read(r);
+            this._width.read(r);
+            this._scrollbar.scanDomNode();
+        }));
         this._register(toDisposable(() => { reset(this.domNode); }));
         this._register(applyStyle(this.domNode, { width: this._width, height: this._height }));
         this._register(applyStyle(this._content, { width: this._width, height: this._height }));
@@ -352,8 +359,8 @@ let View = class View extends Disposable {
         }));
     }
     _render(store) {
-        const originalOptions = this._editors.original.getOptions();
-        const modifiedOptions = this._editors.modified.getOptions();
+        const originalOptions = this._models.getOriginalOptions();
+        const modifiedOptions = this._models.getModifiedOptions();
         const container = document.createElement('div');
         container.className = 'diff-review-table';
         container.setAttribute('role', 'list');
@@ -364,14 +371,14 @@ let View = class View extends Disposable {
         )));
         applyFontInfo(container, modifiedOptions.get(50 ));
         reset(this._content, container);
-        const originalModel = this._editors.original.getModel();
-        const modifiedModel = this._editors.modified.getModel();
+        const originalModel = this._models.getOriginalModel();
+        const modifiedModel = this._models.getModifiedModel();
         if (!originalModel || !modifiedModel) {
             return;
         }
         const originalModelOpts = originalModel.getOptions();
         const modifiedModelOpts = modifiedModel.getOptions();
-        const lineHeight = modifiedOptions.get(66 );
+        const lineHeight = modifiedOptions.get(67 );
         const group = this._model.currentGroup.get();
         for (const viewItem of group?.lines || []) {
             if (!group) {
@@ -439,9 +446,9 @@ let View = class View extends Disposable {
         this._scrollbar.scanDomNode();
     }
     _createRow(item, lineHeight, width, originalOptions, originalModel, originalModelOpts, modifiedOptions, modifiedModel, modifiedModelOpts) {
-        const originalLayoutInfo = originalOptions.get(143 );
+        const originalLayoutInfo = originalOptions.get(144 );
         const originalLineNumbersWidth = originalLayoutInfo.glyphMarginWidth + originalLayoutInfo.lineNumbersWidth;
-        const modifiedLayoutInfo = modifiedOptions.get(143 );
+        const modifiedLayoutInfo = modifiedOptions.get(144 );
         const modifiedLineNumbersWidth = 10 + modifiedLayoutInfo.glyphMarginWidth + modifiedLayoutInfo.lineNumbersWidth;
         let rowClassName = 'diff-review-row';
         let lineNumbersExtraClassName = '';
@@ -593,9 +600,9 @@ let View = class View extends Disposable {
             fontInfo.spaceWidth,
             fontInfo.middotWidth,
             fontInfo.wsmiddotWidth,
-            options.get(116 ),
-            options.get(98 ),
-            options.get(93 ),
+            options.get(117 ),
+            options.get(99 ),
+            options.get(94 ),
             options.get(51 ) !== EditorFontLigatures.OFF,
             null
         )));
@@ -605,4 +612,42 @@ let View = class View extends Disposable {
 View = ( __decorate([
     ( __param(5, ILanguageService))
 ], View));
-export { AccessibleDiffViewer };
+class AccessibleDiffViewerModelFromEditors {
+    constructor(editors) {
+        this.editors = editors;
+    }
+    getOriginalModel() {
+        return this.editors.original.getModel();
+    }
+    getOriginalOptions() {
+        return this.editors.original.getOptions();
+    }
+    originalReveal(range) {
+        this.editors.original.revealRange(range);
+        this.editors.original.setSelection(range);
+        this.editors.original.focus();
+    }
+    getModifiedModel() {
+        return this.editors.modified.getModel();
+    }
+    getModifiedOptions() {
+        return this.editors.modified.getOptions();
+    }
+    modifiedReveal(range) {
+        if (range) {
+            this.editors.modified.revealRange(range);
+            this.editors.modified.setSelection(range);
+        }
+        this.editors.modified.focus();
+    }
+    modifiedSetSelection(range) {
+        this.editors.modified.setSelection(range);
+    }
+    modifiedFocus() {
+        this.editors.modified.focus();
+    }
+    getModifiedPosition() {
+        return this.editors.modified.getPosition() ?? undefined;
+    }
+}
+export { AccessibleDiffViewer, AccessibleDiffViewerModelFromEditors };

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

@@ -8,6 +8,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 import { Position } from '../../../../common/core/position.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import { derivedOpts } from '../../../../../base/common/observableInternal/derived.js';
 import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
 let DiffEditorEditors = class DiffEditorEditors extends Disposable {
     get onDidContentSizeChange() { return this._onDidContentSizeChange.event; }
@@ -26,7 +27,8 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         this.modifiedScrollTop = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollTop());
         this.modifiedScrollHeight = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollHeight());
         this.modifiedSelections = observableFromEvent(this.modified.onDidChangeCursorSelection, () => this.modified.getSelections() ?? []);
-        this.modifiedCursor = observableFromEvent(this.modified.onDidChangeCursorPosition, () => this.modified.getPosition() ?? ( new Position(1, 1)));
+        this.modifiedCursor = derivedOpts({ owner: this, equalityComparer: 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._register(autorunHandleChanges({
             createEmptyChangeSummary: () => ({}),
             handleChange: (ctx, changeSummary) => {

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

@@ -51,12 +51,12 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             updateImmediately.schedule();
         } }));
         this._register(this._editors.original.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(144 ) || args.hasChanged(66 )) {
+            if (args.hasChanged(145 ) || args.hasChanged(67 )) {
                 updateImmediately.schedule();
             }
         }));
         this._register(this._editors.modified.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(144 ) || args.hasChanged(66 )) {
+            if (args.hasChanged(145 ) || args.hasChanged(67 )) {
                 updateImmediately.schedule();
             }
         }));
@@ -131,7 +131,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             }
             const lineBreakData = deletedCodeLineBreaksComputer?.finalize() ?? [];
             let lineBreakDataIdx = 0;
-            const modLineHeight = this._editors.modified.getOption(66 );
+            const modLineHeight = this._editors.modified.getOption(67 );
             const syncedMovedText = this._diffModel.read(reader)?.movedTextToCompare.read(reader);
             const mightContainNonBasicASCII = this._editors.original.getModel()?.mightContainNonBasicASCII() ?? false;
             const mightContainRTL = this._editors.original.getModel()?.mightContainRTL() ?? false;
@@ -359,8 +359,8 @@ DiffEditorViewZones = ( __decorate([
 function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEditorAlignmentViewZones, modifiedEditorAlignmentViewZones, innerHunkAlignment) {
     const originalLineHeightOverrides = ( new ArrayQueue(getAdditionalLineHeights(originalEditor, originalEditorAlignmentViewZones)));
     const modifiedLineHeightOverrides = ( new ArrayQueue(getAdditionalLineHeights(modifiedEditor, modifiedEditorAlignmentViewZones)));
-    const origLineHeight = originalEditor.getOption(66 );
-    const modLineHeight = modifiedEditor.getOption(66 );
+    const origLineHeight = originalEditor.getOption(67 );
+    const modLineHeight = modifiedEditor.getOption(67 );
     const result = [];
     let lastOriginalLineNumber = 0;
     let lastModifiedLineNumber = 0;
@@ -465,9 +465,9 @@ function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEd
 function getAdditionalLineHeights(editor, viewZonesToIgnore) {
     const viewZoneHeights = [];
     const wrappingZoneHeights = [];
-    const hasWrapping = editor.getOption(144 ).wrappingColumn !== -1;
+    const hasWrapping = editor.getOption(145 ).wrappingColumn !== -1;
     const coordinatesConverter = editor._getViewModel().coordinatesConverter;
-    const editorLineHeight = editor.getOption(66 );
+    const editorLineHeight = editor.getOption(67 );
     if (hasWrapping) {
         for (let i = 1; i <= editor.getModel().getLineCount(); i++) {
             const lineCount = coordinatesConverter.getModelLineViewLineCount(i);

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

@@ -31,14 +31,14 @@ class InlineDiffDeletedCodeMargin extends Disposable {
         this._diffActions = document.createElement('div');
         this._diffActions.className = ThemeIcon.asClassName(Codicon.lightBulb) + ' lightbulb-glyph';
         this._diffActions.style.position = 'absolute';
-        const lineHeight = this._modifiedEditor.getOption(66 );
+        const lineHeight = this._modifiedEditor.getOption(67 );
         this._diffActions.style.right = '0px';
         this._diffActions.style.visibility = 'hidden';
         this._diffActions.style.height = `${lineHeight}px`;
         this._diffActions.style.lineHeight = `${lineHeight}px`;
         this._marginDomNode.appendChild(this._diffActions);
         let currentLineNumberOffset = 0;
-        const useShadowDOM = _modifiedEditor.getOption(126 ) && !isIOS;
+        const useShadowDOM = _modifiedEditor.getOption(127 ) && !isIOS;
         const showContextMenu = (x, y) => {
             this._contextMenuService.showContextMenu({
                 domForShadowRoot: useShadowDOM ? _modifiedEditor.getDomNode() ?? undefined : undefined,
@@ -94,7 +94,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                             await this._clipboardService.writeText(lineContent);
                         })));
                     }
-                    const readOnly = _modifiedEditor.getOption(90 );
+                    const readOnly = _modifiedEditor.getOption(91 );
                     if (!readOnly) {
                         actions.push(( new Action('diff.inline.revertChange', ( localizeWithPath(
                             'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',

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

@@ -57,18 +57,18 @@ class RenderOptions {
     static fromEditor(editor) {
         const modifiedEditorOptions = editor.getOptions();
         const fontInfo = modifiedEditorOptions.get(50 );
-        const layoutInfo = modifiedEditorOptions.get(143 );
+        const layoutInfo = modifiedEditorOptions.get(144 );
         return ( new RenderOptions(
             editor.getModel()?.getOptions().tabSize || 0,
             fontInfo,
             modifiedEditorOptions.get(33 ),
             fontInfo.typicalHalfwidthCharacterWidth,
-            modifiedEditorOptions.get(103 ),
-            modifiedEditorOptions.get(66 ),
+            modifiedEditorOptions.get(104 ),
+            modifiedEditorOptions.get(67 ),
             layoutInfo.decorationsWidth,
-            modifiedEditorOptions.get(116 ),
-            modifiedEditorOptions.get(98 ),
-            modifiedEditorOptions.get(93 ),
+            modifiedEditorOptions.get(117 ),
+            modifiedEditorOptions.get(99 ),
+            modifiedEditorOptions.get(94 ),
             modifiedEditorOptions.get(51 )
         ));
     }

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,