@codingame/monaco-vscode-api 26.2.1 → 27.0.0

package/vscode/src/vs/editor/common/model/textModel.js

@@ -6,7 +6,7 @@ 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, combinedDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { listenStream } from '../../../base/common/stream.js';
 import { singleLetterHash, UNUSUAL_LINE_TERMINATORS, isHighSurrogate, htmlAttributeEncodeValue } from '../../../base/common/strings.js';
 import { Constants } from '../../../base/common/uint.js';
@@ -25,6 +25,7 @@ import { ILanguageConfigurationService } from '../languages/languageConfiguratio
 import { isITextSnapshot, DefaultEndOfLine, TextModelResolvedOptions, EndOfLinePreference, EndOfLineSequence, ValidAnnotatedEditOperation, OverviewRulerLane, GlyphMarginLane, TrackedRangeStickiness } from '../model.js';
 import { EditSources } from '../textModelEditSource.js';
 import { InternalModelContentChangeEvent, ModelRawContentChangedEvent, ModelRawFlush, ModelRawEOLChanged, LineInjectedText, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted, ModelInjectedTextChangedEvent, ModelLineHeightChanged, ModelLineHeightChangedEvent, ModelFontChanged, ModelFontChangedEvent } from '../textModelEvents.js';
+import { LineTokens } from '../tokens/lineTokens.js';
 import { BracketPairsTextModelPart } from './bracketPairsTextModelPart/bracketPairsImpl.js';
 import { ColorizedBracketPairsDecorationProvider } from './bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.js';
 import { EditStack } from './editStack.js';
