monaco-editor-core 0.56.0-dev-20251124 → 0.56.0-dev-20251217

package/esm/vs/editor/common/model/textModel.js

@@ -13,21 +13,27 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 var TextModel_1;
 import { ArrayQueue, pushMany } from '../../../base/common/arrays.js';
+import { SetWithKey } from '../../../base/common/collections.js';
 import { Color } from '../../../base/common/color.js';
 import { BugIndicatingError, illegalArgument, onUnexpectedError } from '../../../base/common/errors.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable, MutableDisposable, combinedDisposable } from '../../../base/common/lifecycle.js';
 import * as strings from '../../../base/common/strings.js';
 import { URI } from '../../../base/common/uri.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { isDark } from '../../../platform/theme/common/theme.js';
+import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.js';
 import { countEOL } from '../core/misc/eolCounter.js';
 import { normalizeIndentation } from '../core/misc/indentation.js';
+import { EDITOR_MODEL_DEFAULTS } from '../core/misc/textModelDefaults.js';
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
 import { Selection } from '../core/selection.js';
-import { EDITOR_MODEL_DEFAULTS } from '../core/misc/textModelDefaults.js';
 import { ILanguageService } from '../languages/language.js';
 import { ILanguageConfigurationService } from '../languages/languageConfigurationRegistry.js';
 import * as model from '../model.js';
