@codingame/monaco-vscode-api 19.1.4 → 20.0.0

package/vscode/src/vs/editor/common/viewModel/screenReaderSimpleModel.d.ts

@@ -0,0 +1,10 @@
+import { Position } from "../core/position.js";
+import { Range } from "../core/range.js";
+import { EndOfLinePreference } from "../model.js";
+export interface ISimpleModel {
+    getLineCount(): number;
+    getLineMaxColumn(lineNumber: number): number;
+    getValueInRange(range: Range, eol: EndOfLinePreference): string;
+    getValueLengthInRange(range: Range, eol: EndOfLinePreference): number;
+    modifyPosition(position: Position, offset: number): Position;
+}

package/vscode/src/vs/editor/common/viewModel/viewModelDecoration.d.ts

@@ -0,0 +1,11 @@
+import { IModelDecoration, IModelDecorationOptions, ITextModel } from "../model.js";
+import { Range } from "../core/range.js";
+export declare class ViewModelDecoration {
+    _viewModelDecorationBrand: void;
+    readonly range: Range;
+    readonly options: IModelDecorationOptions;
+    constructor(range: Range, options: IModelDecorationOptions);
+}
+export declare function isModelDecorationVisible(model: ITextModel, decoration: IModelDecoration): boolean;
+export declare function isModelDecorationInComment(model: ITextModel, decoration: IModelDecoration): boolean;
+export declare function isModelDecorationInString(model: ITextModel, decoration: IModelDecoration): boolean;

package/vscode/src/vs/editor/common/viewModel/viewModelDecoration.js

@@ -0,0 +1,49 @@
+
+import { StandardTokenType } from '../encodedTokenAttributes.js';
+
+class ViewModelDecoration {
+    constructor(range, options) {
+        this._viewModelDecorationBrand = undefined;
+        this.range = range;
+        this.options = options;
+    }
+}
+function isModelDecorationVisible(model, decoration) {
+    if (decoration.options.hideInCommentTokens && isModelDecorationInComment(model, decoration)) {
+        return false;
+    }
+    if (decoration.options.hideInStringTokens && isModelDecorationInString(model, decoration)) {
+        return false;
+    }
+    return true;
+}
+function isModelDecorationInComment(model, decoration) {
+    return testTokensInRange(model, decoration.range, (tokenType) => tokenType === StandardTokenType.Comment);
+}
+function isModelDecorationInString(model, decoration) {
+    return testTokensInRange(model, decoration.range, (tokenType) => tokenType === StandardTokenType.String);
+}
+function testTokensInRange(model, range, callback) {
+    for (let lineNumber = range.startLineNumber; lineNumber <= range.endLineNumber; lineNumber++) {
+        const lineTokens = model.tokenization.getLineTokens(lineNumber);
+        const isFirstLine = lineNumber === range.startLineNumber;
+        const isEndLine = lineNumber === range.endLineNumber;
+        let tokenIdx = isFirstLine ? lineTokens.findTokenIndexAtOffset(range.startColumn - 1) : 0;
+        while (tokenIdx < lineTokens.getCount()) {
+            if (isEndLine) {
+                const startOffset = lineTokens.getStartOffset(tokenIdx);
+                if (startOffset > range.endColumn - 1) {
+                    break;
+                }
+            }
+            const callbackResult = callback(lineTokens.getStandardTokenType(tokenIdx));
+            if (!callbackResult) {
+                return false;
+            }
+            tokenIdx++;
+        }
+    }
+    return true;
+}
+
+export { ViewModelDecoration, isModelDecorationInComment, isModelDecorationInString, isModelDecorationVisible };

package/vscode/src/vs/editor/common/viewModel/viewModelDecorations.d.ts

@@ -1,10 +1,12 @@
 import { IDisposable } from "../../../base/common/lifecycle.js";
 import { Range } from "../core/range.js";
 import { IEditorConfiguration } from "../config/editorConfiguration.js";
-import { IModelDecoration, ITextModel } from "../model.js";
+import { ITextModel } from "../model.js";
 import { IViewModelLines } from "./viewModelLines.js";