@@ -196,13 +197,7 @@ let TextModel = class TextModel extends Disposable {
         return this._onDidChangeFont.event;
     }
     onDidChangeContent(listener) {
-        return this._eventEmitter.slowEvent(e => listener(e.contentChangedEvent));
-    }
-    onDidChangeContentOrInjectedText(listener) {
-        return combinedDisposable(
-            this._eventEmitter.fastEvent(e => listener(e)),
-            this._onDidChangeInjectedText.event(e => listener(e))
-        );
+        return this._eventEmitter.event(e => listener(e.contentChangedEvent));
     }
     _isDisposing() {
         return this.__isDisposing;
@@ -239,13 +234,13 @@ let TextModel = class TextModel extends Disposable {
         this.onDidChangeDecorations = this._onDidChangeDecorations.event;
         this._onDidChangeOptions = this._register(( new Emitter()));
         this._onDidChangeAttached = this._register(( new Emitter()));
-        this._onDidChangeInjectedText = this._register(( new Emitter()));
         this._onDidChangeLineHeight = this._register(( new Emitter()));
         this._onDidChangeFont = this._register(( new Emitter()));
         this._eventEmitter = this._register(( new DidChangeContentEmitter()));
         this._languageSelectionListener = this._register(( new MutableDisposable()));
         this._deltaDecorationCallCnt = 0;
-        this._attachedViews = ( new AttachedViews());
+        this._attachedViews = this._register(( new AttachedViews()));
+        this._viewModels = ( new Set());
         MODEL_ID++;
         this.id = "$model" + MODEL_ID;
         this.isForSimpleWidget = creationOptions.isForSimpleWidget;
@@ -339,13 +334,19 @@ let TextModel = class TextModel extends Disposable {
         this._bufferDisposable = Disposable.None;
     }
     _hasListeners() {
-        return (this._onWillDispose.hasListeners() || this._onDidChangeDecorations.hasListeners() || this._tokenizationTextModelPart._hasListeners() || this._onDidChangeOptions.hasListeners() || this._onDidChangeAttached.hasListeners() || this._onDidChangeInjectedText.hasListeners() || this._onDidChangeLineHeight.hasListeners() || this._onDidChangeFont.hasListeners() || this._eventEmitter.hasListeners());
+        return (this._onWillDispose.hasListeners() || this._onDidChangeDecorations.hasListeners() || this._tokenizationTextModelPart._hasListeners() || this._onDidChangeOptions.hasListeners() || this._onDidChangeAttached.hasListeners() || this._onDidChangeLineHeight.hasListeners() || this._onDidChangeFont.hasListeners() || this._eventEmitter.hasListeners());
     }
     _assertNotDisposed() {
         if (this._isDisposed) {
             throw ( new BugIndicatingError("Model is disposed!"));
         }
     }
+    registerViewModel(viewModel) {
+        this._viewModels.add(viewModel);
+    }
+    unregisterViewModel(viewModel) {
+        this._viewModels.delete(viewModel);
+    }
     equalsTextBuffer(other) {
         this._assertNotDisposed();
         return this._buffer.equals(other);
@@ -354,14 +355,19 @@ let TextModel = class TextModel extends Disposable {
         this._assertNotDisposed();
         return this._buffer;
     }
-    _emitContentChangedEvent(rawChange, change) {
+    _emitContentChangedEvent(rawChange, change, resultingSelection = null) {
         if (this.__isDisposing) {
             return;
         }
         this._tokenizationTextModelPart.handleDidChangeContent(change);
         this._bracketPairs.handleDidChangeContent(change);
         this._fontTokenDecorationsProvider.handleDidChangeContent(change);
-        this._eventEmitter.fire(( new InternalModelContentChangeEvent(rawChange, change)));
+        const contentChangeEvent = ( new InternalModelContentChangeEvent(rawChange, change));
+        if (resultingSelection) {
+            contentChangeEvent.rawContentChangedEvent.resultingSelection = resultingSelection;
+        }
+        this._onDidChangeContentOrInjectedText(contentChangeEvent);
+        this._eventEmitter.fire(contentChangeEvent);
     }
     setValue(value, reason = EditSources.setValue()) {
         this._assertNotDisposed();
@@ -1197,7 +1203,8 @@ let TextModel = class TextModel extends Disposable {
             this._eventEmitter.beginDeferredEmit();
             this._isUndoing = isUndoing;
             this._isRedoing = isRedoing;
-            this.applyEdits(edits, false);
+            const operations = this._validateEditOperations(edits);
+            this._doApplyEdits(operations, false, EditSources.applyEdits(), resultingSelection);
             this.setEOL(eol);
             this._overwriteAlternativeVersionId(resultingAlternativeVersionId);
         } finally {
@@ -1218,7 +1225,7 @@ let TextModel = class TextModel extends Disposable {
             this._onDidChangeDecorations.endDeferredEmit();
         }
     }
-    _doApplyEdits(rawOperations, computeUndoEdits, reason) {
+    _doApplyEdits(rawOperations, computeUndoEdits, reason, resultingSelection = null) {
         const oldLineCount = this._buffer.getLineCount();
         const result = this._buffer.applyEdits(rawOperations, this._options.trimAutoWhitespace, computeUndoEdits);
         const newLineCount = this._buffer.getLineCount();
@@ -1260,13 +1267,16 @@ let TextModel = class TextModel extends Disposable {
                     const decorationsInCurrentLine = injectedTextInEditedRangeQueue.takeFromEndWhile(r => r.lineNumber === currentEditLineNumber);
                     rawContentChanges.push(( new ModelRawLineChanged(
                         editLineNumber,
+                        currentEditLineNumber,
                         this.getLineContent(currentEditLineNumber),
                         decorationsInCurrentLine
                     )));
                 }
                 if (editingLinesCnt < deletingLinesCnt) {
                     const spliceStartLineNumber = startLineNumber + editingLinesCnt;
-                    rawContentChanges.push(( new ModelRawLinesDeleted(spliceStartLineNumber + 1, endLineNumber)));
+                    const cnt = insertingLinesCnt - deletingLinesCnt;
+                    const lastUntouchedLinePostEdit = newLineCount - lineCount - cnt + spliceStartLineNumber;
+                    rawContentChanges.push(( new ModelRawLinesDeleted(spliceStartLineNumber + 1, endLineNumber, lastUntouchedLinePostEdit)));
                 }
                 if (editingLinesCnt < insertingLinesCnt) {
                     const injectedTextInEditedRangeQueue = ( new ArrayQueue(injectedTextInEditedRange));
@@ -1281,12 +1291,7 @@ let TextModel = class TextModel extends Disposable {
                         injectedTextInEditedRangeQueue.takeWhile(r => r.lineNumber < lineNumber);
                         injectedTexts[i] = injectedTextInEditedRangeQueue.takeWhile(r => r.lineNumber === lineNumber);
                     }
-                    rawContentChanges.push(( new ModelRawLinesInserted(
-                        spliceLineNumber + 1,
-                        startLineNumber + insertingLinesCnt,
-                        newLines,
-                        injectedTexts
-                    )));
+                    rawContentChanges.push(( new ModelRawLinesInserted(spliceLineNumber + 1, fromLineNumber, cnt, newLines, injectedTexts)));
                 }
                 lineCount += changeLineCountDelta;
             }
@@ -1300,7 +1305,7 @@ let TextModel = class TextModel extends Disposable {
                 isFlush: false,
                 detailedReasons: [reason],
                 detailedReasonsChangeLengths: [contentChanges.length]
-            });
+            }, resultingSelection);
         }
         return (result.reverseEdits === null ? undefined : result.reverseEdits);
     }
@@ -1320,11 +1325,12 @@ let TextModel = class TextModel extends Disposable {
         if (affectedInjectedTextLines && affectedInjectedTextLines.size > 0) {
             const affectedLines = Array.from(affectedInjectedTextLines);
             const lineChangeEvents = ( affectedLines.map(lineNumber => ( new ModelRawLineChanged(
+                lineNumber,
                 lineNumber,
                 this.getLineContent(lineNumber),
                 this._getInjectedTextInLine(lineNumber)
             ))));
-            this._onDidChangeInjectedText.fire(( new ModelInjectedTextChangedEvent(lineChangeEvents)));
+            this._onDidChangeContentOrInjectedText(( new ModelInjectedTextChangedEvent(lineChangeEvents)));
         }
         this._fireOnDidChangeLineHeight(affectedLineHeights);
         this._fireOnDidChangeFont(affectedFontLines);
@@ -1348,6 +1354,22 @@ let TextModel = class TextModel extends Disposable {
             this._onDidChangeFont.fire(( new ModelFontChangedEvent(fontChangeEvent)));
         }
     }
+    _onDidChangeContentOrInjectedText(e) {
+        for (const viewModel of this._viewModels) {
+            try {
+                viewModel.onDidChangeContentOrInjectedText(e);
+            } catch (error) {
+                onUnexpectedError(error);
+            }
+        }
+        for (const viewModel of this._viewModels) {
+            try {
+                viewModel.emitContentChangeEvent(e);
+            } catch (error) {
+                onUnexpectedError(error);
+            }
+        }
+    }
     changeDecorations(callback, ownerId = 0) {
         this._assertNotDisposed();
         try {
@@ -1558,6 +1580,19 @@ let TextModel = class TextModel extends Disposable {
         pushMany(decs, this._fontTokenDecorationsProvider.getAllDecorations(ownerId));
         return decs;
     }
+    getCustomLineHeightsDecorationsInRange(range, ownerId = 0) {
+        const decs = this._decorationsTree.getCustomLineHeightsInInterval(
+            this,
+            this.getOffsetAt(range.getStartPosition()),
+            this.getOffsetAt(range.getEndPosition()),
+            ownerId
+        );
+        pushMany(
+            decs,
+            this._fontTokenDecorationsProvider.getDecorationsInRange(range, ownerId)
+        );
+        return decs;
+    }
     _getInjectedTextInLine(lineNumber) {
         const startOffset = this._buffer.getOffsetAt(lineNumber, 1);
         const endOffset = startOffset + this._buffer.getLineLength(lineNumber);
@@ -1798,6 +1833,35 @@ let TextModel = class TextModel extends Disposable {
     }
 };
 TextModel = TextModel_1 = ( __decorate([( __param(4, IUndoRedoService)), ( __param(5, ILanguageService)), ( __param(6, ILanguageConfigurationService)), ( __param(7, IInstantiationService))], TextModel));
+function getLineTokensWithInjections(tokens, injectionOptions, injectionOffsets) {
+    let lineTokens;
+    if (injectionOffsets) {
+        const tokensToInsert = [];
+        for (let idx = 0; idx < injectionOffsets.length; idx++) {
+            const offset = injectionOffsets[idx];
+            const tokens = injectionOptions[idx].tokens;
+            if (tokens) {
+                tokens.forEach((range, info) => {
+                    tokensToInsert.push({
+                        offset,
+                        text: range.substring(injectionOptions[idx].content),
+                        tokenMetadata: info.metadata
+                    });
+                });
+            } else {
+                tokensToInsert.push({
+                    offset,
+                    text: injectionOptions[idx].content,
+                    tokenMetadata: LineTokens.defaultTokenMetadata
+                });
+            }
+        }
+        lineTokens = tokens.withInserted(tokensToInsert);
+    } else {
+        lineTokens = tokens;
+    }
+    return lineTokens;
+}
 function indentOfLine(line) {
     let indent = 0;
     for (const c of line) {
@@ -1914,6 +1978,11 @@ class DecorationsTrees {
         const result = this._search(filterOwnerId, false, false, false, versionId, false);
         return this._ensureNodesHaveRanges(host, result).filter(i => typeof i.options.lineHeight === "number");
     }
+    getCustomLineHeightsInInterval(host, start, end, filterOwnerId) {
+        const versionId = host.getVersionId();
+        const result = this._intervalSearch(start, end, filterOwnerId, false, false, versionId, false);
+        return this._ensureNodesHaveRanges(host, result).filter(i => typeof i.options.lineHeight === "number");
+    }
     getAll(
         host,
         filterOwnerId,
@@ -2281,15 +2350,13 @@ class DidChangeDecorationsEmitter extends Disposable {
 class DidChangeContentEmitter extends Disposable {
     constructor() {
         super();
-        this._fastEmitter = this._register(( new Emitter()));
-        this.fastEvent = this._fastEmitter.event;
-        this._slowEmitter = this._register(( new Emitter()));
-        this.slowEvent = this._slowEmitter.event;
+        this._emitter = this._register(( new Emitter()));
+        this.event = this._emitter.event;
         this._deferredCnt = 0;
         this._deferredEvent = null;
     }
     hasListeners() {
-        return (this._fastEmitter.hasListeners() || this._slowEmitter.hasListeners());
+        return this._emitter.hasListeners();
     }
     beginDeferredEmit() {
         this._deferredCnt++;
@@ -2301,8 +2368,7 @@ class DidChangeContentEmitter extends Disposable {
                 this._deferredEvent.rawContentChangedEvent.resultingSelection = resultingSelection;
                 const e = this._deferredEvent;
                 this._deferredEvent = null;
-                this._fastEmitter.fire(e);
-                this._slowEmitter.fire(e);
+                this._emitter.fire(e);
             }
         }
     }
@@ -2315,9 +2381,8 @@ class DidChangeContentEmitter extends Disposable {
             }
             return;
         }
-        this._fastEmitter.fire(e);
-        this._slowEmitter.fire(e);
+        this._emitter.fire(e);
     }
 }
 
-export { ModelDecorationGlyphMarginOptions, ModelDecorationInjectedTextOptions, ModelDecorationMinimapOptions, ModelDecorationOptions, ModelDecorationOverviewRulerOptions, TextModel, createTextBuffer, createTextBufferFactory, createTextBufferFactoryFromSnapshot, createTextBufferFactoryFromStream, indentOfLine };
+export { ModelDecorationGlyphMarginOptions, ModelDecorationInjectedTextOptions, ModelDecorationMinimapOptions, ModelDecorationOptions, ModelDecorationOverviewRulerOptions, TextModel, createTextBuffer, createTextBufferFactory, createTextBufferFactoryFromSnapshot, createTextBufferFactoryFromStream, getLineTokensWithInjections, indentOfLine };

package/vscode/src/vs/editor/common/model/tokens/abstractSyntaxTokenBackend.d.ts

@@ -1,5 +1,5 @@
 import { Emitter, Event } from "../../../../base/common/event.js";
-import { Disposable } from "../../../../base/common/lifecycle.js";
+import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
 import { LineRange } from "../../core/ranges/lineRange.js";
 import { StandardTokenType } from "../../encodedTokenAttributes.js";
 import { ILanguageIdCodec } from "../../languages.js";
@@ -12,7 +12,7 @@ import { IObservable } from "../../../../base/common/observable.js";
 /**
  * @internal
  */
-export declare class AttachedViews {
+export declare class AttachedViews implements IDisposable {
     private readonly _onDidChangeVisibleRanges;
     readonly onDidChangeVisibleRanges: Event<{
         view: IAttachedView;
@@ -24,6 +24,7 @@ export declare class AttachedViews {
     constructor();
     attachView(): IAttachedView;
     detachView(view: IAttachedView): void;
+    dispose(): void;
 }
 /**
  * @internal

package/vscode/src/vs/editor/common/model/tokens/abstractSyntaxTokenBackend.js

@@ -44,6 +44,9 @@ class AttachedViews {
         });
         this._viewsChanged.trigger(undefined);
     }
+    dispose() {
+        this._onDidChangeVisibleRanges.dispose();
+    }
 }
 class AttachedViewState {
     constructor(visibleLineRanges, stabilized) {

package/vscode/src/vs/editor/common/model/tokens/annotations.js

@@ -33,6 +33,10 @@ class AnnotatedString {
         let startIndex;
         if (startIndexWhereToReplace >= 0) {
             startIndex = startIndexWhereToReplace;
+            const nextCandidate = this._annotations[startIndex]?.range;
+            if (nextCandidate && nextCandidate.endExclusive === offset) {
+                startIndex--;
+            }
         } else {
             const candidate = this._annotations[-(startIndexWhereToReplace + 2)]?.range;
             if (candidate && offset >= candidate.start && offset < candidate.endExclusive) {
@@ -50,9 +54,13 @@ class AnnotatedString {
         let endIndexExclusive;
         if (endIndexWhereToReplace >= 0) {
             endIndexExclusive = endIndexWhereToReplace + 1;
+            const nextCandidate = this._annotations[endIndexExclusive]?.range;
+            if (nextCandidate && nextCandidate.start === offset) {
+                endIndexExclusive++;
+            }
         } else {
             const candidate = this._annotations[-(endIndexWhereToReplace + 1)]?.range;
-            if (candidate && offset > candidate.start && offset <= candidate.endExclusive) {
+            if (candidate && offset >= candidate.start && offset <= candidate.endExclusive) {
                 endIndexExclusive = -endIndexWhereToReplace;
             } else {
                 endIndexExclusive = -(endIndexWhereToReplace + 1);

package/vscode/src/vs/editor/common/model/tokens/tokenizationFontDecorationsProvider.js

@@ -17,9 +17,9 @@ class TokenizationFontDecorationProvider extends Disposable {
         super();
         this.textModel = textModel;
         this.tokenizationTextModelPart = tokenizationTextModelPart;
-        this._onDidChangeLineHeight = ( new Emitter());
+        this._onDidChangeLineHeight = this._register(( new Emitter()));
         this.onDidChangeLineHeight = this._onDidChangeLineHeight.event;
-        this._onDidChangeFont = ( new Emitter());
+        this._onDidChangeFont = this._register(( new Emitter()));
         this.onDidChangeFont = this._onDidChangeFont.event;
         this._fontAnnotatedString = ( new AnnotatedString());
         this._register(this.tokenizationTextModelPart.onDidChangeFontTokens(fontChanges => {

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

@@ -13,7 +13,7 @@ import { IWordAtPosition } from "./core/wordHelper.js";
 import { FormattingOptions } from "./languages.js";
 import { ILanguageSelection } from "./languages/language.js";
 import { IBracketPairsTextModelPart } from "./textModelBracketPairs.js";
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent, InternalModelContentChangeEvent, ModelFontChangedEvent, ModelInjectedTextChangedEvent, ModelLineHeightChangedEvent } from "./textModelEvents.js";
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent, ModelFontChangedEvent, ModelLineHeightChangedEvent } from "./textModelEvents.js";
 import { IModelContentChange } from "./model/mirrorTextModel.js";
 import { IGuidesTextModelPart } from "./textModelGuides.js";
 import { ITokenizationTextModelPart } from "./tokenizationTextModelPart.js";
@@ -22,6 +22,7 @@ import { TokenArray } from "./tokens/lineTokens.js";
 import { IEditorModel } from "./editorCommon.js";
 import { TextModelEditSource } from "./textModelEditSource.js";
 import { TextEdit } from "./core/edits/textEdit.js";
+import { IViewModel } from "./viewModel.js";
 /**
  * Vertical Lane in the overview ruler of the editor.
  */

package/vscode/src/vs/editor/common/standalone/standaloneEnums.d.ts

@@ -327,7 +327,8 @@ export declare enum EditorOption {
     inlineCompletionsAccessibilityVerbose = 169,
     effectiveEditContext = 170,
     scrollOnMiddleClick = 171,
-    effectiveAllowVariableFonts = 172
+    effectiveAllowVariableFonts = 172,
+    doubleClickSelectsBlock = 173
 }
 /**
  * End of line character preference.

package/vscode/src/vs/editor/common/standalone/standaloneEnums.js

@@ -269,6 +269,7 @@ var EditorOption;
     EditorOption[EditorOption["effectiveEditContext"] = 170] = "effectiveEditContext";
     EditorOption[EditorOption["scrollOnMiddleClick"] = 171] = "scrollOnMiddleClick";
     EditorOption[EditorOption["effectiveAllowVariableFonts"] = 172] = "effectiveAllowVariableFonts";
+    EditorOption[EditorOption["doubleClickSelectsBlock"] = 173] = "doubleClickSelectsBlock";
 })(EditorOption || (EditorOption = {}));
 var EndOfLinePreference;
 (function (EndOfLinePreference) {

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

@@ -28,6 +28,7 @@ export declare namespace AccessibilityHelpNLS {
     const listSignalSounds: string;
     const listAlerts: string;
     const announceCursorPosition: string;
+    const focusNotifications: string;
     const quickChat: string;
     const startInlineChat: string;
     const startDebugging: string;