+import { EditSources } from '../textModelEditSource.js';
+import { InternalModelContentChangeEvent, LineInjectedText, ModelFontChanged, ModelFontChangedEvent, ModelInjectedTextChangedEvent, ModelLineHeightChanged, ModelLineHeightChangedEvent, ModelRawContentChangedEvent, ModelRawEOLChanged, ModelRawFlush, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from '../textModelEvents.js';
 import { BracketPairsTextModelPart } from './bracketPairsTextModelPart/bracketPairsImpl.js';
 import { ColorizedBracketPairsDecorationProvider } from './bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.js';
 import { EditStack } from './editStack.js';
@@ -37,14 +43,10 @@ import { IntervalNode, IntervalTree, recomputeMaxEnd } from './intervalTree.js';
 import { PieceTreeTextBuffer } from './pieceTreeTextBuffer/pieceTreeTextBuffer.js';
 import { PieceTreeTextBufferBuilder } from './pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
 import { SearchParams, TextModelSearch } from './textModelSearch.js';
-import { TokenizationTextModelPart } from './tokens/tokenizationTextModelPart.js';
 import { AttachedViews } from './tokens/abstractSyntaxTokenBackend.js';
-import { InternalModelContentChangeEvent, ModelInjectedTextChangedEvent, ModelRawContentChangedEvent, ModelRawEOLChanged, ModelRawFlush, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted, ModelLineHeightChangedEvent, ModelLineHeightChanged, ModelFontChangedEvent, ModelFontChanged, LineInjectedText } from '../textModelEvents.js';
-import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
-import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.js';
-import { SetWithKey } from '../../../base/common/collections.js';
-import { EditSources } from '../textModelEditSource.js';
-import { isDark } from '../../../platform/theme/common/theme.js';
+import { TokenizationFontDecorationProvider } from './tokens/tokenizationFontDecorationsProvider.js';
+import { LineFontChangingDecoration, LineHeightChangingDecoration } from './decorationProvider.js';
+import { TokenizationTextModelPart } from './tokens/tokenizationTextModelPart.js';
 export function createTextBufferFactory(text) {
     const builder = new PieceTreeTextBufferBuilder();
     builder.acceptChunk(text);
@@ -215,6 +217,7 @@ let TextModel = class TextModel extends Disposable {
         this._guidesTextModelPart = this._register(new GuidesTextModelPart(this, this._languageConfigurationService));
         this._decorationProvider = this._register(new ColorizedBracketPairsDecorationProvider(this));
         this._tokenizationTextModelPart = this.instantiationService.createInstance(TokenizationTextModelPart, this, this._bracketPairs, languageId, this._attachedViews);
+        this._fontTokenDecorationsProvider = this._register(new TokenizationFontDecorationProvider(this, this._tokenizationTextModelPart));
         this._isTooLargeForSyncing = (bufferTextLength > TextModel_1._MODEL_SYNC_LIMIT);
         this._versionId = 1;
         this._alternativeVersionId = 1;
@@ -234,6 +237,18 @@ let TextModel = class TextModel extends Disposable {
             this._onDidChangeDecorations.fire();
             this._onDidChangeDecorations.endDeferredEmit();
         }));
+        this._register(this._fontTokenDecorationsProvider.onDidChangeLineHeight((affectedLineHeights) => {
+            this._onDidChangeDecorations.beginDeferredEmit();
+            this._onDidChangeDecorations.fire();
+            this._fireOnDidChangeLineHeight(affectedLineHeights);
+            this._onDidChangeDecorations.endDeferredEmit();
+        }));
+        this._register(this._fontTokenDecorationsProvider.onDidChangeFont((affectedFontLines) => {
+            this._onDidChangeDecorations.beginDeferredEmit();
+            this._onDidChangeDecorations.fire();
+            this._fireOnDidChangeFont(affectedFontLines);
+            this._onDidChangeDecorations.endDeferredEmit();
+        }));
         this._languageService.requestRichLanguageFeatures(languageId);
         this._register(this._languageConfigurationService.onDidChange(e => {
             this._bracketPairs.handleLanguageConfigurationServiceChange(e);
@@ -271,6 +286,7 @@ let TextModel = class TextModel extends Disposable {
         }
         this._tokenizationTextModelPart.handleDidChangeContent(change);
         this._bracketPairs.handleDidChangeContent(change);
+        this._fontTokenDecorationsProvider.handleDidChangeContent(change);
         this._eventEmitter.fire(new InternalModelContentChangeEvent(rawChange, change));
     }
     setValue(value, reason = EditSources.setValue()) {
@@ -923,7 +939,19 @@ let TextModel = class TextModel extends Disposable {
         if (rawOperation instanceof model.ValidAnnotatedEditOperation) {
             return rawOperation;
         }
-        return new model.ValidAnnotatedEditOperation(rawOperation.identifier || null, this.validateRange(rawOperation.range), rawOperation.text, rawOperation.forceMoveMarkers || false, rawOperation.isAutoWhitespaceEdit || false, rawOperation._isTracked || false);
+        const validatedRange = this.validateRange(rawOperation.range);
+        // Normalize edit when replacement text ends with lone CR
+        // and the range ends right before a CRLF in the buffer.
+        // We strip the trailing CR from the replacement text.
+        let opText = rawOperation.text;
+        if (opText) {
+            const endsWithLoneCR = (opText.length > 0 && opText.charCodeAt(opText.length - 1) === 13 /* CharCode.CarriageReturn */);
+            const removeTrailingCR = (this.getEOL() === '\r\n' && endsWithLoneCR && validatedRange.endColumn === this.getLineMaxColumn(validatedRange.endLineNumber));
+            if (removeTrailingCR) {
+                opText = opText.substring(0, opText.length - 1);
+            }
+        }
+        return new model.ValidAnnotatedEditOperation(rawOperation.identifier || null, validatedRange, opText, rawOperation.forceMoveMarkers || false, rawOperation.isAutoWhitespaceEdit || false, rawOperation._isTracked || false);
     }
     _validateEditOperations(rawOperations) {
         const result = [];
@@ -932,6 +960,9 @@ let TextModel = class TextModel extends Disposable {
         }
         return result;
     }
+    edit(edit, options) {
+        this.pushEditOperations(null, edit.replacements.map(r => ({ range: r.range, text: r.text })), null);
+    }
     pushEditOperations(beforeCursorState, editOperations, cursorStateComputer, group, reason) {
         try {
             this._onDidChangeDecorations.beginDeferredEmit();
@@ -1166,11 +1197,17 @@ let TextModel = class TextModel extends Disposable {
             const lineChangeEvents = affectedLines.map(lineNumber => new ModelRawLineChanged(lineNumber, this.getLineContent(lineNumber), this._getInjectedTextInLine(lineNumber)));
             this._onDidChangeInjectedText.fire(new ModelInjectedTextChangedEvent(lineChangeEvents));
         }
+        this._fireOnDidChangeLineHeight(affectedLineHeights);
+        this._fireOnDidChangeFont(affectedFontLines);
+    }
+    _fireOnDidChangeLineHeight(affectedLineHeights) {
         if (affectedLineHeights && affectedLineHeights.size > 0) {
             const affectedLines = Array.from(affectedLineHeights);
             const lineHeightChangeEvent = affectedLines.map(specialLineHeightChange => new ModelLineHeightChanged(specialLineHeightChange.ownerId, specialLineHeightChange.decorationId, specialLineHeightChange.lineNumber, specialLineHeightChange.lineHeight));
             this._onDidChangeLineHeight.fire(new ModelLineHeightChangedEvent(lineHeightChangeEvent));
         }
+    }
+    _fireOnDidChangeFont(affectedFontLines) {
         if (affectedFontLines && affectedFontLines.size > 0) {
             const affectedLines = Array.from(affectedFontLines);
             const fontChangeEvent = affectedLines.map(fontChange => new ModelFontChanged(fontChange.ownerId, fontChange.lineNumber));
@@ -1315,12 +1352,14 @@ let TextModel = class TextModel extends Disposable {
         const range = new Range(startLineNumber, 1, endLineNumber, endColumn);
         const decorations = this._getDecorationsInRange(range, ownerId, filterOutValidation, filterFontDecorations, onlyMarginDecorations);
         pushMany(decorations, this._decorationProvider.getDecorationsInRange(range, ownerId, filterOutValidation));
+        pushMany(decorations, this._fontTokenDecorationsProvider.getDecorationsInRange(range, ownerId, filterOutValidation));
         return decorations;
     }
     getDecorationsInRange(range, ownerId = 0, filterOutValidation = false, filterFontDecorations = false, onlyMinimapDecorations = false, onlyMarginDecorations = false) {
         const validatedRange = this.validateRange(range);
         const decorations = this._getDecorationsInRange(validatedRange, ownerId, filterOutValidation, filterFontDecorations, onlyMarginDecorations);
         pushMany(decorations, this._decorationProvider.getDecorationsInRange(validatedRange, ownerId, filterOutValidation, onlyMinimapDecorations));
+        pushMany(decorations, this._fontTokenDecorationsProvider.getDecorationsInRange(validatedRange, ownerId, filterOutValidation, onlyMinimapDecorations));
         return decorations;
     }
     getOverviewRulerDecorations(ownerId = 0, filterOutValidation = false, filterFontDecorations = false) {
@@ -1346,6 +1385,7 @@ let TextModel = class TextModel extends Disposable {
     getAllDecorations(ownerId = 0, filterOutValidation = false, filterFontDecorations = false) {
         let result = this._decorationsTree.getAll(this, ownerId, filterOutValidation, filterFontDecorations, false, false);
         result = result.concat(this._decorationProvider.getAllDecorations(ownerId, filterOutValidation));
+        result = result.concat(this._fontTokenDecorationsProvider.getAllDecorations(ownerId, filterOutValidation));
         return result;
     }
     getAllMarginDecorations(ownerId = 0) {
@@ -1877,27 +1917,6 @@ function _normalizeOptions(options) {
     }
     return ModelDecorationOptions.createDynamic(options);
 }
-class LineHeightChangingDecoration {
-    static toKey(obj) {
-        return `${obj.ownerId};${obj.decorationId};${obj.lineNumber}`;
-    }
-    constructor(ownerId, decorationId, lineNumber, lineHeight) {
-        this.ownerId = ownerId;
-        this.decorationId = decorationId;
-        this.lineNumber = lineNumber;
-        this.lineHeight = lineHeight;
-    }
-}
-class LineFontChangingDecoration {
-    static toKey(obj) {
-        return `${obj.ownerId};${obj.decorationId};${obj.lineNumber}`;
-    }
-    constructor(ownerId, decorationId, lineNumber) {
-        this.ownerId = ownerId;
-        this.decorationId = decorationId;
-        this.lineNumber = lineNumber;
-    }
-}
 class DidChangeDecorationsEmitter extends Disposable {
     constructor(handleBeforeFire) {
         super();