-import { ICoordinatesConverter, InlineDecoration, ViewModelDecoration } from "../viewModel.js";
-export interface IDecorationsViewportData {
+import { ViewModelDecoration } from "./viewModelDecoration.js";
+import { InlineDecoration } from "./inlineDecorations.js";
+import { ICoordinatesConverter } from "../coordinatesConverter.js";
+export interface IViewDecorationsCollection {
     readonly decorations: ViewModelDecoration[];
     readonly inlineDecorations: InlineDecoration[][];
     readonly hasVariableFonts: boolean;
@@ -26,13 +28,7 @@ export declare class ViewModelDecorations implements IDisposable {
     onLineMappingChanged(): void;
     private _getOrCreateViewModelDecoration;
     getMinimapDecorationsInRange(range: Range): ViewModelDecoration[];
-    getDecorationsViewportData(viewRange: Range): IDecorationsViewportData;
-    getInlineDecorationsOnLine(lineNumber: number, onlyMinimapDecorations?: boolean, onlyMarginDecorations?: boolean): {
-        inlineDecorations: InlineDecoration[];
-        hasVariableFonts: boolean;
-    };
+    getDecorationsViewportData(viewRange: Range): IViewDecorationsCollection;
+    getDecorationsOnLine(lineNumber: number, onlyMinimapDecorations?: boolean, onlyMarginDecorations?: boolean): IViewDecorationsCollection;
     private _getDecorationsInRange;
 }
-export declare function isModelDecorationVisible(model: ITextModel, decoration: IModelDecoration): boolean;
-export declare function isModelDecorationInComment(model: ITextModel, decoration: IModelDecoration): boolean;
-export declare function isModelDecorationInString(model: ITextModel, decoration: IModelDecoration): boolean;

package/vscode/src/vs/editor/common/viewModel/viewModelDecorations.js

@@ -2,9 +2,9 @@
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
 import { PositionAffinity } from '../model.js';
-import { ViewModelDecoration, InlineDecoration, InlineDecorationType } from '../viewModel.js';
 import { filterValidationDecorations, filterFontDecorations } from '../config/editorOptions.js';
-import { StandardTokenType } from '../encodedTokenAttributes.js';
+import { ViewModelDecoration, isModelDecorationVisible } from './viewModelDecoration.js';
+import { InlineDecoration, InlineDecorationType } from './inlineDecorations.js';
 
 class ViewModelDecorations {
     constructor(editorId, model, configuration, linesCollection, coordinatesConverter) {
@@ -72,15 +72,14 @@ class ViewModelDecorations {
         }
         return this._cachedModelDecorationsResolver;
     }
-    getInlineDecorationsOnLine(lineNumber, onlyMinimapDecorations = false, onlyMarginDecorations = false) {
+    getDecorationsOnLine(lineNumber, onlyMinimapDecorations = false, onlyMarginDecorations = false) {
         const range = ( new Range(
             lineNumber,
             this._linesCollection.getViewLineMinColumn(lineNumber),
             lineNumber,
             this._linesCollection.getViewLineMaxColumn(lineNumber)
         ));
-        const decorations = this._getDecorationsInRange(range, onlyMinimapDecorations, onlyMarginDecorations);
-        return { inlineDecorations: decorations.inlineDecorations[0], hasVariableFonts: decorations.hasVariableFonts };
+        return this._getDecorationsInRange(range, onlyMinimapDecorations, onlyMarginDecorations);
     }
     _getDecorationsInRange(viewRange, onlyMinimapDecorations, onlyMarginDecorations) {
         const modelDecorations = this._linesCollection.getDecorationsInRange(viewRange, this.editorId, filterValidationDecorations(this.configuration.options), filterFontDecorations(this.configuration.options), onlyMinimapDecorations, onlyMarginDecorations);
@@ -147,42 +146,5 @@ class ViewModelDecorations {
         };
     }
 }
-function isModelDecorationVisible(model, decoration) {
-    if (decoration.options.hideInCommentTokens && isModelDecorationInComment(model, decoration)) {
-        return false;
-    }
-    if (decoration.options.hideInStringTokens && isModelDecorationInString(model, decoration)) {
-        return false;
-    }
-    return true;
-}
-function isModelDecorationInComment(model, decoration) {
-    return testTokensInRange(model, decoration.range, (tokenType) => tokenType === StandardTokenType.Comment);
-}
-function isModelDecorationInString(model, decoration) {
-    return testTokensInRange(model, decoration.range, (tokenType) => tokenType === StandardTokenType.String);
-}
-function testTokensInRange(model, range, callback) {
-    for (let lineNumber = range.startLineNumber; lineNumber <= range.endLineNumber; lineNumber++) {
-        const lineTokens = model.tokenization.getLineTokens(lineNumber);
-        const isFirstLine = lineNumber === range.startLineNumber;
-        const isEndLine = lineNumber === range.endLineNumber;
-        let tokenIdx = isFirstLine ? lineTokens.findTokenIndexAtOffset(range.startColumn - 1) : 0;
-        while (tokenIdx < lineTokens.getCount()) {
-            if (isEndLine) {
-                const startOffset = lineTokens.getStartOffset(tokenIdx);
-                if (startOffset > range.endColumn - 1) {
-                    break;
-                }
-            }
-            const callbackResult = callback(lineTokens.getStandardTokenType(tokenIdx));
-            if (!callbackResult) {
-                return false;
-            }
-            tokenIdx++;
-        }
-    }
-    return true;
-}
 
-export { ViewModelDecorations, isModelDecorationInComment, isModelDecorationInString, isModelDecorationVisible };
+export { ViewModelDecorations };

package/vscode/src/vs/editor/common/viewModel/viewModelImpl.d.ts

@@ -7,7 +7,7 @@ import { Range } from "../core/range.js";
 import { ISelection, Selection } from "../core/selection.js";
 import { ICommand, ICursorState, IViewState, ScrollType } from "../editorCommon.js";
 import { IEditorConfiguration } from "../config/editorConfiguration.js";
-import { EndOfLinePreference, IAttachedView, ICursorStateComputer, IGlyphMarginLanesModel, IIdentifiedSingleEditOperation, ITextModel, PositionAffinity } from "../model.js";
+import { EndOfLinePreference, IAttachedView, ICursorStateComputer, IGlyphMarginLanesModel, IIdentifiedSingleEditOperation, ITextModel, PositionAffinity, TextDirection } from "../model.js";
 import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide } from "../textModelGuides.js";
 import { ILanguageConfigurationService } from "../languages/languageConfigurationRegistry.service.js";
 import { EditorTheme } from "../editorTheme.js";
@@ -15,10 +15,11 @@ import * as viewEvents from "../viewEvents.js";
 import { ViewLayout } from "../viewLayout/viewLayout.js";
 import { ILineBreaksComputer, ILineBreaksComputerFactory, InjectedText } from "../modelLineProjectionData.js";
 import { ViewEventHandler } from "../viewEventHandler.js";
-import { ICoordinatesConverter, IViewModel, IWhitespaceChangeAccessor, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from "../viewModel.js";
+import { IViewModel, IWhitespaceChangeAccessor, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from "../viewModel.js";
 import { OutgoingViewModelEvent } from "../viewModelEventDispatcher.js";
 import { IThemeService } from "../../../platform/theme/common/themeService.service.js";
-import { TextModelEditReason } from "../textModelEditReason.js";
+import { TextModelEditSource } from "../textModelEditSource.js";
+import { ICoordinatesConverter } from "../coordinatesConverter.js";
 export declare class ViewModel extends Disposable implements IViewModel {
     private readonly languageConfigurationService;
     private readonly _themeService;
@@ -87,6 +88,8 @@ export declare class ViewModel extends Disposable implements IViewModel {
     getMinimapDecorationsInRange(range: Range): ViewModelDecoration[];
     getDecorationsInViewport(visibleRange: Range): ViewModelDecoration[];
     getInjectedTextAt(viewPosition: Position): InjectedText | null;
+    private _getTextDirection;
+    getTextDirection(lineNumber: number): TextDirection;
     getViewportViewLineRenderingData(visibleRange: Range, lineNumber: number): ViewLineRenderingData;
     getViewLineRenderingData(lineNumber: number): ViewLineRenderingData;
     private _getViewLineRenderingData;
@@ -121,7 +124,7 @@ export declare class ViewModel extends Disposable implements IViewModel {
     saveCursorState(): ICursorState[];
     restoreCursorState(states: ICursorState[]): void;
     private _executeCursorEdit;
-    executeEdits(source: string | null | undefined, edits: IIdentifiedSingleEditOperation[], cursorStateComputer: ICursorStateComputer, reason: TextModelEditReason): void;
+    executeEdits(source: string | null | undefined, edits: IIdentifiedSingleEditOperation[], cursorStateComputer: ICursorStateComputer, reason: TextModelEditSource): void;
     startComposition(): void;
     endComposition(source?: string | null | undefined): void;
     type(text: string, source?: string | null | undefined): void;

package/vscode/src/vs/editor/common/viewModel/viewModelImpl.js

@@ -12,7 +12,7 @@ import { CursorChangeReason } from '../cursorEvents.js';
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
 import { ScrollType } from '../editorCommon.js';
-import { EndOfLinePreference, TrackedRangeStickiness } from '../model.js';
+import { TextDirection, EndOfLinePreference, TrackedRangeStickiness } from '../model.js';
 import { InternalModelContentChangeEvent, RawContentChangedType, ModelLineHeightChangedEvent, ModelFontChangedEvent } from '../textModelEvents.js';
 import { TokenizationRegistry } from '../languages.js';
 import { ColorId } from '../encodedTokenAttributes.js';
@@ -61,6 +61,7 @@ class ViewModel extends Disposable {
             const wrappingInfo = options.get(EditorOption.wrappingInfo);
             const wrappingIndent = options.get(EditorOption.wrappingIndent);
             const wordBreak = options.get(EditorOption.wordBreak);
+            const wrapOnEscapedLineFeeds = options.get(EditorOption.wrapOnEscapedLineFeeds);
             this._lines = ( new ViewModelLinesFromProjectedModel(
                 this._editorId,
                 this.model,
@@ -71,7 +72,8 @@ class ViewModel extends Disposable {
                 wrappingStrategy,
                 wrappingInfo.wrappingColumn,
                 wrappingIndent,
-                wordBreak
+                wordBreak,
+                wrapOnEscapedLineFeeds
             ));
         }
         this.coordinatesConverter = this._lines.createCoordinatesConverter();
@@ -688,17 +690,37 @@ class ViewModel extends Disposable {
     getInjectedTextAt(viewPosition) {
         return this._lines.getInjectedTextAt(viewPosition);
     }
+    _getTextDirection(lineNumber, decorations) {
+        let rtlCount = 0;
+        for (const decoration of decorations) {
+            const range = decoration.range;
+            if (range.startLineNumber > lineNumber || range.endLineNumber < lineNumber) {
+                continue;
+            }
+            const textDirection = decoration.options.textDirection;
+            if (textDirection === TextDirection.RTL) {
+                rtlCount++;
+            }
+            else if (textDirection === TextDirection.LTR) {
+                rtlCount--;
+            }
+        }
+        return rtlCount > 0 ? TextDirection.RTL : TextDirection.LTR;
+    }
+    getTextDirection(lineNumber) {
+        const decorationsCollection = this._decorations.getDecorationsOnLine(lineNumber);
+        return this._getTextDirection(lineNumber, decorationsCollection.decorations);
+    }
     getViewportViewLineRenderingData(visibleRange, lineNumber) {
-        const decorationViewportData = this._decorations.getDecorationsViewportData(visibleRange);
-        const allInlineDecorations = decorationViewportData.inlineDecorations;
-        const inlineDecorations = allInlineDecorations[lineNumber - visibleRange.startLineNumber];
-        return this._getViewLineRenderingData(lineNumber, inlineDecorations, decorationViewportData.hasVariableFonts);
+        const viewportDecorationsCollection = this._decorations.getDecorationsViewportData(visibleRange);
+        const inlineDecorations = viewportDecorationsCollection.inlineDecorations[lineNumber - visibleRange.startLineNumber];
+        return this._getViewLineRenderingData(lineNumber, inlineDecorations, viewportDecorationsCollection.hasVariableFonts, viewportDecorationsCollection.decorations);
     }
     getViewLineRenderingData(lineNumber) {
-        const decorations = this._decorations.getInlineDecorationsOnLine(lineNumber);
-        return this._getViewLineRenderingData(lineNumber, decorations.inlineDecorations, decorations.hasVariableFonts);
+        const decorationsCollection = this._decorations.getDecorationsOnLine(lineNumber);
+        return this._getViewLineRenderingData(lineNumber, decorationsCollection.inlineDecorations[0], decorationsCollection.hasVariableFonts, decorationsCollection.decorations);
     }
-    _getViewLineRenderingData(lineNumber, inlineDecorations, hasVariableFonts) {
+    _getViewLineRenderingData(lineNumber, inlineDecorations, hasVariableFonts, decorations) {
         const mightContainRTL = this.model.mightContainRTL();
         const mightContainNonBasicASCII = this.model.mightContainNonBasicASCII();
         const tabSize = this.getTabSize();
@@ -720,6 +742,7 @@ class ViewModel extends Disposable {
             inlineDecorations,
             tabSize,
             lineData.startVisibleColumn,
+            this._getTextDirection(lineNumber, decorations),
             hasVariableFonts
         ));
     }

package/vscode/src/vs/editor/common/viewModel/viewModelLines.d.ts

@@ -7,7 +7,8 @@ import { IModelDecoration, ITextModel, PositionAffinity } from "../model.js";
 import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide } from "../textModelGuides.js";
 import * as viewEvents from "../viewEvents.js";
 import { ILineBreaksComputer, ModelLineProjectionData, InjectedText, ILineBreaksComputerFactory } from "../modelLineProjectionData.js";
-import { ICoordinatesConverter, ViewLineData } from "../viewModel.js";
+import { ViewLineData } from "../viewModel.js";
+import { ICoordinatesConverter } from "../coordinatesConverter.js";
 export interface IViewModelLines extends IDisposable {
     createCoordinatesConverter(): ICoordinatesConverter;
     setWrappingSettings(fontInfo: FontInfo, wrappingStrategy: "simple" | "advanced", wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: "normal" | "keepAll"): boolean;
@@ -52,10 +53,11 @@ export declare class ViewModelLinesFromProjectedModel implements IViewModelLines
     private wrappingIndent;
     private wordBreak;
     private wrappingStrategy;
+    private wrapOnEscapedLineFeeds;
     private modelLineProjections;
     private projectedModelLineLineCounts;
     private hiddenAreasDecorationIds;
-    constructor(editorId: number, model: ITextModel, domLineBreaksComputerFactory: ILineBreaksComputerFactory, monospaceLineBreaksComputerFactory: ILineBreaksComputerFactory, fontInfo: FontInfo, tabSize: number, wrappingStrategy: "simple" | "advanced", wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: "normal" | "keepAll");
+    constructor(editorId: number, model: ITextModel, domLineBreaksComputerFactory: ILineBreaksComputerFactory, monospaceLineBreaksComputerFactory: ILineBreaksComputerFactory, fontInfo: FontInfo, tabSize: number, wrappingStrategy: "simple" | "advanced", wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: "normal" | "keepAll", wrapOnEscapedLineFeeds: boolean);
     dispose(): void;
     createCoordinatesConverter(): ICoordinatesConverter;
     private _constructLines;

package/vscode/src/vs/editor/common/viewModel/viewModelLines.js

@@ -10,9 +10,10 @@ import { ViewLinesDeletedEvent, ViewLinesInsertedEvent, ViewLinesChangedEvent }
 import { createModelLineProjection } from './modelLineProjection.js';
 import { ConstantTimePrefixSumComputer } from '../model/prefixSumComputer.js';
 import { ViewLineData } from '../viewModel.js';
+import { IdentityCoordinatesConverter } from '../coordinatesConverter.js';
 
 class ViewModelLinesFromProjectedModel {
-    constructor(editorId, model, domLineBreaksComputerFactory, monospaceLineBreaksComputerFactory, fontInfo, tabSize, wrappingStrategy, wrappingColumn, wrappingIndent, wordBreak) {
+    constructor(editorId, model, domLineBreaksComputerFactory, monospaceLineBreaksComputerFactory, fontInfo, tabSize, wrappingStrategy, wrappingColumn, wrappingIndent, wordBreak, wrapOnEscapedLineFeeds) {
         this._editorId = editorId;
         this.model = model;
         this._validModelVersionId = -1;
@@ -24,6 +25,7 @@ class ViewModelLinesFromProjectedModel {
         this.wrappingColumn = wrappingColumn;
         this.wrappingIndent = wrappingIndent;
         this.wordBreak = wordBreak;
+        this.wrapOnEscapedLineFeeds = wrapOnEscapedLineFeeds;
         this._constructLines( true, null);
     }
     dispose() {
@@ -178,7 +180,7 @@ class ViewModelLinesFromProjectedModel {
         const lineBreaksComputerFactory = (this.wrappingStrategy === 'advanced'
             ? this._domLineBreaksComputerFactory
             : this._monospaceLineBreaksComputerFactory);
-        return lineBreaksComputerFactory.createLineBreaksComputer(this.fontInfo, this.tabSize, this.wrappingColumn, this.wrappingIndent, this.wordBreak);
+        return lineBreaksComputerFactory.createLineBreaksComputer(this.fontInfo, this.tabSize, this.wrappingColumn, this.wrappingIndent, this.wordBreak, this.wrapOnEscapedLineFeeds);
     }
     onModelFlushed() {
         this._constructLines( true, null);
@@ -781,7 +783,7 @@ class ViewModelLinesFromModelAsIs {
     dispose() {
     }
     createCoordinatesConverter() {
-        return ( new IdentityCoordinatesConverter(this));
+        return ( new IdentityCoordinatesConverter(this.model));
     }
     getHiddenAreas() {
         return [];
@@ -889,57 +891,5 @@ class ViewModelLinesFromModelAsIs {
         return null;
     }
 }
-class IdentityCoordinatesConverter {
-    constructor(lines) {
-        this._lines = lines;
-    }
-    _validPosition(pos) {
-        return this._lines.model.validatePosition(pos);
-    }
-    _validRange(range) {
-        return this._lines.model.validateRange(range);
-    }
-    convertViewPositionToModelPosition(viewPosition) {
-        return this._validPosition(viewPosition);
-    }
-    convertViewRangeToModelRange(viewRange) {
-        return this._validRange(viewRange);
-    }
-    validateViewPosition(_viewPosition, expectedModelPosition) {
-        return this._validPosition(expectedModelPosition);
-    }
-    validateViewRange(_viewRange, expectedModelRange) {
-        return this._validRange(expectedModelRange);
-    }
-    convertModelPositionToViewPosition(modelPosition) {
-        return this._validPosition(modelPosition);
-    }
-    convertModelRangeToViewRange(modelRange) {
-        return this._validRange(modelRange);
-    }
-    modelPositionIsVisible(modelPosition) {
-        const lineCount = this._lines.model.getLineCount();
-        if (modelPosition.lineNumber < 1 || modelPosition.lineNumber > lineCount) {
-            return false;
-        }
-        return true;
-    }
-    modelRangeIsVisible(modelRange) {
-        const lineCount = this._lines.model.getLineCount();
-        if (modelRange.startLineNumber < 1 || modelRange.startLineNumber > lineCount) {
-            return false;
-        }
-        if (modelRange.endLineNumber < 1 || modelRange.endLineNumber > lineCount) {
-            return false;
-        }
-        return true;
-    }
-    getModelLineViewLineCount(modelLineNumber) {
-        return 1;
-    }
-    getViewLineNumberOfModelPosition(modelLineNumber, modelColumn) {
-        return modelLineNumber;
-    }
-}
 
 export { ViewModelLinesFromModelAsIs, ViewModelLinesFromProjectedModel };

package/vscode/src/vs/editor/common/viewModel.d.ts

@@ -1,17 +1,20 @@
 import { IScrollPosition, Scrollable } from "../../base/common/scrollable.js";
+import { ISimpleModel } from "./viewModel/screenReaderSimpleModel.js";
+import { ICoordinatesConverter } from "./coordinatesConverter.js";
 import { IPosition, Position } from "./core/position.js";
 import { Range } from "./core/range.js";
 import { CursorConfiguration, CursorState, EditOperationType, IColumnSelectData, ICursorSimpleModel, PartialCursorState } from "./cursorCommon.js";
 import { CursorChangeReason } from "./cursorEvents.js";
 import { INewScrollPosition, ScrollType } from "./editorCommon.js";
 import { EditorTheme } from "./editorTheme.js";
-import { EndOfLinePreference, IGlyphMarginLanesModel, IModelDecorationOptions, ITextModel, PositionAffinity } from "./model.js";
+import { EndOfLinePreference, IGlyphMarginLanesModel, IModelDecorationOptions, ITextModel, TextDirection } from "./model.js";
 import { ILineBreaksComputer, InjectedText } from "./modelLineProjectionData.js";
 import { BracketGuideOptions, IActiveIndentGuideInfo, IndentGuide } from "./textModelGuides.js";
 import { IViewLineTokens } from "./tokens/lineTokens.js";
 import { ViewEventHandler } from "./viewEventHandler.js";
 import { VerticalRevealType } from "./viewEvents.js";
-export interface IViewModel extends ICursorSimpleModel {
+import { InlineDecoration, SingleLineInlineDecoration } from "./viewModel/inlineDecorations.js";
+export interface IViewModel extends ICursorSimpleModel, ISimpleModel {
     readonly model: ITextModel;
     readonly coordinatesConverter: ICoordinatesConverter;
     readonly viewLayout: IViewLayout;
@@ -28,6 +31,7 @@ export interface IViewModel extends ICursorSimpleModel {
     getFontSizeAtPosition(position: IPosition): string | null;
     getMinimapDecorationsInRange(range: Range): ViewModelDecoration[];
     getDecorationsInViewport(visibleRange: Range): ViewModelDecoration[];
+    getTextDirection(lineNumber: number): TextDirection;
     getViewportViewLineRenderingData(visibleRange: Range, lineNumber: number): ViewLineRenderingData;
     getViewLineRenderingData(lineNumber: number): ViewLineRenderingData;
     getViewLineData(lineNumber: number): ViewLineData;
@@ -138,17 +142,6 @@ export declare class Viewport {
     readonly height: number;
     constructor(top: number, left: number, width: number, height: number);
 }
-export interface ICoordinatesConverter {
-    convertViewPositionToModelPosition(viewPosition: Position): Position;
-    convertViewRangeToModelRange(viewRange: Range): Range;
-    validateViewPosition(viewPosition: Position, expectedModelPosition: Position): Position;
-    validateViewRange(viewRange: Range, expectedModelRange: Range): Range;
-    convertModelPositionToViewPosition(modelPosition: Position, affinity?: PositionAffinity, allowZeroLineNumber?: boolean, belowHiddenRanges?: boolean): Position;
-    convertModelRangeToViewRange(modelRange: Range, affinity?: PositionAffinity): Range;
-    modelPositionIsVisible(modelPosition: Position): boolean;
-    getModelLineViewLineCount(modelLineNumber: number): number;
-    getViewLineNumberOfModelPosition(modelLineNumber: number, modelColumn: number): number;
-}
 export declare class MinimapLinesRenderingData {
     readonly tabSize: number;
     readonly data: Array<ViewLineData | null>;
@@ -176,31 +169,12 @@ export declare class ViewLineRenderingData {
     readonly inlineDecorations: InlineDecoration[];
     readonly tabSize: number;
     readonly startVisibleColumn: number;
+    readonly textDirection: TextDirection;
     readonly hasVariableFonts: boolean;
-    constructor(minColumn: number, maxColumn: number, content: string, continuesWithWrappedLine: boolean, mightContainRTL: boolean, mightContainNonBasicASCII: boolean, tokens: IViewLineTokens, inlineDecorations: InlineDecoration[], tabSize: number, startVisibleColumn: number, hasVariableFonts: boolean);
+    constructor(minColumn: number, maxColumn: number, content: string, continuesWithWrappedLine: boolean, mightContainRTL: boolean, mightContainNonBasicASCII: boolean, tokens: IViewLineTokens, inlineDecorations: InlineDecoration[], tabSize: number, startVisibleColumn: number, textDirection: TextDirection, hasVariableFonts: boolean);
     static isBasicASCII(lineContent: string, mightContainNonBasicASCII: boolean): boolean;
     static containsRTL(lineContent: string, isBasicASCII: boolean, mightContainRTL: boolean): boolean;
 }
-export declare enum InlineDecorationType {
-    Regular = 0,
-    Before = 1,
-    After = 2,
-    RegularAffectingLetterSpacing = 3
-}
-export declare class InlineDecoration {
-    readonly range: Range;
-    readonly inlineClassName: string;
-    readonly type: InlineDecorationType;
-    constructor(range: Range, inlineClassName: string, type: InlineDecorationType);
-}
-export declare class SingleLineInlineDecoration {
-    readonly startOffset: number;
-    readonly endOffset: number;
-    readonly inlineClassName: string;
-    readonly inlineClassNameAffectsLetterSpacing: boolean;
-    constructor(startOffset: number, endOffset: number, inlineClassName: string, inlineClassNameAffectsLetterSpacing: boolean);
-    toInlineDecoration(lineNumber: number): InlineDecoration;
-}
 export declare class ViewModelDecoration {
     _viewModelDecorationBrand: void;
     readonly range: Range;

package/vscode/src/vs/editor/common/viewModel.js

@@ -1,7 +1,6 @@
 
 import { equals } from '../../base/common/arrays.js';
 import { isBasicASCII, containsRTL } from '../../base/common/strings.js';
-import { Range } from './core/range.js';
 
 class Viewport {
     constructor(top, left, width, height) {
@@ -31,7 +30,7 @@ class ViewLineData {
     }
 }
 class ViewLineRenderingData {
-    constructor(minColumn, maxColumn, content, continuesWithWrappedLine, mightContainRTL, mightContainNonBasicASCII, tokens, inlineDecorations, tabSize, startVisibleColumn, hasVariableFonts) {
+    constructor(minColumn, maxColumn, content, continuesWithWrappedLine, mightContainRTL, mightContainNonBasicASCII, tokens, inlineDecorations, tabSize, startVisibleColumn, textDirection, hasVariableFonts) {
         this.minColumn = minColumn;
         this.maxColumn = maxColumn;
         this.content = content;
@@ -42,6 +41,7 @@ class ViewLineRenderingData {
         this.inlineDecorations = inlineDecorations;
         this.tabSize = tabSize;
         this.startVisibleColumn = startVisibleColumn;
+        this.textDirection = textDirection;
         this.hasVariableFonts = hasVariableFonts;
     }
     static isBasicASCII(lineContent, mightContainNonBasicASCII) {
@@ -57,38 +57,6 @@ class ViewLineRenderingData {
         return false;
     }
 }
-var InlineDecorationType;
-(function (InlineDecorationType) {
-    InlineDecorationType[InlineDecorationType["Regular"] = 0] = "Regular";
-    InlineDecorationType[InlineDecorationType["Before"] = 1] = "Before";
-    InlineDecorationType[InlineDecorationType["After"] = 2] = "After";
-    InlineDecorationType[InlineDecorationType["RegularAffectingLetterSpacing"] = 3] = "RegularAffectingLetterSpacing";
-})(InlineDecorationType || (InlineDecorationType = {}));
-class InlineDecoration {
-    constructor(range, inlineClassName, type) {
-        this.range = range;
-        this.inlineClassName = inlineClassName;
-        this.type = type;
-    }
-}
-class SingleLineInlineDecoration {
-    constructor(startOffset, endOffset, inlineClassName, inlineClassNameAffectsLetterSpacing) {
-        this.startOffset = startOffset;
-        this.endOffset = endOffset;
-        this.inlineClassName = inlineClassName;
-        this.inlineClassNameAffectsLetterSpacing = inlineClassNameAffectsLetterSpacing;
-    }
-    toInlineDecoration(lineNumber) {
-        return ( new InlineDecoration(( new Range(lineNumber, this.startOffset + 1, lineNumber, this.endOffset + 1)), this.inlineClassName, this.inlineClassNameAffectsLetterSpacing ? InlineDecorationType.RegularAffectingLetterSpacing : InlineDecorationType.Regular));
-    }
-}
-class ViewModelDecoration {
-    constructor(range, options) {
-        this._viewModelDecorationBrand = undefined;
-        this.range = range;
-        this.options = options;
-    }
-}
 class OverviewRulerDecorationsGroup {
     constructor(color, zIndex,
     data) {
@@ -118,4 +86,4 @@ class OverviewRulerDecorationsGroup {
     }
 }
 
-export { InlineDecoration, InlineDecorationType, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, SingleLineInlineDecoration, ViewLineData, ViewLineRenderingData, ViewModelDecoration, Viewport };
+export { MinimapLinesRenderingData, OverviewRulerDecorationsGroup, ViewLineData, ViewLineRenderingData, Viewport };

package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js

@@ -38,12 +38,12 @@ let SelectionAnchorController = class SelectionAnchorController {
                 this.decorationId = accessor.addDecoration(Selection.fromPositions(position, position), {
                     description: 'selection-anchor',
                     stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-                    hoverMessage: ( new MarkdownString()).appendText(( localize(883, "Selection Anchor"))),
+                    hoverMessage: ( new MarkdownString()).appendText(( localize(893, "Selection Anchor"))),
                     className: 'selection-anchor'
                 });
             });
             this.selectionAnchorSetContextKey.set(!!this.decorationId);
-            alert(( localize(884, "Anchor set at {0}:{1}", position.lineNumber, position.column)));
+            alert(( localize(894, "Anchor set at {0}:{1}", position.lineNumber, position.column)));
         }
     }
     goToSelectionAnchor() {
@@ -86,7 +86,7 @@ class SetSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.setSelectionAnchor',
-            label: ( localize2(885, "Set Selection Anchor")),
+            label: ( localize2(895, "Set Selection Anchor")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -103,7 +103,7 @@ class GoToSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.goToSelectionAnchor',
-            label: ( localize2(886, "Go to Selection Anchor")),
+            label: ( localize2(896, "Go to Selection Anchor")),
             precondition: SelectionAnchorSet,
         });
     }
@@ -115,7 +115,7 @@ class SelectFromAnchorToCursor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.selectFromAnchorToCursor',
-            label: ( localize2(887, "Select from Anchor to Cursor")),
+            label: ( localize2(897, "Select from Anchor to Cursor")),
             precondition: SelectionAnchorSet,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -132,7 +132,7 @@ class CancelSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.cancelSelectionAnchor',
-            label: ( localize2(888, "Cancel Selection Anchor")),
+            label: ( localize2(898, "Cancel Selection Anchor")),
             precondition: SelectionAnchorSet,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,