@codingame/monaco-vscode-api 10.1.4 → 11.0.1

package/vscode/src/vs/base/common/uriIpc.js

@@ -1,5 +1,6 @@
 import { VSBuffer } from './buffer.js';
 import { URI } from './uri.js';
+
 const DefaultURITransformer = new class {
     transformIncoming(uri) {
         return uri;
@@ -50,4 +51,5 @@ function transformAndReviveIncomingURIs(obj, transformer) {
     }
     return result;
 }
+
 export { DefaultURITransformer, transformAndReviveIncomingURIs, transformIncomingURIs };

package/vscode/src/vs/base/common/uuid.js

@@ -52,4 +52,5 @@ const generateUuid = ( (function() {
         return result;
     };
 })());
+
 export { generateUuid, isUUID };

package/vscode/src/vs/base/common/verifier.js

@@ -1,4 +1,5 @@
 import { isObject } from './types.js';
+
 class Verifier {
     constructor(defaultValue) {
         this.defaultValue = defaultValue;
@@ -59,4 +60,5 @@ function verifyObject(verifiers, value) {
     }
     return result;
 }
+
 export { BooleanVerifier, EnumVerifier, NumberVerifier, ObjectVerifier, SetVerifier, verifyObject };

package/vscode/src/vs/base/common/worker/simpleWorker.js

@@ -1,8 +1,9 @@
-import { onUnexpectedError, transformErrorForSerialization } from '../errors.js';
+import { transformErrorForSerialization, onUnexpectedError } from '../errors.js';
 import { Emitter } from '../event.js';
 import { Disposable } from '../lifecycle.js';
 import { isWeb } from '../platform.js';
 import { isUpperAsciiLetter } from '../strings.js';
+
 const DEFAULT_CHANNEL = 'default';
 const INITIALIZE = '$initialize';
 let webWorkerWarningLogged = false;
@@ -222,7 +223,7 @@ class SimpleWorkerClient extends Disposable {
         this._localChannels = ( new Map());
         this._remoteChannels = ( new Map());
         this._worker = this._register(workerFactory.create({
-            amdModuleId: 'vs/base/common/worker/simpleWorker',
+            moduleId: 'vs/base/common/worker/simpleWorker',
             esmModuleLocation: workerDescriptor.esmModuleLocation,
             label: workerDescriptor.label
         }, (msg) => {
@@ -249,11 +250,11 @@ class SimpleWorkerClient extends Disposable {
         this._onModuleLoaded = this._protocol.sendMessage(DEFAULT_CHANNEL, INITIALIZE, [
             this._worker.getId(),
             JSON.parse(JSON.stringify(loaderConfiguration)),
-            workerDescriptor.amdModuleId,
+            workerDescriptor.moduleId,
         ]);
         this.proxy = this._protocol.createProxyToRemoteChannel(DEFAULT_CHANNEL, async () => { await this._onModuleLoaded; });
         this._onModuleLoaded.catch((e) => {
-            this._onError('Worker failed to load ' + workerDescriptor.amdModuleId, e);
+            this._onError('Worker failed to load ' + workerDescriptor.moduleId, e);
         });
     }
     _handleMessage(channelName, method, args) {
@@ -405,4 +406,5 @@ class SimpleWorkerServer {
         return Promise.reject(( new Error(`Unexpected usage`)));
     }
 }
+
 export { SimpleWorkerClient, SimpleWorkerServer, logOnceWebWorkerWarning };

package/vscode/src/vs/base/common/worker/simpleWorkerBootstrap.js

@@ -1,4 +1,5 @@
 import { SimpleWorkerServer } from './simpleWorker.js';
+
 let initialized = false;
 function initialize(factory) {
     if (initialized) {
@@ -20,4 +21,5 @@ function bootstrapSimpleWorker(factory) {
         }
     };
 }
+
 export { bootstrapSimpleWorker };

package/vscode/src/vs/base/parts/ipc/common/ipc.js

@@ -2,14 +2,16 @@ import { __decorate } from '../../../../../../../external/tslib/tslib.es6.js';
 import '../../../common/arrays.js';
 import { createCancelablePromise } from '../../../common/async.js';
 import { VSBuffer } from '../../../common/buffer.js';
-import { CancellationToken, CancellationTokenSource } from '../../../common/cancellation.js';
+import { CancellationTokenSource, CancellationToken } from '../../../common/cancellation.js';
 import { memoize } from '../../../common/decorators.js';
 import { CancellationError } from '../../../common/errors.js';
-import { Relay, Emitter, Event } from '../../../common/event.js';
-import { toDisposable, dispose, combinedDisposable } from '../../../common/lifecycle.js';
+import { Emitter, Event, Relay } from '../../../common/event.js';
+import { createSingleCallFunction } from '../../../common/functional.js';
+import { toDisposable, dispose } from '../../../common/lifecycle.js';
 import '../../../common/path.js';
 import '../../../common/platform.js';
 import '../../../common/strings.js';
+
 function requestTypeToStr(type) {
     switch (type) {
         case 100 :
@@ -380,6 +382,7 @@ class ChannelClient {
             return Promise.reject(( new CancellationError()));
         }
         let disposable;
+        let disposableWithRequestCancel;
         const result = ( new Promise((c, e) => {
             if (cancellationToken.isCancellationRequested) {
                 return e(( new CancellationError()));
@@ -429,13 +432,18 @@ class ChannelClient {
                 }
                 e(( new CancellationError()));
             };
-            const cancellationTokenListener = cancellationToken.onCancellationRequested(cancel);
-            disposable = combinedDisposable(toDisposable(cancel), cancellationTokenListener);
-            this.activeRequests.add(disposable);
+            disposable = cancellationToken.onCancellationRequested(cancel);
+            disposableWithRequestCancel = {
+                dispose: createSingleCallFunction(() => {
+                    cancel();
+                    disposable.dispose();
+                })
+            };
+            this.activeRequests.add(disposableWithRequestCancel);
         }));
         return result.finally(() => {
             disposable.dispose();
-            this.activeRequests.delete(disposable);
+            this.activeRequests.delete(disposableWithRequestCancel);
         });
     }
     requestEvent(channelName, name, arg) {
@@ -445,12 +453,20 @@ class ChannelClient {
         let uninitializedPromise = null;
         const emitter = ( new Emitter({
             onWillAddFirstListener: () => {
-                uninitializedPromise = createCancelablePromise(_ => this.whenInitialized());
-                uninitializedPromise.then(() => {
-                    uninitializedPromise = null;
+                const doRequest = () => {
                     this.activeRequests.add(emitter);
                     this.sendRequest(request);
-                });
+                };
+                if (this.state === State.Idle) {
+                    doRequest();
+                }
+                else {
+                    uninitializedPromise = createCancelablePromise(_ => this.whenInitialized());
+                    uninitializedPromise.then(() => {
+                        uninitializedPromise = null;
+                        doRequest();
+                    });
+                }
             },
             onDidRemoveLastListener: () => {
                 if (uninitializedPromise) {
@@ -579,4 +595,5 @@ function getDelayedChannel(promise) {
         }
     };
 }
+
 export { BufferReader, BufferWriter, ChannelClient, ChannelServer, IPCClient, deserialize, getDelayedChannel, serialize };

package/vscode/src/vs/base/parts/ipc/common/ipc.net.js

@@ -2,6 +2,7 @@ import { VSBuffer } from '../../../common/buffer.js';
 import { Emitter } from '../../../common/event.js';
 import { Disposable, DisposableStore } from '../../../common/lifecycle.js';
 import { IPCClient } from './ipc.js';
+
 var SocketDiagnostics;
 ( (function(SocketDiagnostics) {
     SocketDiagnostics.enableDiagnostics = false;
@@ -736,4 +737,5 @@ class PersistentProtocol {
         this._socketWriter.write(msg);
     }
 }
+
 export { BufferedEmitter, ChunkStream, Client, PersistentProtocol, Protocol, SocketDiagnostics };

package/vscode/src/vs/base/parts/request/common/request.js

@@ -11,4 +11,5 @@ class OfflineError extends Error {
         this.name = this.message;
     }
 }
+
 export { OfflineError, isOfflineError };

package/vscode/src/vs/base/parts/storage/common/storage.js

@@ -3,6 +3,7 @@ import { PauseableEmitter, Event } from '../../../common/event.js';
 import { Disposable } from '../../../common/lifecycle.js';
 import { parse, stringify } from '../../../common/marshalling.js';
 import { isUndefinedOrNull, isObject } from '../../../common/types.js';
+
 var StorageHint;
 ( (function(StorageHint) {
     StorageHint[StorageHint["STORAGE_DOES_NOT_EXIST"] = 0] = "STORAGE_DOES_NOT_EXIST";
@@ -223,4 +224,5 @@ class InMemoryStorageDatabase {
     async optimize() { }
     async close() { }
 }
+
 export { InMemoryStorageDatabase, Storage, StorageHint, StorageState, isStorageItemsChangeEvent };

package/vscode/src/vs/editor/browser/config/charWidthReader.js

@@ -1,4 +1,5 @@
 import { applyFontInfo } from './domFontInfo.js';
+
 class CharWidthRequest {
     constructor(chr, type) {
         this.chr = chr;
@@ -89,4 +90,5 @@ function readCharWidths(targetWindow, bareFontInfo, requests) {
     const reader = ( new DomCharWidthReader(bareFontInfo, requests));
     reader.read(targetWindow);
 }
+
 export { CharWidthRequest, readCharWidths };

package/vscode/src/vs/editor/browser/config/domFontInfo.js

@@ -1,4 +1,5 @@
 import { FastDomNode } from '../../../base/browser/fastDomNode.js';
+
 function applyFontInfo(domNode, fontInfo) {
     if (domNode instanceof FastDomNode) {
         domNode.setFontFamily(fontInfo.getMassagedFontFamily());
@@ -19,4 +20,5 @@ function applyFontInfo(domNode, fontInfo) {
         domNode.style.letterSpacing = fontInfo.letterSpacing + 'px';
     }
 }
+
 export { applyFontInfo };

package/vscode/src/vs/editor/browser/config/editorConfiguration.js

@@ -15,6 +15,7 @@ import { BareFontInfo } from '../../common/config/fontInfo.js';
 import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.service.js';
 import { getWindow, getWindowById } from '../../../base/browser/dom.js';
 import { PixelRatio } from '../../../base/browser/pixelRatio.js';
+
 let EditorConfiguration = class EditorConfiguration extends Disposable {
     constructor(isSimpleWidget, contextMenuId, isStandaloneEditor, options, container, _accessibilityService) {
         super();
@@ -266,4 +267,5 @@ function deepCloneAndMigrateOptions(_options) {
     migrateOptions(options);
     return options;
 }
+
 export { ComputedEditorOptions, EditorConfiguration, EditorOptionsUtil };

package/vscode/src/vs/editor/browser/config/elementSizeObserver.js

@@ -1,6 +1,7 @@
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { Emitter } from '../../../base/common/event.js';
 import { scheduleAtNextAnimationFrame, getWindow } from '../../../base/browser/dom.js';
+
 class ElementSizeObserver extends Disposable {
     constructor(referenceDomElement, dimension) {
         super();
@@ -94,4 +95,5 @@ class ElementSizeObserver extends Disposable {
         }
     }
 }
+
 export { ElementSizeObserver };

package/vscode/src/vs/editor/browser/config/fontMeasurements.js

@@ -2,9 +2,10 @@ import { getWindowId } from '../../../base/browser/dom.js';
 import { PixelRatio } from '../../../base/browser/pixelRatio.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { readCharWidths, CharWidthRequest } from './charWidthReader.js';
+import { CharWidthRequest, readCharWidths } from './charWidthReader.js';
 import { EditorFontLigatures } from '../../common/config/editorOptions.js';
 import { SERIALIZED_FONT_INFO_VERSION, FontInfo } from '../../common/config/fontInfo.js';
+
 class FontMeasurementsImpl extends Disposable {
     constructor() {
         super(...arguments);
@@ -196,4 +197,5 @@ class FontMeasurementsCache {
     }
 }
 const FontMeasurements = ( new FontMeasurementsImpl());
+
 export { FontMeasurements, FontMeasurementsImpl };

package/vscode/src/vs/editor/browser/config/migrateOptions.js

@@ -187,4 +187,5 @@ registerEditorSettingMigration('lightbulb.enabled', (value, read, write) => {
         write('lightbulb.enabled', value ? undefined : 'off');
     }
 });
+
 export { EditorSettingMigration, migrateOptions };

package/vscode/src/vs/editor/browser/config/tabFocus.js

@@ -1,4 +1,5 @@
 import { Emitter } from '../../../base/common/event.js';
+
 class TabFocusImpl {
     constructor() {
         this._tabFocus = false;
@@ -14,4 +15,5 @@ class TabFocusImpl {
     }
 }
 const TabFocus = ( new TabFocusImpl());
+
 export { TabFocus };

package/vscode/src/vs/editor/browser/controller/editContext/clipboardUtils.js

@@ -1,4 +1,5 @@
 import { isWindows } from '../../../../base/common/platform.js';
+
 function getDataToCopy(viewModel, modelSelections, emptySelectionClipboard, copyWithSyntaxHighlighting) {
     const rawTextToCopy = viewModel.getPlainTextToCopy(modelSelections, emptySelectionClipboard, isWindows);
     const newLineCharacter = viewModel.model.getEOL();
@@ -42,4 +43,5 @@ class InMemoryClipboardMetadataManager {
 const CopyOptions = {
     forceCopyWithSyntaxHighlighting: false
 };
+
 export { CopyOptions, InMemoryClipboardMetadataManager, getDataToCopy };

package/vscode/src/vs/editor/browser/controller/editContext/{editContextUtils.js → editContext.js}

@@ -1,4 +1,6 @@
 import { ViewPart } from '../../view/viewPart.js';
+
 class AbstractEditContext extends ViewPart {
 }
+
 export { AbstractEditContext };

package/vscode/src/vs/editor/browser/controller/editContext/native/editContextFactory.js

@@ -0,0 +1,13 @@
+var EditContext;
+( (function(EditContext) {
+    function supported(obj) {
+        return typeof obj?.EditContext === 'function';
+    }
+    EditContext.supported = supported;
+    function create(window, options) {
+        return new window.EditContext(options);
+    }
+    EditContext.create = create;
+})(EditContext || (EditContext = {})));
+
+export { EditContext };

package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContext.css.js

@@ -1,4 +1,6 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .native-edit-context{text-wrap:nowrap;margin:0;overflow:hidden;padding:0;position:absolute;white-space:pre-wrap;z-index:-10}.monaco-editor .edit-context-composition-none{background-color:transparent}.monaco-editor .edit-context-composition-secondary{background-color:var(--vscode-editor-selectionBackground)}.monaco-editor .edit-context-composition-primary{background-color:var(--vscode-editor-selectionHighlightBackground)}";
+
+var css = ".monaco-editor .native-edit-context{text-wrap:nowrap;margin:0;overflow:hidden;padding:0;position:absolute;white-space:pre-wrap;z-index:-10}.monaco-editor .edit-context-composition-none{background-color:transparent;border-bottom:none}.monaco-editor :not(.hc-black,.hc-light) .edit-context-composition-secondary{border-bottom:1px solid var(--vscode-editor-compositionBorder)}.monaco-editor :not(.hc-black,.hc-light) .edit-context-composition-primary{border-bottom:2px solid var(--vscode-editor-compositionBorder)}.monaco-editor :is(.hc-black,.hc-light) .edit-context-composition-secondary{border:1px solid var(--vscode-editor-compositionBorder)}.monaco-editor :is(.hc-black,.hc-light) .edit-context-composition-primary{border:2px solid var(--vscode-editor-compositionBorder)}";
 n(css,{});
+
 export { css, css as default };

package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContext.js

@@ -1,19 +1,23 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import './nativeEditContext.css.js';
 import { isFirefox } from '../../../../../base/browser/browser.js';
-import { addDisposableListener } from '../../../../../base/browser/dom.js';
+import { getWindow, addDisposableListener, getWindowId, getActiveWindow } from '../../../../../base/browser/dom.js';
 import { FastDomNode } from '../../../../../base/browser/fastDomNode.js';
 import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { getDataToCopy, InMemoryClipboardMetadataManager } from '../clipboardUtils.js';
-import { AbstractEditContext } from '../editContextUtils.js';
+import { AbstractEditContext } from '../editContext.js';
 import { FocusTracker, editContextAddDisposableListener } from './nativeEditContextUtils.js';
 import { ScreenReaderSupport } from './screenReaderSupport.js';
 import { Range } from '../../../../common/core/range.js';
 import { Selection } from '../../../../common/core/selection.js';
 import { Position } from '../../../../common/core/position.js';
 import { PositionOffsetTransformer } from '../../../../common/core/positionToOffset.js';
+import { MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { EditContext } from './editContextFactory.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.service.js';
+
 var CompositionClassName;
 ( (function(CompositionClassName) {
     CompositionClassName["NONE"] = "edit-context-composition-none";
@@ -21,21 +25,27 @@ var CompositionClassName;
     CompositionClassName["PRIMARY"] = "edit-context-composition-primary";
 })(CompositionClassName || (CompositionClassName = {})));
 let NativeEditContext = class NativeEditContext extends AbstractEditContext {
-    constructor(context, viewController, _visibleRangeProvider, instantiationService, clipboardService) {
+    constructor(context, overflowGuardContainer, viewController, _visibleRangeProvider, instantiationService, clipboardService, _accessibilityService) {
         super(context);
         this._visibleRangeProvider = _visibleRangeProvider;
+        this._accessibilityService = _accessibilityService;
         this._decorations = [];
         this._primarySelection = ( new Selection(1, 1, 1, 1));
         this._textStartPositionWithinEditor = ( new Position(1, 1));
+        this._targetWindowId = -1;
         this.domNode = ( new FastDomNode(document.createElement('div')));
         this.domNode.setClassName(`native-edit-context`);
         this._updateDomAttributes();
-        this._focusTracker = this._register(( new FocusTracker(
-            this.domNode.domNode,
-            (newFocusValue) => this._context.viewModel.setHasFocus(newFocusValue)
-        )));
-        this._editContext = ( new EditContext());
-        this.domNode.domNode.editContext = this._editContext;
+        overflowGuardContainer.appendChild(this.domNode);
+        this._parent = overflowGuardContainer.domNode;
+        this._selectionChangeListener = this._register(( new MutableDisposable()));
+        this._focusTracker = this._register(( new FocusTracker(this.domNode.domNode, (newFocusValue) => {
+            this._selectionChangeListener.value = newFocusValue ? this._setSelectionChangeListener(viewController) : undefined;
+            this._context.viewModel.setHasFocus(newFocusValue);
+        })));
+        const window = getWindow(this.domNode.domNode);
+        this._editContext = EditContext.create(window);
+        this.setEditContextOnDomNode();
         this._screenReaderSupport = instantiationService.createInstance(ScreenReaderSupport, this.domNode, context);
         this._register(addDisposableListener(this.domNode.domNode, 'copy', () => this._ensureClipboardGetsEditorSelection(clipboardService)));
         this._register(addDisposableListener(this.domNode.domNode, 'cut', () => {
@@ -51,8 +61,8 @@ let NativeEditContext = class NativeEditContext extends AbstractEditContext {
             viewController.emitKeyDown(standardKeyboardEvent);
         }));
         this._register(addDisposableListener(this.domNode.domNode, 'beforeinput', async (e) => {
-            if (e.inputType === 'insertParagraph') {
-                this._onType(viewController, { text: '\n', replacePrevCharCnt: 0, replaceNextCharCnt: 0, positionDelta: 0 });
+            if (e.inputType === 'insertParagraph' || e.inputType === 'insertLineBreak') {
+                this._onType(viewController, { text: this._context.viewModel.model.getEOL(), replacePrevCharCnt: 0, replaceNextCharCnt: 0, positionDelta: 0 });
             }
         }));
         this._register(editContextAddDisposableListener(this._editContext, 'textformatupdate', (e) => this._handleTextFormatUpdate(e)));
@@ -74,10 +84,6 @@ let NativeEditContext = class NativeEditContext extends AbstractEditContext {
         this.domNode.domNode.remove();
         super.dispose();
     }
-    appendTo(overflowGuardContainer) {
-        overflowGuardContainer.appendChild(this.domNode);
-        this._parent = overflowGuardContainer.domNode;
-    }
     setAriaOptions() {
         this._screenReaderSupport.setAriaOptions();
     }
@@ -108,6 +114,14 @@ let NativeEditContext = class NativeEditContext extends AbstractEditContext {
     isFocused() { return this._focusTracker.isFocused; }
     focus() { this._focusTracker.focus(); }
     refreshFocusState() { }
+    setEditContextOnDomNode() {
+        const targetWindow = getWindow(this.domNode.domNode);
+        const targetWindowId = getWindowId(targetWindow);
+        if (this._targetWindowId !== targetWindowId) {
+            this.domNode.domNode.editContext = this._editContext;
+            this._targetWindowId = targetWindowId;
+        }
+    }
     _updateDomAttributes() {
         const options = this._context.configuration.options;
         this.domNode.domNode.setAttribute('tabindex', String(options.get(127 )));
@@ -221,7 +235,7 @@ let NativeEditContext = class NativeEditContext extends AbstractEditContext {
             return;
         }
         const options = this._context.configuration.options;
-        const lineHeight = options.get(69 );
+        const lineHeight = options.get(68 );
         const contentLeft = options.get(148 ).contentLeft;
         const parentBounds = this._parent.getBoundingClientRect();
         const modelStartPosition = this._primarySelection.getStartPosition();
@@ -253,7 +267,7 @@ let NativeEditContext = class NativeEditContext extends AbstractEditContext {
         }
         const options = this._context.configuration.options;
         const typicalHalfWidthCharacterWidth = options.get(52 ).typicalHalfwidthCharacterWidth;
-        const lineHeight = options.get(69 );
+        const lineHeight = options.get(68 );
         const contentLeft = options.get(148 ).contentLeft;
         const parentBounds = this._parent.getBoundingClientRect();
         const characterBounds = [];
@@ -307,9 +321,50 @@ let NativeEditContext = class NativeEditContext extends AbstractEditContext {
         (isFirefox ? dataToCopy.text.replace(/\r\n/g, '\n') : dataToCopy.text), storedMetadata);
         clipboardService.writeText(dataToCopy.text);
     }
+    _setSelectionChangeListener(viewController) {
+        return addDisposableListener(this.domNode.domNode.ownerDocument, 'selectionchange', () => {
+            const isScreenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
+            if (!this.isFocused() || !isScreenReaderOptimized) {
+                return;
+            }
+            const screenReaderContentState = this._screenReaderSupport.screenReaderContentState;
+            if (!screenReaderContentState) {
+                return;
+            }
+            const activeDocument = getActiveWindow().document;
+            const activeDocumentSelection = activeDocument.getSelection();
+            if (!activeDocumentSelection) {
+                return;
+            }
+            const rangeCount = activeDocumentSelection.rangeCount;
+            if (rangeCount === 0) {
+                return;
+            }
+            const range = activeDocumentSelection.getRangeAt(0);
+            const model = this._context.viewModel.model;
+            const offsetOfStartOfScreenReaderContent = model.getOffsetAt(screenReaderContentState.startPositionWithinEditor);
+            let offsetOfSelectionStart = range.startOffset + offsetOfStartOfScreenReaderContent;
+            let offsetOfSelectionEnd = range.endOffset + offsetOfStartOfScreenReaderContent;
+            const modelUsesCRLF = this._context.viewModel.model.getEndOfLineSequence() === 1 ;
+            if (modelUsesCRLF) {
+                const screenReaderContentText = screenReaderContentState.value;
+                const offsetTransformer = ( new PositionOffsetTransformer(screenReaderContentText));
+                const positionOfStartWithinText = offsetTransformer.getPosition(range.startOffset);
+                const positionOfEndWithinText = offsetTransformer.getPosition(range.endOffset);
+                offsetOfSelectionStart += positionOfStartWithinText.lineNumber - 1;
+                offsetOfSelectionEnd += positionOfEndWithinText.lineNumber - 1;
+            }
+            const positionOfSelectionStart = model.getPositionAt(offsetOfSelectionStart);
+            const positionOfSelectionEnd = model.getPositionAt(offsetOfSelectionEnd);
+            const newSelection = Selection.fromPositions(positionOfSelectionStart, positionOfSelectionEnd);
+            viewController.setSelection(newSelection);
+        });
+    }
 };
 NativeEditContext = ( __decorate([
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IClipboardService))
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IClipboardService)),
+    ( __param(6, IAccessibilityService))
 ], NativeEditContext));
+
 export { NativeEditContext };

package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.js

@@ -1,5 +1,6 @@
 import { addDisposableListener } from '../../../../../base/browser/dom.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+
 class FocusTracker extends Disposable {
     constructor(_domNode, _onFocusChange) {
         super();
@@ -32,4 +33,5 @@ function editContextAddDisposableListener(target, type, listener, options) {
         }
     };
 }
+
 export { FocusTracker, editContextAddDisposableListener };

package/vscode/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.js

@@ -1,19 +1,21 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { getActiveWindow } from '../../../../../base/browser/dom.js';
 import { localize } from '../../../../../nls.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.service.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
 import { Selection } from '../../../../common/core/selection.js';
 import { applyFontInfo } from '../../../config/domFontInfo.js';
 import { ariaLabelForScreenReaderContent, newlinecount, PagedScreenReaderStrategy } from '../screenReaderUtils.js';
+
 let ScreenReaderSupport = class ScreenReaderSupport {
-    constructor(_domNode, _context, _keybindingService) {
+    constructor(_domNode, _context, _keybindingService, _accessibilityService) {
         this._domNode = _domNode;
         this._context = _context;
         this._keybindingService = _keybindingService;
+        this._accessibilityService = _accessibilityService;
         this._contentLeft = 1;
         this._contentWidth = 1;
         this._lineHeight = 1;
-        this._accessibilitySupport = 0 ;
         this._accessibilityPageSize = 1;
         this._primarySelection = ( (new Selection(1, 1, 1, 1)));
         this._updateConfigurationSettings();
@@ -22,7 +24,7 @@ let ScreenReaderSupport = class ScreenReaderSupport {
     onConfigurationChanged(e) {
         this._updateConfigurationSettings();
         this._updateDomAttributes();
-        if (e.hasChanged(2 )) {
+        if (this._accessibilityService.isScreenReaderOptimized()) {
             this.writeScreenReaderContent();
         }
     }
@@ -32,8 +34,7 @@ let ScreenReaderSupport = class ScreenReaderSupport {
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
         this._fontInfo = options.get(52 );
-        this._lineHeight = options.get(69 );
-        this._accessibilitySupport = options.get(2 );
+        this._lineHeight = options.get(68 );
         this._accessibilityPageSize = options.get(3 );
     }
     _updateDomAttributes() {
@@ -42,7 +43,7 @@ let ScreenReaderSupport = class ScreenReaderSupport {
         this._domNode.domNode.setAttribute('aria-required', options.get(5 ) ? 'true' : 'false');
         this._domNode.domNode.setAttribute('aria-multiline', 'true');
         this._domNode.domNode.setAttribute('aria-autocomplete', options.get(94 ) ? 'none' : 'both');
-        this._domNode.domNode.setAttribute('aria-roledescription', ( localize(11405, "editor")));
+        this._domNode.domNode.setAttribute('aria-roledescription', ( localize(11525, "editor")));
         this._domNode.domNode.setAttribute('aria-label', ariaLabelForScreenReaderContent(options, this._keybindingService));
         const tabSize = this._context.viewModel.model.getOptions().tabSize;
         const spaceWidth = options.get(52 ).spaceWidth;
@@ -85,8 +86,11 @@ let ScreenReaderSupport = class ScreenReaderSupport {
         }
         this._setSelectionOfScreenReaderContent(this._screenReaderContentState.selectionStart, this._screenReaderContentState.selectionEnd);
     }
+    get screenReaderContentState() {
+        return this._screenReaderContentState;
+    }
     _getScreenReaderContentState() {
-        if (this._accessibilitySupport === 1 ) {
+        if (!this._accessibilityService.isScreenReaderOptimized()) {
             return;
         }
         const simpleModel = {
@@ -106,7 +110,7 @@ let ScreenReaderSupport = class ScreenReaderSupport {
                 return this._context.viewModel.modifyPosition(position, offset);
             }
         };
-        return PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._primarySelection, this._accessibilityPageSize, this._accessibilitySupport === 0 );
+        return PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._primarySelection, this._accessibilityPageSize, this._accessibilityService.getAccessibilitySupport() === 0 );
     }
     _setSelectionOfScreenReaderContent(selectionOffsetStart, selectionOffsetEnd) {
         const activeDocument = getActiveWindow().document;
@@ -126,6 +130,8 @@ let ScreenReaderSupport = class ScreenReaderSupport {
     }
 };
 ScreenReaderSupport = ( (__decorate([
-    ( (__param(2, IKeybindingService)))
+    ( (__param(2, IKeybindingService))),
+    ( (__param(3, IAccessibilityService)))
 ], ScreenReaderSupport)));
+
 export { ScreenReaderSupport };