@codingame/monaco-vscode-api 26.2.2 → 27.0.0

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

@@ -10,6 +10,7 @@ import { ICommand, ICursorState, IViewState, ScrollType } from "../editorCommon.
 import { IEditorConfiguration } from "../config/editorConfiguration.js";
 import { EndOfLinePreference, IAttachedView, ICursorStateComputer, IGlyphMarginLanesModel, IIdentifiedSingleEditOperation, ITextModel, PositionAffinity, TextDirection } from "../model.js";
 import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide } from "../textModelGuides.js";
+import * as textModelEvents from "../textModelEvents.js";
 import { ILanguageConfigurationService } from "../languages/languageConfigurationRegistry.service.js";
 import { EditorTheme } from "../editorTheme.js";
 import * as viewEvents from "../viewEvents.js";
@@ -48,6 +49,7 @@ export declare class ViewModel extends Disposable implements IViewModel {
     addViewEventHandler(eventHandler: ViewEventHandler): void;
     removeViewEventHandler(eventHandler: ViewEventHandler): void;
     private _getCustomLineHeights;
+    private _getCustomLineHeightsForLines;
     private _updateConfigurationViewLineCountNow;
     private getModelVisibleRanges;
     visibleLinesStabilized(): void;
@@ -58,6 +60,14 @@ export declare class ViewModel extends Disposable implements IViewModel {
     onCompositionEnd(): void;
     private _captureStableViewport;
     private _onConfigurationChanged;
+    /**
+     * Gets called directly by the text model.
+     */
+    onDidChangeContentOrInjectedText(e: textModelEvents.InternalModelContentChangeEvent | textModelEvents.ModelInjectedTextChangedEvent): void;
+    /**
+     * Gets called directly by the text model.
+     */
+    emitContentChangeEvent(e: textModelEvents.InternalModelContentChangeEvent | textModelEvents.ModelInjectedTextChangedEvent): void;
     private _registerModelEvents;
     private readonly hiddenAreasModel;
     private previousHiddenAreas;
@@ -157,6 +167,7 @@ export declare class ViewModel extends Disposable implements IViewModel {
     revealRange(source: string | null | undefined, revealHorizontal: boolean, viewRange: Range, verticalType: viewEvents.VerticalRevealType, scrollType: ScrollType): void;
     changeWhitespace(callback: (accessor: IWhitespaceChangeAccessor) => void): void;
     private _withViewEventsCollector;
+    private _emitViewEvent;
     batchEvents(callback: () => void): void;
     normalizePosition(position: Position, affinity: PositionAffinity): Position;
     /**

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

@@ -27,6 +27,7 @@ import { ViewModelDecorations } from './viewModelDecorations.js';
 import { ViewModelEventDispatcher, ScrollChangedEvent, FocusChangedEvent, WidgetFocusChangedEvent, ModelContentChangedEvent, ModelLineHeightChangedEvent as ModelLineHeightChangedEvent$1, ModelFontChangedEvent as ModelFontChangedEvent$1, ModelTokensChangedEvent, ModelLanguageConfigurationChangedEvent, ModelLanguageChangedEvent, ModelOptionsChangedEvent, ModelDecorationsChangedEvent, HiddenAreasChangedEvent, ReadOnlyEditAttemptEvent, ViewZonesChangedEvent as ViewZonesChangedEvent$1 } from '../viewModelEventDispatcher.js';
 import { ViewModelLinesFromModelAsIs, ViewModelLinesFromProjectedModel } from './viewModelLines.js';
 import { GlyphMarginLanesModel } from './glyphLanesModel.js';
+import { CustomLineHeightData } from '../viewLayout/lineHeights.js';
 
 class ViewModel extends Disposable {
     constructor(
@@ -141,6 +142,7 @@ class ViewModel extends Disposable {
             this._eventDispatcher.emitSingleViewEvent(new ViewThemeChangedEvent(theme));
         }));
         this._updateConfigurationViewLineCountNow();
+        this.model.registerViewModel(this);
     }
     dispose() {
         super.dispose();
@@ -148,6 +150,7 @@ class ViewModel extends Disposable {
         this._lines.dispose();
         this._viewportStart.dispose();
         this._eventDispatcher.dispose();
+        this.model.unregisterViewModel(this);
     }
     getEditorOption(id) {
         return this._configuration.options.get(id);
@@ -166,18 +169,17 @@ class ViewModel extends Disposable {
         if (!allowVariableLineHeights) {
             return [];
         }
-        const defaultLineHeight = this._configuration.options.get(EditorOption.lineHeight);
         const decorations = this.model.getCustomLineHeightsDecorations(this._editorId);
-        return ( decorations.map(d => {
-            const lineNumber = d.range.startLineNumber;
-            const viewRange = this.coordinatesConverter.convertModelRangeToViewRange(( new Range(lineNumber, 1, lineNumber, this.model.getLineMaxColumn(lineNumber))));
-            return {
-                decorationId: d.id,
-                startLineNumber: viewRange.startLineNumber,
-                endLineNumber: viewRange.endLineNumber,
-                lineHeight: d.options.lineHeight ? d.options.lineHeight * defaultLineHeight : 0
-            };
-        }));
+        return CustomLineHeightData.fromDecorations(decorations, this.coordinatesConverter, this._configuration);
+    }
+    _getCustomLineHeightsForLines(fromLineNumber, toLineNumber) {
+        const allowVariableLineHeights = this._configuration.options.get(EditorOption.allowVariableLineHeights);
+        if (!allowVariableLineHeights) {
+            return [];
+        }
+        const modelRange = ( new Range(fromLineNumber, 1, toLineNumber, this.model.getLineMaxColumn(toLineNumber)));
+        const decorations = this.model.getCustomLineHeightsDecorationsInRange(modelRange, this._editorId);
+        return CustomLineHeightData.fromDecorations(decorations, this.coordinatesConverter, this._configuration);
     }
     _updateConfigurationViewLineCountNow() {
         this._configuration.setViewLineCount(this._lines.getViewLineCount());
@@ -271,141 +273,172 @@ class ViewModel extends Disposable {
             this._cursor.updateConfiguration(this.cursorConfig);
         }
     }
-    _registerModelEvents() {
-        this._register(this.model.onDidChangeContentOrInjectedText(e => {
-            try {
-                const eventsCollector = this._eventDispatcher.beginEmitViewEvents();
-                let hadOtherModelChange = false;
-                let hadModelLineChangeThatChangedLineMapping = false;
-                const changes = (e instanceof InternalModelContentChangeEvent ? e.rawContentChangedEvent.changes : e.changes);
-                const versionId = (e instanceof InternalModelContentChangeEvent ? e.rawContentChangedEvent.versionId : null);
-                const lineBreaksComputer = this._lines.createLineBreaksComputer();
-                for (const change of changes) {
-                    switch (change.changeType) {
-                    case RawContentChangedType.LinesInserted:
-                        {
-                            for (let lineIdx = 0; lineIdx < change.detail.length; lineIdx++) {
-                                const line = change.detail[lineIdx];
-                                let injectedText = change.injectedTexts[lineIdx];
-                                if (injectedText) {
-                                    injectedText = injectedText.filter(element => (!element.ownerId || element.ownerId === this._editorId));
-                                }
-                                lineBreaksComputer.addRequest(line, injectedText, null);
+    onDidChangeContentOrInjectedText(e) {
+        try {
+            const eventsCollector = this._eventDispatcher.beginEmitViewEvents();
+            let hadOtherModelChange = false;
+            let hadModelLineChangeThatChangedLineMapping = false;
+            const changes = (e instanceof InternalModelContentChangeEvent ? e.rawContentChangedEvent.changes : e.changes);
+            const versionId = (e instanceof InternalModelContentChangeEvent ? e.rawContentChangedEvent.versionId : null);
+            const lineBreaksComputer = this._lines.createLineBreaksComputer();
+            for (const change of changes) {
+                switch (change.changeType) {
+                case RawContentChangedType.LinesInserted:
+                    {
+                        for (let lineIdx = 0; lineIdx < change.detail.length; lineIdx++) {
+                            const line = change.detail[lineIdx];
+                            let injectedText = change.injectedTexts[lineIdx];
+                            if (injectedText) {
+                                injectedText = injectedText.filter(element => (!element.ownerId || element.ownerId === this._editorId));
                             }
-                            break;
+                            lineBreaksComputer.addRequest(line, injectedText, null);
                         }
-                    case RawContentChangedType.LineChanged:
-                        {
-                            let injectedText = null;
-                            if (change.injectedText) {
-                                injectedText = change.injectedText.filter(element => (!element.ownerId || element.ownerId === this._editorId));
-                            }
-                            lineBreaksComputer.addRequest(change.detail, injectedText, null);
-                            break;
+                        break;
+                    }
+                case RawContentChangedType.LineChanged:
+                    {
+                        let injectedText = null;
+                        if (change.injectedText) {
+                            injectedText = change.injectedText.filter(element => (!element.ownerId || element.ownerId === this._editorId));
                         }
+                        lineBreaksComputer.addRequest(change.detail, injectedText, null);
+                        break;
                     }
                 }
-                const lineBreaks = lineBreaksComputer.finalize();
-                const lineBreakQueue = ( new ArrayQueue(lineBreaks));
-                for (const change of changes) {
-                    switch (change.changeType) {
-                    case RawContentChangedType.Flush:
-                        {
-                            this._lines.onModelFlushed();
-                            eventsCollector.emitViewEvent(new ViewFlushedEvent());
-                            this._decorations.reset();
-                            this.viewLayout.onFlushed(this.getLineCount(), this._getCustomLineHeights());
-                            hadOtherModelChange = true;
-                            break;
+            }
+            const lineBreaks = lineBreaksComputer.finalize();
+            const lineBreakQueue = ( new ArrayQueue(lineBreaks));
+            const customLineHeightRangesToInsert = [];
+            for (const change of changes) {
+                switch (change.changeType) {
+                case RawContentChangedType.Flush:
+                    {
+                        this._lines.onModelFlushed();
+                        eventsCollector.emitViewEvent(new ViewFlushedEvent());
+                        this._decorations.reset();
+                        this.viewLayout.onFlushed(this.getLineCount(), this._getCustomLineHeights());
+                        hadOtherModelChange = true;
+                        break;
+                    }
+                case RawContentChangedType.LinesDeleted:
+                    {
+                        const linesDeletedEvent = this._lines.onModelLinesDeleted(versionId, change.fromLineNumber, change.toLineNumber);
+                        if (linesDeletedEvent !== null) {
+                            eventsCollector.emitViewEvent(linesDeletedEvent);
+                            this.viewLayout.onLinesDeleted(linesDeletedEvent.fromLineNumber, linesDeletedEvent.toLineNumber);
+                            customLineHeightRangesToInsert.push({
+                                fromLineNumber: change.lastUntouchedLinePostEdit,
+                                toLineNumber: change.lastUntouchedLinePostEdit
+                            });
                         }
-                    case RawContentChangedType.LinesDeleted:
-                        {
-                            const linesDeletedEvent = this._lines.onModelLinesDeleted(versionId, change.fromLineNumber, change.toLineNumber);
-                            if (linesDeletedEvent !== null) {
-                                eventsCollector.emitViewEvent(linesDeletedEvent);
-                                this.viewLayout.onLinesDeleted(linesDeletedEvent.fromLineNumber, linesDeletedEvent.toLineNumber);
-                            }
-                            hadOtherModelChange = true;
-                            break;
+                        hadOtherModelChange = true;
+                        break;
+                    }
+                case RawContentChangedType.LinesInserted:
+                    {
+                        const insertedLineBreaks = lineBreakQueue.takeCount(change.detail.length);
+                        const linesInsertedEvent = this._lines.onModelLinesInserted(versionId, change.fromLineNumber, change.toLineNumber, insertedLineBreaks);
+                        if (linesInsertedEvent !== null) {
+                            eventsCollector.emitViewEvent(linesInsertedEvent);
+                            this.viewLayout.onLinesInserted(linesInsertedEvent.fromLineNumber, linesInsertedEvent.toLineNumber);
+                            customLineHeightRangesToInsert.push({
+                                fromLineNumber: change.fromLineNumberPostEdit,
+                                toLineNumber: change.toLineNumberPostEdit
+                            });
                         }
-                    case RawContentChangedType.LinesInserted:
-                        {
-                            const insertedLineBreaks = lineBreakQueue.takeCount(change.detail.length);
-                            const linesInsertedEvent = this._lines.onModelLinesInserted(versionId, change.fromLineNumber, change.toLineNumber, insertedLineBreaks);
-                            if (linesInsertedEvent !== null) {
-                                eventsCollector.emitViewEvent(linesInsertedEvent);
-                                this.viewLayout.onLinesInserted(linesInsertedEvent.fromLineNumber, linesInsertedEvent.toLineNumber);
-                            }
-                            hadOtherModelChange = true;
-                            break;
+                        hadOtherModelChange = true;
+                        break;
+                    }
+                case RawContentChangedType.LineChanged:
+                    {
+                        const changedLineBreakData = lineBreakQueue.dequeue();
+                        const [
+                            lineMappingChanged,
+                            linesChangedEvent,
+                            linesInsertedEvent,
+                            linesDeletedEvent
+                        ] = this._lines.onModelLineChanged(versionId, change.lineNumber, changedLineBreakData);
+                        hadModelLineChangeThatChangedLineMapping = lineMappingChanged;
+                        if (linesChangedEvent) {
+                            eventsCollector.emitViewEvent(linesChangedEvent);
                         }
-                    case RawContentChangedType.LineChanged:
-                        {
-                            const changedLineBreakData = lineBreakQueue.dequeue();
-                            const [
-                                lineMappingChanged,
-                                linesChangedEvent,
-                                linesInsertedEvent,
-                                linesDeletedEvent
-                            ] = this._lines.onModelLineChanged(versionId, change.lineNumber, changedLineBreakData);
-                            hadModelLineChangeThatChangedLineMapping = lineMappingChanged;
-                            if (linesChangedEvent) {
-                                eventsCollector.emitViewEvent(linesChangedEvent);
-                            }
-                            if (linesInsertedEvent) {
-                                eventsCollector.emitViewEvent(linesInsertedEvent);
-                                this.viewLayout.onLinesInserted(linesInsertedEvent.fromLineNumber, linesInsertedEvent.toLineNumber);
-                            }
-                            if (linesDeletedEvent) {
-                                eventsCollector.emitViewEvent(linesDeletedEvent);
-                                this.viewLayout.onLinesDeleted(linesDeletedEvent.fromLineNumber, linesDeletedEvent.toLineNumber);
-                            }
-                            break;
+                        if (linesInsertedEvent) {
+                            eventsCollector.emitViewEvent(linesInsertedEvent);
+                            this.viewLayout.onLinesInserted(linesInsertedEvent.fromLineNumber, linesInsertedEvent.toLineNumber);
+                            customLineHeightRangesToInsert.push({
+                                fromLineNumber: change.lineNumberPostEdit,
+                                toLineNumber: change.lineNumberPostEdit
+                            });
                         }
-                    case RawContentChangedType.EOLChanged:
-                        {
-                            break;
+                        if (linesDeletedEvent) {
+                            eventsCollector.emitViewEvent(linesDeletedEvent);
+                            this.viewLayout.onLinesDeleted(linesDeletedEvent.fromLineNumber, linesDeletedEvent.toLineNumber);
+                            customLineHeightRangesToInsert.push({
+                                fromLineNumber: change.lineNumberPostEdit,
+                                toLineNumber: change.lineNumberPostEdit
+                            });
                         }
+                        break;
+                    }
+                case RawContentChangedType.EOLChanged:
+                    {
+                        break;
                     }
                 }
-                if (versionId !== null) {
-                    this._lines.acceptVersionId(versionId);
-                }
-                this.viewLayout.onHeightMaybeChanged();
-                if (!hadOtherModelChange && hadModelLineChangeThatChangedLineMapping) {
-                    eventsCollector.emitViewEvent(new ViewLineMappingChangedEvent());
-                    eventsCollector.emitViewEvent(new ViewDecorationsChangedEvent(null));
-                    this._cursor.onLineMappingChanged(eventsCollector);
-                    this._decorations.onLineMappingChanged();
-                }
-            } finally {
-                this._eventDispatcher.endEmitViewEvents();
             }
-            const viewportStartWasValid = this._viewportStart.isValid;
-            this._viewportStart.invalidate();
-            this._configuration.setModelLineCount(this.model.getLineCount());
-            this._updateConfigurationViewLineCountNow();
-            if (!this._hasFocus && this.model.getAttachedEditorCount() >= 2 && viewportStartWasValid) {
-                const modelRange = this.model._getTrackedRange(this._viewportStart.modelTrackedRange);
-                if (modelRange) {
-                    const viewPosition = this.coordinatesConverter.convertModelPositionToViewPosition(modelRange.getStartPosition());
-                    const viewPositionTop = this.viewLayout.getVerticalOffsetForLineNumber(viewPosition.lineNumber);
-                    this.viewLayout.setScrollPosition({
-                        scrollTop: viewPositionTop + this._viewportStart.startLineDelta
-                    }, ScrollType.Immediate);
-                }
+            if (versionId !== null) {
+                this._lines.acceptVersionId(versionId);
             }
-            try {
-                const eventsCollector = this._eventDispatcher.beginEmitViewEvents();
-                if (e instanceof InternalModelContentChangeEvent) {
-                    eventsCollector.emitOutgoingEvent(( new ModelContentChangedEvent(e.contentChangedEvent)));
-                }
-                this._cursor.onModelContentChanged(eventsCollector, e);
-            } finally {
-                this._eventDispatcher.endEmitViewEvents();
+            if (customLineHeightRangesToInsert.length > 0) {
+                this.viewLayout.changeSpecialLineHeights(accessor => {
+                    for (const range of customLineHeightRangesToInsert) {
+                        const customLineHeights = this._getCustomLineHeightsForLines(range.fromLineNumber, range.toLineNumber);
+                        for (const data of customLineHeights) {
+                            accessor.insertOrChangeCustomLineHeight(
+                                data.decorationId,
+                                data.startLineNumber,
+                                data.endLineNumber,
+                                data.lineHeight
+                            );
+                        }
+                    }
+                });
             }
-            this._handleVisibleLinesChanged();
-        }));
+            this.viewLayout.onHeightMaybeChanged();
+            if (!hadOtherModelChange && hadModelLineChangeThatChangedLineMapping) {
+                eventsCollector.emitViewEvent(new ViewLineMappingChangedEvent());
+                eventsCollector.emitViewEvent(new ViewDecorationsChangedEvent(null));
+                this._cursor.onLineMappingChanged(eventsCollector);
+                this._decorations.onLineMappingChanged();
+            }
+        } finally {
+            this._eventDispatcher.endEmitViewEvents();
+        }
+        const viewportStartWasValid = this._viewportStart.isValid;
+        this._viewportStart.invalidate();
+        this._configuration.setModelLineCount(this.model.getLineCount());
+        this._updateConfigurationViewLineCountNow();
+        if (!this._hasFocus && this.model.getAttachedEditorCount() >= 2 && viewportStartWasValid) {
+            const modelRange = this.model._getTrackedRange(this._viewportStart.modelTrackedRange);
+            if (modelRange) {
+                const viewPosition = this.coordinatesConverter.convertModelPositionToViewPosition(modelRange.getStartPosition());
+                const viewPositionTop = this.viewLayout.getVerticalOffsetForLineNumber(viewPosition.lineNumber);
+                this.viewLayout.setScrollPosition({
+                    scrollTop: viewPositionTop + this._viewportStart.startLineDelta
+                }, ScrollType.Immediate);
+            }
+        }
+        this._handleVisibleLinesChanged();
+    }
+    emitContentChangeEvent(e) {
+        this._emitViewEvent(eventsCollector => {
+            if (e instanceof InternalModelContentChangeEvent) {
+                eventsCollector.emitOutgoingEvent(( new ModelContentChangedEvent(e.contentChangedEvent)));
+            }
+            this._cursor.onModelContentChanged(eventsCollector, e);
+        });
+    }
+    _registerModelEvents() {
         const allowVariableLineHeights = this._configuration.options.get(EditorOption.allowVariableLineHeights);
         if (allowVariableLineHeights) {
             this._register(this.model.onDidChangeLineHeight(e => {
@@ -709,9 +742,6 @@ class ViewModel extends Disposable {
         return this._lines.getViewLineCount();
     }
     setViewport(startLineNumber, endLineNumber, centeredLineNumber) {
-        if (this._lines.getViewLineCount() === 0) {
-            return;
-        }
         this._viewportStart.update(this, startLineNumber);
     }
     getActiveIndentGuide(lineNumber, minLineNumber, maxLineNumber) {
@@ -805,7 +835,7 @@ class ViewModel extends Disposable {
         const tabSize = this.getTabSize();
         const lineData = this._lines.getViewLineData(lineNumber);
         if (lineData.inlineDecorations) {
-            inlineDecorations = [...inlineDecorations, ...( lineData.inlineDecorations.map(d => d.toInlineDecoration(lineNumber)))];
+            inlineDecorations = [...inlineDecorations, ...lineData.inlineDecorations];
         }
         return ( new ViewLineRenderingData(
             lineData.minColumn,
@@ -1207,14 +1237,17 @@ class ViewModel extends Disposable {
     }
     _withViewEventsCollector(callback) {
         return this._transactionalTarget.batchChanges(() => {
-            try {
-                const eventsCollector = this._eventDispatcher.beginEmitViewEvents();
-                return callback(eventsCollector);
-            } finally {
-                this._eventDispatcher.endEmitViewEvents();
-            }
+            return this._emitViewEvent(callback);
         });
     }
+    _emitViewEvent(callback) {
+        try {
+            const eventsCollector = this._eventDispatcher.beginEmitViewEvents();
+            return callback(eventsCollector);
+        } finally {
+            this._eventDispatcher.endEmitViewEvents();
+        }
+    }
     batchEvents(callback) {
         this._withViewEventsCollector(() => {
             callback();

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

@@ -85,6 +85,7 @@ export declare class ViewModelLinesFromProjectedModel implements IViewModelLines
         viewEvents.ViewLinesDeletedEvent | null
     ];
     acceptVersionId(versionId: number): void;
+    private _ensureAtLeastOneVisibleLine;
     getViewLineCount(): number;
     private _toValidViewLineNumber;
     getActiveIndentGuide(viewLineNumber: number, minLineNumber: number, maxLineNumber: number): IActiveIndentGuideInfo;

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

@@ -85,6 +85,7 @@ class ViewModelLinesFromProjectedModel {
         }
         this._validModelVersionId = this.model.getVersionId();
         this.projectedModelLineLineCounts = ( new ConstantTimePrefixSumComputer(values));
+        this._ensureAtLeastOneVisibleLine();
     }
     getHiddenAreas() {
         return ( this.hiddenAreasDecorationIds.map(decId => this.model.getDecorationRange(decId)));
@@ -281,8 +282,12 @@ class ViewModelLinesFromProjectedModel {
     }
     acceptVersionId(versionId) {
         this._validModelVersionId = versionId;
-        if (this.modelLineProjections.length === 1 && !this.modelLineProjections[0].isVisible()) {
-            this.setHiddenAreas([]);
+        this._ensureAtLeastOneVisibleLine();
+    }
+    _ensureAtLeastOneVisibleLine() {
+        if (this.getViewLineCount() === 0 && this.modelLineProjections.length > 0) {
+            this.modelLineProjections[0] = this.modelLineProjections[0].setVisible(true);
+            this.projectedModelLineLineCounts.setValue(0, this.modelLineProjections[0].getViewLineCount());
         }
     }
     getViewLineCount() {
@@ -531,7 +536,13 @@ class ViewModelLinesFromProjectedModel {
     }
     getViewLineData(viewLineNumber) {
         const info = this.getViewLineInfo(viewLineNumber);
-        return this.modelLineProjections[info.modelLineNumber - 1].getViewLineData(this.model, info.modelLineNumber, info.modelLineWrappedLineIdx);
+        const baseViewLineNumber = this.projectedModelLineLineCounts.getPrefixSum(info.modelLineNumber - 1) + 1;
+        return this.modelLineProjections[info.modelLineNumber - 1].getViewLineData(
+            this.model,
+            info.modelLineNumber,
+            info.modelLineWrappedLineIdx,
+            baseViewLineNumber
+        );
     }
     getViewLinesData(viewStartLineNumber, viewEndLineNumber, needed) {
         viewStartLineNumber = this._toValidViewLineNumber(viewStartLineNumber);
@@ -553,11 +564,13 @@ class ViewModelLinesFromProjectedModel {
                 lastLine = true;
                 remainingViewLineCount = viewEndLineNumber - viewLineNumber + 1;
             }
+            const baseViewLineNumber = this.projectedModelLineLineCounts.getPrefixSum(modelLineIndex) + 1;
             line.getViewLinesData(
                 this.model,
                 modelLineIndex + 1,
                 fromViewLineIndex,
                 remainingViewLineCount,
+                baseViewLineNumber,
                 viewLineNumber - viewStartLineNumber,
                 needed,
                 result

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

@@ -9,11 +9,12 @@ import { INewScrollPosition, ScrollType } from "./editorCommon.js";
 import { EditorTheme } from "./editorTheme.js";
 import { EndOfLinePreference, IGlyphMarginLanesModel, IModelDecorationOptions, ITextModel, TextDirection } from "./model.js";
 import { ILineBreaksComputer, InjectedText } from "./modelLineProjectionData.js";
+import { InternalModelContentChangeEvent, ModelInjectedTextChangedEvent } from "./textModelEvents.js";
 import { BracketGuideOptions, IActiveIndentGuideInfo, IndentGuide } from "./textModelGuides.js";
 import { IViewLineTokens } from "./tokens/lineTokens.js";
 import { ViewEventHandler } from "./viewEventHandler.js";
 import { VerticalRevealType } from "./viewEvents.js";
-import { InlineDecoration, SingleLineInlineDecoration } from "./viewModel/inlineDecorations.js";
+import { InlineDecoration } from "./viewModel/inlineDecorations.js";
 import { EditorOption, FindComputedEditorOptionValueById } from "./config/editorOptions.js";
 export interface IViewModel extends ICursorSimpleModel, ISimpleModel {
     readonly model: ITextModel;
@@ -69,6 +70,8 @@ export interface IViewModel extends ICursorSimpleModel, ISimpleModel {
         html: string;
         mode: string;
     } | null;
+    onDidChangeContentOrInjectedText(e: InternalModelContentChangeEvent | ModelInjectedTextChangedEvent): void;
+    emitContentChangeEvent(e: InternalModelContentChangeEvent | ModelInjectedTextChangedEvent): void;
     createLineBreaksComputer(): ILineBreaksComputer;
     getPrimaryCursorState(): CursorState;
     getLastAddedCursorIndex(): number;
@@ -215,8 +218,8 @@ export declare class ViewLineData {
     /**
      * Additional inline decorations for this line.
     */
-    readonly inlineDecorations: readonly SingleLineInlineDecoration[] | null;
-    constructor(content: string, continuesWithWrappedLine: boolean, minColumn: number, maxColumn: number, startVisibleColumn: number, tokens: IViewLineTokens, inlineDecorations: readonly SingleLineInlineDecoration[] | null);
+    readonly inlineDecorations: readonly InlineDecoration[] | null;
+    constructor(content: string, continuesWithWrappedLine: boolean, minColumn: number, maxColumn: number, startVisibleColumn: number, tokens: IViewLineTokens, inlineDecorations: readonly InlineDecoration[] | null);
 }
 export declare class ViewLineRenderingData {
     /**

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

@@ -42,12 +42,12 @@ let SelectionAnchorController = class SelectionAnchorController {
                 this.decorationId = accessor.addDecoration(Selection.fromPositions(position, position), {
                     description: "selection-anchor",
                     stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-                    hoverMessage: ( new MarkdownString()).appendText(( localize(912, "Selection Anchor"))),
+                    hoverMessage: ( new MarkdownString()).appendText(( localize(930, "Selection Anchor"))),
                     className: "selection-anchor"
                 });
             });
             this.selectionAnchorSetContextKey.set(!!this.decorationId);
-            alert(( localize(913, "Anchor set at {0}:{1}", position.lineNumber, position.column)));
+            alert(( localize(931, "Anchor set at {0}:{1}", position.lineNumber, position.column)));
         }
     }
     goToSelectionAnchor() {
@@ -88,7 +88,7 @@ class SetSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: "editor.action.setSelectionAnchor",
-            label: ( localize2(914, "Set Selection Anchor")),
+            label: ( localize2(932, "Set Selection Anchor")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -105,7 +105,7 @@ class GoToSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: "editor.action.goToSelectionAnchor",
-            label: ( localize2(915, "Go to Selection Anchor")),
+            label: ( localize2(933, "Go to Selection Anchor")),
             precondition: SelectionAnchorSet
         });
     }
@@ -117,7 +117,7 @@ class SelectFromAnchorToCursor extends EditorAction {
     constructor() {
         super({
             id: "editor.action.selectFromAnchorToCursor",
-            label: ( localize2(916, "Select from Anchor to Cursor")),
+            label: ( localize2(934, "Select from Anchor to Cursor")),
             precondition: SelectionAnchorSet,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -134,7 +134,7 @@ class CancelSelectionAnchor extends EditorAction {
     constructor() {
         super({
             id: "editor.action.cancelSelectionAnchor",
-            label: ( localize2(917, "Cancel Selection Anchor")),
+            label: ( localize2(935, "Cancel Selection Anchor")),
             precondition: SelectionAnchorSet,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,

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

@@ -30,12 +30,12 @@ import { themeColorFromId, registerThemingParticipant } from '../../../../platfo
 import { editorBracketMatchForeground } from '../../../common/core/editorColorRegistry.js';
 
 registerCss(bracketMatching);
-const overviewRulerBracketMatchForeground = registerColor("editorOverviewRuler.bracketMatchForeground", "#A0A0A0", ( localize(918, "Overview ruler marker color for matching brackets.")));
+const overviewRulerBracketMatchForeground = registerColor("editorOverviewRuler.bracketMatchForeground", "#A0A0A0", ( localize(936, "Overview ruler marker color for matching brackets.")));
 class JumpToBracketAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.jumpToBracket",
-            label: ( localize2(919, "Go to Bracket")),
+            label: ( localize2(937, "Go to Bracket")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -52,10 +52,10 @@ class SelectToBracketAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.selectToBracket",
-            label: ( localize2(920, "Select to Bracket")),
+            label: ( localize2(938, "Select to Bracket")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(921, "Select the text inside and including the brackets or curly braces")),
+                description: ( localize2(939, "Select the text inside and including the brackets or curly braces")),
                 args: [{
                     name: "args",
                     schema: {
@@ -83,7 +83,7 @@ class RemoveBracketsAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.removeBrackets",
-            label: ( localize2(922, "Remove Brackets")),
+            label: ( localize2(940, "Remove Brackets")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -369,7 +369,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: "5_infile_nav",
     command: {
         id: "editor.action.jumpToBracket",
-        title: ( localize(923, "Go to &&Bracket"))
+        title: ( localize(941, "Go to &&Bracket"))
     },
     order: 2
 });

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

@@ -27,7 +27,7 @@ class MoveCaretLeftAction extends MoveCaretAction {
     constructor() {
         super(true, {
             id: "editor.action.moveCarretLeftAction",
-            label: ( localize2(924, "Move Selected Text Left")),
+            label: ( localize2(942, "Move Selected Text Left")),
             precondition: EditorContextKeys.writable
         });
     }
@@ -36,7 +36,7 @@ class MoveCaretRightAction extends MoveCaretAction {
     constructor() {
         super(false, {
             id: "editor.action.moveCarretRightAction",
-            label: ( localize2(925, "Move Selected Text Right")),
+            label: ( localize2(943, "Move Selected Text Right")),
             precondition: EditorContextKeys.writable
         });
     }