@codingame/monaco-vscode-api 2.2.2 → 3.0.0

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

@@ -1,45 +1,45 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import '../services/markerDecorations.js';
-import './media/editor.css.js';
-import { localizeWithPath } from '../../../nls.js';
 import { DragAndDropObserver, getWindow, scheduleAtNextAnimationFrame, trackFocus } from '../../../base/browser/dom.js';
 import { onUnexpectedError } from '../../../base/common/errors.js';
 import { createEventDeliveryQueue, Emitter } from '../../../base/common/event.js';
 import { hash } from '../../../base/common/hash.js';
 import { Disposable, dispose } from '../../../base/common/lifecycle.js';
 import { Schemas } from '../../../base/common/network.js';
+import './media/editor.css.js';
+import { applyFontInfo } from '../config/domFontInfo.js';
 import { EditorConfiguration } from '../config/editorConfiguration.js';
+import { TabFocus } from '../config/tabFocus.js';
 import { EditorExtensionsRegistry } from '../editorExtensions.js';
 import { ICodeEditorService } from '../services/codeEditorService.js';
 import { View } from '../view.js';
+import { DOMLineBreaksComputerFactory } from '../view/domLineBreaksComputer.js';
 import { ViewUserInputEvents } from '../view/viewUserInputEvents.js';
+import { CodeEditorContributions } from './codeEditorContributions.js';
 import { filterValidationDecorations } from '../../common/config/editorOptions.js';
 import { CursorColumns } from '../../common/core/cursorColumns.js';
+import { editorUnnecessaryCodeOpacity } from '../../common/core/editorColorRegistry.js';
 import { Position } from '../../common/core/position.js';
 import { Range } from '../../common/core/range.js';
 import { Selection } from '../../common/core/selection.js';
+import { WordOperations } from '../../common/cursor/cursorWordOperations.js';
 import { InternalEditorAction } from '../../common/editorAction.js';
 import { EditorType } from '../../common/editorCommon.js';
 import { EditorContextKeys } from '../../common/editorContextKeys.js';
+import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
 import { ModelDecorationOptions } from '../../common/model/textModel.js';
-import { editorUnnecessaryCodeOpacity } from '../../common/core/editorColorRegistry.js';
-import { editorErrorForeground, editorWarningForeground, editorInfoForeground, editorHintForeground } from '../../../platform/theme/common/colorRegistry.js';
+import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
+import { MonospaceLineBreaksComputerFactory } from '../../common/viewModel/monospaceLineBreaksComputer.js';
 import { ViewModel } from '../../common/viewModel/viewModelImpl.js';
+import { localizeWithPath } from '../../../nls.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.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';
 import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
 import { Severity, INotificationService } from '../../../platform/notification/common/notification.js';
+import { editorErrorForeground, editorWarningForeground, editorInfoForeground, editorHintForeground } from '../../../platform/theme/common/colorRegistry.js';
 import { registerThemingParticipant, IThemeService } from '../../../platform/theme/common/themeService.js';
