using correct selection direction (microsoft#259042)

Author: aiday-mar

src/vs/editor/browser/controller/editContext/native/screenReaderContentRich.ts

@@ -235,14 +235,13 @@ export class RichScreenReaderContent extends Disposable implements IScreenReader
 		if (!startRenderedLine || !endRenderedLine) {
 			return;
 		}
-		const range = new globalThis.Range();
 		const viewModel = context.viewModel;
 		const model = viewModel.model;
 		const coordinatesConverter = viewModel.coordinatesConverter;
-		const startRange = new Range(startLineNumber, 1, startLineNumber, viewSelection.startColumn);
+		const startRange = new Range(startLineNumber, 1, startLineNumber, viewSelection.selectionStartColumn);
 		const modelStartRange = coordinatesConverter.convertViewRangeToModelRange(startRange);
 		const characterCountForStart = model.getCharacterCountInRange(modelStartRange);
-		const endRange = new Range(endLineNumber, 1, endLineNumber, viewSelection.endColumn);
+		const endRange = new Range(endLineNumber, 1, endLineNumber, viewSelection.positionColumn);
 		const modelEndRange = coordinatesConverter.convertViewRangeToModelRange(endRange);
 		const characterCountForEnd = model.getCharacterCountInRange(modelEndRange);
 		const startDomPosition = startRenderedLine.characterMapping.getDomPosition(characterCountForStart);
@@ -256,10 +255,13 @@ export class RichScreenReaderContent extends Disposable implements IScreenReader
 		if (!startNode.firstChild || !endNode.firstChild) {
 			return;
 		}
-		range.setStart(startNode.firstChild, viewSelection.startColumn === 1 ? 0 : startDomPosition.charIndex + 1);
-		range.setEnd(endNode.firstChild, viewSelection.endColumn === 1 ? 0 : endDomPosition.charIndex + 1);
 		this._setIgnoreSelectionChangeTime('setRange');
-		activeDocumentSelection.setBaseAndExtent(range.startContainer, range.startOffset, range.endContainer, range.endOffset);
+		activeDocumentSelection.setBaseAndExtent(
+			startNode.firstChild,
+			viewSelection.startColumn === 1 ? 0 : startDomPosition.charIndex + 1,
+			endNode.firstChild,
+			viewSelection.endColumn === 1 ? 0 : endDomPosition.charIndex + 1
+		);
 	}
 
 	private _getScreenReaderContentLineIntervals(primarySelection: Selection): RichScreenReaderState {
@@ -305,12 +307,21 @@ export class RichScreenReaderContent extends Disposable implements IScreenReader
 		}
 		const startColumn = getColumnOfNodeOffset(startMapping, startSpanElement, range.startOffset);
 		const endColumn = getColumnOfNodeOffset(endMapping, endSpanElement, range.endOffset);
-		return new Selection(
-			startLineNumber,
-			startColumn,
-			endLineNumber,
-			endColumn
-		);
+		if (selection.direction === 'forward') {
+			return new Selection(
+				startLineNumber,
+				startColumn,
+				endLineNumber,
+				endColumn
+			);
+		} else {
+			return new Selection(
+				endLineNumber,
+				endColumn,
+				startLineNumber,
+				startColumn
+			);
+		}
 	}
 }
 

src/vs/editor/browser/controller/editContext/native/screenReaderContentSimple.ts

@@ -54,16 +54,16 @@ export class SimpleScreenReaderContent extends Disposable implements IScreenRead
 			if (!selection) {
 				return;
 			}
-			const range = this._getScreenReaderRange(this._state.selectionStart, this._state.selectionEnd);
-			if (!range) {
+			const data = this._getScreenReaderRange(this._state.selectionStart, this._state.selectionEnd);
+			if (!data) {
 				return;
 			}
 			this._setIgnoreSelectionChangeTime('setRange');
 			selection.setBaseAndExtent(
-				range.startContainer,
-				range.startOffset,
-				range.endContainer,
-				range.endOffset
+				data.anchorNode,
+				data.anchorOffset,
+				data.focusNode,
+				data.focusOffset
 			);
 		} else {
 			this._state = undefined;
@@ -153,7 +153,7 @@ export class SimpleScreenReaderContent extends Disposable implements IScreenRead
 				return;
 			}
 
-			this._viewController.setSelection(this._getEditorSelectionFromDomRange(this._context, this._state, range));
+			this._viewController.setSelection(this._getEditorSelectionFromDomRange(this._context, this._state, selection.direction, range));
 		});
 	}
 
@@ -173,18 +173,23 @@ export class SimpleScreenReaderContent extends Disposable implements IScreenRead
 		return state;
 	}
 