-import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
-import { MonospaceLineBreaksComputerFactory } from '../../common/viewModel/monospaceLineBreaksComputer.js';
-import { DOMLineBreaksComputerFactory } from '../view/domLineBreaksComputer.js';
-import { WordOperations } from '../../common/cursor/cursorWordOperations.js';
-import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
-import { applyFontInfo } from '../config/domFontInfo.js';
-import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
-import { CodeEditorContributions } from './codeEditorContributions.js';
-import { TabFocus } from '../config/tabFocus.js';
 var CodeEditorWidget_1;
 let EDITOR_ID = 0;
 class ModelData {
@@ -167,8 +167,8 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         this._register(this._configuration.onDidChange((e) => {
             this._onDidChangeConfiguration.fire(e);
             const options = this._configuration.options;
-            if (e.hasChanged(143 )) {
-                const layoutInfo = options.get(143 );
+            if (e.hasChanged(144 )) {
+                const layoutInfo = options.get(144 );
                 this._onDidLayoutChange.fire(layoutInfo);
             }
         }));
@@ -217,7 +217,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
             this._actions.set(internalAction.id, internalAction);
         }
         const isDropIntoEnabled = () => {
-            return !this._configuration.options.get(90 )
+            return !this._configuration.options.get(91 )
                 && this._configuration.options.get(36 ).enabled;
         };
         this._register(new DragAndDropObserver(this._domElement, {
@@ -303,7 +303,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         if (!this._modelData) {
             return null;
         }
-        return WordOperations.getWordAtPosition(this._modelData.model, this._configuration.options.get(129 ), position);
+        return WordOperations.getWordAtPosition(this._modelData.model, this._configuration.options.get(130 ), position);
     }
     getValue(options = null) {
         if (!this._modelData) {
@@ -353,7 +353,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         this._removeDecorationTypes();
         this._onDidChangeModel.fire(e);
         this._postDetachModelCleanup(detachedModel);
-        this._contributions.onAfterModelAttached();
+        this._contributionsDisposable = this._contributions.onAfterModelAttached();
     }
     _removeDecorationTypes() {
         this._decorationTypeKeysToIds = {};
@@ -860,7 +860,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         if (!this._modelData) {
             return false;
         }
-        if (this._configuration.options.get(90 )) {
+        if (this._configuration.options.get(91 )) {
             return false;
         }
         this._modelData.model.pushStackElement();
@@ -870,7 +870,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         if (!this._modelData) {
             return false;
         }
-        if (this._configuration.options.get(90 )) {
+        if (this._configuration.options.get(91 )) {
             return false;
         }
         this._modelData.model.popStackElement();
@@ -880,7 +880,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         if (!this._modelData) {
             return false;
         }
-        if (this._configuration.options.get(90 )) {
+        if (this._configuration.options.get(91 )) {
             return false;
         }
         let cursorStateComputer;
@@ -973,7 +973,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
             }
         }
         const oldDecorationsIds = this._decorationTypeKeysToIds[decorationTypeKey] || [];
-        this._decorationTypeKeysToIds[decorationTypeKey] = this.deltaDecorations(oldDecorationsIds, newModelDecorations);
+        this.changeDecorations(accessor => this._decorationTypeKeysToIds[decorationTypeKey] = accessor.deltaDecorations(oldDecorationsIds, newModelDecorations));
     }
     setDecorationsByTypeFast(decorationTypeKey, ranges) {
         const oldDecorationsSubTypes = this._decorationTypeSubtypes[decorationTypeKey] || {};
@@ -987,12 +987,12 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
             newModelDecorations[i] = { range: ranges[i], options: opts };
         }
         const oldDecorationsIds = this._decorationTypeKeysToIds[decorationTypeKey] || [];
-        this._decorationTypeKeysToIds[decorationTypeKey] = this.deltaDecorations(oldDecorationsIds, newModelDecorations);
+        this.changeDecorations(accessor => this._decorationTypeKeysToIds[decorationTypeKey] = accessor.deltaDecorations(oldDecorationsIds, newModelDecorations));
     }
     removeDecorationsByType(decorationTypeKey) {
         const oldDecorationsIds = this._decorationTypeKeysToIds[decorationTypeKey];
         if (oldDecorationsIds) {
-            this.deltaDecorations(oldDecorationsIds, []);
+            this.changeDecorations(accessor => accessor.deltaDecorations(oldDecorationsIds, []));
         }
         if (this._decorationTypeKeysToIds.hasOwnProperty(decorationTypeKey)) {
             delete this._decorationTypeKeysToIds[decorationTypeKey];
@@ -1003,7 +1003,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     }
     getLayoutInfo() {
         const options = this._configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         return layoutInfo;
     }
     createOverviewRuler(cssClassName) {
@@ -1171,13 +1171,13 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         }
         const position = this._modelData.model.validatePosition(rawPosition);
         const options = this._configuration.options;
-        const layoutInfo = options.get(143 );
+        const layoutInfo = options.get(144 );
         const top = CodeEditorWidget_1._getVerticalOffsetForPosition(this._modelData, position.lineNumber, position.column) - this.getScrollTop();
         const left = this._modelData.view.getOffsetForColumn(position.lineNumber, position.column) + layoutInfo.glyphMarginWidth + layoutInfo.lineNumbersWidth + layoutInfo.decorationsWidth - this.getScrollLeft();
         return {
             top: top,
             left: left,
-            height: options.get(66 )
+            height: options.get(67 )
         };
     }
     getOffsetForColumn(lineNumber, column) {
@@ -1255,7 +1255,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                     break;
                 case 6 : {
                     if (e.reachedMaxCursorCount) {
-                        const multiCursorLimit = this.getOption(79 );
+                        const multiCursorLimit = this.getOption(80 );
                         const message = ( localizeWithPath(
                             'vs/editor/browser/widget/codeEditorWidget',
                             'cursors.maximum',
@@ -1432,6 +1432,8 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         detachedModel?.removeAllDecorationsWithOwnerId(this._id);
     }
     _detachModel() {
+        this._contributionsDisposable?.dispose();
+        this._contributionsDisposable = undefined;
         if (!this._modelData) {
             return null;
         }
@@ -1558,7 +1560,7 @@ class EditorContextKeysManager extends Disposable {
     _updateFromConfig() {
         const options = this._editor.getOptions();
         this._tabMovesFocus.set(TabFocus.getTabFocusMode());
-        this._editorReadonly.set(options.get(90 ));
+        this._editorReadonly.set(options.get(91 ));
         this._inDiffEditor.set(options.get(61 ));
         this._editorColumnSelection.set(options.get(22 ));
     }
@@ -1609,7 +1611,7 @@ class EditorModeContext extends Disposable {
         this._hasDocumentSelectionFormattingProvider = EditorContextKeys.hasDocumentSelectionFormattingProvider.bindTo(_contextKeyService);
         this._hasMultipleDocumentFormattingProvider = EditorContextKeys.hasMultipleDocumentFormattingProvider.bindTo(_contextKeyService);
         this._hasMultipleDocumentSelectionFormattingProvider = EditorContextKeys.hasMultipleDocumentSelectionFormattingProvider.bindTo(_contextKeyService);
-        this._isInWalkThrough = EditorContextKeys.isInWalkThroughSnippet.bindTo(_contextKeyService);
+        this._isInEmbeddedEditor = EditorContextKeys.isInEmbeddedEditor.bindTo(_contextKeyService);
         const update = () => this._update();
         this._register(_editor.onDidChangeModel(update));
         this._register(_editor.onDidChangeModelLanguage(update));
@@ -1652,7 +1654,7 @@ class EditorModeContext extends Disposable {
             this._hasDocumentFormattingProvider.reset();
             this._hasDocumentSelectionFormattingProvider.reset();
             this._hasSignatureHelpProvider.reset();
-            this._isInWalkThrough.reset();
+            this._isInEmbeddedEditor.reset();
         });
     }
     _update() {
@@ -1681,7 +1683,7 @@ class EditorModeContext extends Disposable {
             this._hasDocumentSelectionFormattingProvider.set(( this._languageFeaturesService.documentRangeFormattingEditProvider.has(model)));
             this._hasMultipleDocumentFormattingProvider.set(this._languageFeaturesService.documentFormattingEditProvider.all(model).length + this._languageFeaturesService.documentRangeFormattingEditProvider.all(model).length > 1);
             this._hasMultipleDocumentSelectionFormattingProvider.set(this._languageFeaturesService.documentRangeFormattingEditProvider.all(model).length > 1);
-            this._isInWalkThrough.set(model.uri.scheme === Schemas.walkThroughSnippet);
+            this._isInEmbeddedEditor.set(model.uri.scheme === Schemas.walkThroughSnippet || model.uri.scheme === Schemas.vscodeChatCodeBlock);
         });
     }
 }

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-diff-editor .diff-review-line-number{color:var(--vscode-editorLineNumber-foreground);display:inline-block;text-align:right}.monaco-diff-editor .diff-review{position:absolute;user-select:none;-webkit-user-select:none;z-index:99}.monaco-diff-editor .diff-review-summary{padding-left:10px}.monaco-diff-editor .diff-review-shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 -6px 6px -6px inset;position:absolute}.monaco-diff-editor .diff-review-row{white-space:pre}.monaco-diff-editor .diff-review-table{display:table;min-width:100%}.monaco-diff-editor .diff-review-row{display:table-row;width:100%}.monaco-diff-editor .diff-review-spacer{display:inline-block;vertical-align:middle;width:10px}.monaco-diff-editor .diff-review-spacer>.codicon{font-size:9px!important}.monaco-diff-editor .diff-review-actions{display:inline-block;position:absolute;right:10px;top:2px;z-index:100}.monaco-diff-editor .diff-review-actions .action-label{height:16px;margin:2px 0;width:16px}.monaco-diff-editor .revertButton{cursor:pointer}";
+var css = ".monaco-component.diff-review{user-select:none;-webkit-user-select:none;z-index:99}.monaco-diff-editor .diff-review{position:absolute}.monaco-component.diff-review .diff-review-line-number{color:var(--vscode-editorLineNumber-foreground);display:inline-block;text-align:right}.monaco-component.diff-review .diff-review-summary{padding-left:10px}.monaco-component.diff-review .diff-review-shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 -6px 6px -6px inset;position:absolute}.monaco-component.diff-review .diff-review-row{white-space:pre}.monaco-component.diff-review .diff-review-table{display:table;min-width:100%}.monaco-component.diff-review .diff-review-row{display:table-row;width:100%}.monaco-component.diff-review .diff-review-spacer{display:inline-block;vertical-align:middle;width:10px}.monaco-component.diff-review .diff-review-spacer>.codicon{font-size:9px!important}.monaco-component.diff-review .diff-review-actions{display:inline-block;position:absolute;right:10px;top:2px;z-index:100}.monaco-component.diff-review .diff-review-actions .action-label{height:16px;margin:2px 0;width:16px}.monaco-component.diff-review .revertButton{cursor:pointer}";
 n(css,{});
 export { css, css as default };

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 )
         ));
     }