-	private _getScreenReaderRange(selectionOffsetStart: number, selectionOffsetEnd: number): globalThis.Range | undefined {
+	private _getScreenReaderRange(selectionOffsetStart: number, selectionOffsetEnd: number): { anchorNode: Node; anchorOffset: number; focusNode: Node; focusOffset: number } | undefined {
 		const textContent = this._domNode.domNode.firstChild;
 		if (!textContent) {
 			return;
 		}
 		const range = new globalThis.Range();
 		range.setStart(textContent, selectionOffsetStart);
 		range.setEnd(textContent, selectionOffsetEnd);
-		return range;
+		return {
+			anchorNode: textContent,
+			anchorOffset: selectionOffsetStart,
+			focusNode: textContent,
+			focusOffset: selectionOffsetEnd
+		};
 	}
 
-	private _getEditorSelectionFromDomRange(context: ViewContext, state: ISimpleScreenReaderContentState, range: globalThis.Range): Selection {
+	private _getEditorSelectionFromDomRange(context: ViewContext, state: ISimpleScreenReaderContentState, direction: string, range: globalThis.Range): Selection {
 		const viewModel = context.viewModel;
 		const model = viewModel.model;
 		const coordinatesConverter = viewModel.coordinatesConverter;
@@ -203,6 +208,8 @@ export class SimpleScreenReaderContent extends Disposable implements IScreenRead
 		}
 		const positionOfSelectionStart = model.getPositionAt(offsetOfSelectionStart);
 		const positionOfSelectionEnd = model.getPositionAt(offsetOfSelectionEnd);
-		return Selection.fromPositions(positionOfSelectionStart, positionOfSelectionEnd);
+		const selectionStart = direction === 'forward' ? positionOfSelectionStart : positionOfSelectionEnd;
+		const selectionEnd = direction === 'forward' ? positionOfSelectionEnd : positionOfSelectionStart;
+		return Selection.fromPositions(selectionStart, selectionEnd);
 	}
 }

src/vs/editor/browser/controller/editContext/screenReaderUtils.ts

@@ -6,7 +6,7 @@
 import { EndOfLinePreference } from '../../../common/model.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
-import { Selection } from '../../../common/core/selection.js';
+import { Selection, SelectionDirection } from '../../../common/core/selection.js';
 import { EditorOption, IComputedEditorOptions } from '../../../common/config/editorOptions.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
@@ -48,7 +48,7 @@ export class SimplePagedScreenReaderStrategy implements IPagedScreenReaderStrate
 		return new Range(startLineNumber, 1, endLineNumber + 1, 1);
 	}
 
-	public fromEditorSelection(model: ISimpleModel, selection: Range, linesPerPage: number, trimLongText: boolean): ISimpleScreenReaderContentState {
+	public fromEditorSelection(model: ISimpleModel, selection: Selection, linesPerPage: number, trimLongText: boolean): ISimpleScreenReaderContentState {
 		// Chromium handles very poorly text even of a few thousand chars
 		// Cut text to avoid stalling the entire UI
 		const LIMIT_CHARS = 500;
@@ -93,11 +93,20 @@ export class SimplePagedScreenReaderStrategy implements IPagedScreenReaderStrate
 			text = text.substring(0, LIMIT_CHARS) + String.fromCharCode(8230) + text.substring(text.length - LIMIT_CHARS, text.length);
 		}
 
+		let selectionStart: number;
+		let selectionEnd: number;
+		if (selection.getDirection() === SelectionDirection.LTR) {
+			selectionStart = pretext.length;
+			selectionEnd = pretext.length + text.length;
+		} else {
+			selectionEnd = pretext.length;
+			selectionStart = pretext.length + text.length;
+		}
 		return {
 			value: pretext + text + posttext,
 			selection: selection,
-			selectionStart: pretext.length,
-			selectionEnd: pretext.length + text.length,
+			selectionStart,
+			selectionEnd,
 			startPositionWithinEditor: pretextRange.getStartPosition(),
 			newlineCountBeforeSelection: pretextRange.endLineNumber - pretextRange.startLineNumber,
 		};

src/vs/editor/test/browser/controller/imeTester.ts

@@ -16,6 +16,7 @@ import { SimplePagedScreenReaderStrategy } from '../../../browser/controller/edi
 import { ISimpleModel } from '../../../common/viewModel/screenReaderSimpleModel.js';
 import { TextAreaState } from '../../../browser/controller/editContext/textArea/textAreaEditContextState.js';
 import { ITextAreaInputHost, TextAreaInput, TextAreaWrapper } from '../../../browser/controller/editContext/textArea/textAreaEditContextInput.js';
+import { Selection } from '../../../common/core/selection.js';
 
 // To run this test, open imeTester.html
 
@@ -117,7 +118,7 @@ function doCreateTest(description: string, inputStr: string, expectedStr: string
 			};
 		},
 		getScreenReaderContent: (): TextAreaState => {
-			const selection = new Range(1, 1 + cursorOffset, 1, 1 + cursorOffset + cursorLength);
+			const selection = new Selection(1, 1 + cursorOffset, 1, 1 + cursorOffset + cursorLength);
 
 			const screenReaderContentState = screenReaderStrategy.fromEditorSelection(model, selection, 10, true);
 			return TextAreaState.fromScreenReaderContentState(screenReaderContentState);