@codingame/monaco-vscode-api 2.0.3 → 2.1.0-update-vscode-1.86.1

package/vscode/src/vs/editor/common/config/editorOptions.js

@@ -579,7 +579,7 @@ class EditorFontLigatures extends BaseEditorOption {
             return this.defaultValue;
         }
         if (typeof input === 'string') {
-            if (input === 'false') {
+            if (input === 'false' || input.length === 0) {
                 return EditorFontLigatures.OFF;
             }
             if (input === 'true') {
@@ -1269,52 +1269,44 @@ class WrappingStrategy extends BaseEditorOption {
         return value;
     }
 }
-var ShowAiIconMode;
-( (function(ShowAiIconMode) {
-    ShowAiIconMode["Off"] = "off";
-    ShowAiIconMode["OnCode"] = "onCode";
-    ShowAiIconMode["On"] = "on";
-})(ShowAiIconMode || (ShowAiIconMode = {})));
+var ShowLightbulbIconMode;
+( (function(ShowLightbulbIconMode) {
+    ShowLightbulbIconMode["Off"] = "off";
+    ShowLightbulbIconMode["OnCode"] = "onCode";
+    ShowLightbulbIconMode["On"] = "on";
+})(ShowLightbulbIconMode || (ShowLightbulbIconMode = {})));
 class EditorLightbulb extends BaseEditorOption {
     constructor() {
-        const defaults = { enabled: true, experimental: { showAiIcon: ShowAiIconMode.Off } };
+        const defaults = { enabled: ShowLightbulbIconMode.OnCode };
         super(64 , 'lightbulb', defaults, {
             'editor.lightbulb.enabled': {
-                type: 'boolean',
-                default: defaults.enabled,
-                description: ( localizeWithPath(
-                    'vs/editor/common/config/editorOptions',
-                    'codeActions',
-                    "Enables the Code Action lightbulb in the editor."
-                ))
-            },
-            'editor.lightbulb.experimental.showAiIcon': {
                 type: 'string',
-                enum: [ShowAiIconMode.Off, ShowAiIconMode.OnCode, ShowAiIconMode.On],
-                default: defaults.experimental.showAiIcon,
+                tags: ['experimental'],
+                enum: [ShowLightbulbIconMode.Off, ShowLightbulbIconMode.OnCode, ShowLightbulbIconMode.On],
+                default: defaults.enabled,
                 enumDescriptions: [
                     ( localizeWithPath(
                         'vs/editor/common/config/editorOptions',
-                        'editor.lightbulb.showAiIcon.off',
-                        'Don not show the AI icon.'
+                        'editor.lightbulb.enabled.off',
+                        'Disable the code action menu.'
                     )),
                     ( localizeWithPath(
                         'vs/editor/common/config/editorOptions',
-                        'editor.lightbulb.showAiIcon.onCode',
-                        'Show an AI icon when the code action menu contains an AI action, but only on code.'
+                        'editor.lightbulb.enabled.onCode',
+                        'Show the code action menu when the cursor is on lines with code.'
                     )),
                     ( localizeWithPath(
                         'vs/editor/common/config/editorOptions',
-                        'editor.lightbulb.showAiIcon.on',
-                        'Show an AI icon when the code action menu contains an AI action, on code and empty lines.'
+                        'editor.lightbulb.enabled.on',
+                        'Show the code action menu when the cursor is on lines with code or on empty lines.'
                     )),
                 ],
                 description: ( localizeWithPath(
                     'vs/editor/common/config/editorOptions',
-                    'showAiIcons',
-                    "Show an AI icon along with the lightbulb when the code action menu contains an AI action."
+                    'enabled',
+                    "Enables the Code Action lightbulb in the editor."
                 ))
-            },
+            }
         });
     }
     validate(_input) {
@@ -1323,10 +1315,7 @@ class EditorLightbulb extends BaseEditorOption {
         }
         const input = _input;
         return {
-            enabled: boolean(input.enabled, this.defaultValue.enabled),
-            experimental: {
-                showAiIcon: stringSet(input.experimental?.showAiIcon, this.defaultValue.experimental?.showAiIcon, [ShowAiIconMode.Off, ShowAiIconMode.OnCode, ShowAiIconMode.On])
-            }
+            enabled: stringSet(input.enabled, this.defaultValue.enabled, [ShowLightbulbIconMode.Off, ShowLightbulbIconMode.OnCode, ShowLightbulbIconMode.On])
         };
     }
 }
@@ -1341,7 +1330,8 @@ class EditorStickyScroll extends BaseEditorOption {
                     'vs/editor/common/config/editorOptions',
                     'editor.stickyScroll.enabled',
                     "Shows the nested current scopes during the scroll at the top of the editor."
-                ))
+                )),
+                tags: ['experimental']
             },
             'editor.stickyScroll.maxLineCount': {
                 type: 'number',
@@ -2282,6 +2272,7 @@ class InlineEditorSuggest extends BaseEditorOption {
             showToolbar: 'onHover',
             suppressSuggestions: false,
             keepOnBlur: false,
+            fontFamily: 'default'
         };
         super(62 , 'inlineSuggest', defaults, {
             'editor.inlineSuggest.enabled': {
@@ -2329,6 +2320,15 @@ class InlineEditorSuggest extends BaseEditorOption {
                     "Controls how inline suggestions interact with the suggest widget. If enabled, the suggest widget is not shown automatically when inline suggestions are available."
                 ))
             },
+            'editor.inlineSuggest.fontFamily': {
+                type: 'string',
+                default: defaults.fontFamily,
+                description: ( localizeWithPath(
+                    'vs/editor/common/config/editorOptions',
+                    'inlineSuggest.fontFamily',
+                    "Controls the font family of the inline suggestions."
+                ))
+            },
         });
     }
     validate(_input) {
@@ -2342,6 +2342,7 @@ class InlineEditorSuggest extends BaseEditorOption {
             showToolbar: stringSet(input.showToolbar, this.defaultValue.showToolbar, ['always', 'onHover', 'never']),
             suppressSuggestions: boolean(input.suppressSuggestions, this.defaultValue.suppressSuggestions),
             keepOnBlur: boolean(input.keepOnBlur, this.defaultValue.keepOnBlur),
+            fontFamily: EditorStringOption.string(input.fontFamily, this.defaultValue.fontFamily)
         };
     }
 }
@@ -3138,7 +3139,7 @@ class EditorDropIntoEditor extends BaseEditorOption {
                 markdownDescription: ( localizeWithPath(
                     'vs/editor/common/config/editorOptions',
                     'dropIntoEditor.enabled',
-                    "Controls whether you can drag and drop a file into a text editor by holding down `Shift`-key (instead of opening the file in an editor)."
+                    "Controls whether you can drag and drop a file into a text editor by holding down the `Shift` key (instead of opening the file in an editor)."
                 )),
             },
             'editor.dropIntoEditor.showDropSelector': {
@@ -4001,16 +4002,19 @@ const EditorOptions = {
             "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events."
         )) }
     ))),
-    mouseWheelZoom: register(( new EditorBooleanOption(
-        75 ,
-        'mouseWheelZoom',
-        false,
-        { markdownDescription: ( localizeWithPath(
+    mouseWheelZoom: register(( new EditorBooleanOption(75 , 'mouseWheelZoom', false, {
+        markdownDescription: isMacintosh
+            ? ( localizeWithPath(
+            'vs/editor/common/config/editorOptions',
+            'mouseWheelZoom.mac',
+            "Zoom the font of the editor when using mouse wheel and holding `Cmd`."
+        ))
+            : ( localizeWithPath(
             'vs/editor/common/config/editorOptions',
             'mouseWheelZoom',
             "Zoom the font of the editor when using mouse wheel and holding `Ctrl`."
-        )) }
-    ))),
+        ))
+    }))),
     multiCursorMergeOverlapping: register(( new EditorBooleanOption(
         76 ,
         'multiCursorMergeOverlapping',
@@ -4762,4 +4766,4 @@ const EditorOptions = {
     wrappingIndent: register(( new WrappingIndentOption())),
     wrappingStrategy: register(( new WrappingStrategy()))
 };
-export { ApplyUpdateResult, ComputeOptionsMemory, ConfigurationChangedEvent, EDITOR_FONT_DEFAULTS, EditorFontLigatures, EditorFontVariations, EditorLayoutInfoComputer, EditorOptions, MINIMAP_GUTTER_WIDTH, ShowAiIconMode, TextEditorCursorStyle, boolean, clampedFloat, clampedInt, cursorStyleToString, editorOptionsRegistry, filterValidationDecorations, inUntrustedWorkspace, stringSet, unicodeHighlightConfigKeys };
+export { ApplyUpdateResult, ComputeOptionsMemory, ConfigurationChangedEvent, EDITOR_FONT_DEFAULTS, EditorFontLigatures, EditorFontVariations, EditorLayoutInfoComputer, EditorOptions, MINIMAP_GUTTER_WIDTH, ShowLightbulbIconMode, TextEditorCursorStyle, boolean, clampedFloat, clampedInt, cursorStyleToString, editorOptionsRegistry, filterValidationDecorations, inUntrustedWorkspace, stringSet, unicodeHighlightConfigKeys };

package/vscode/src/vs/editor/common/core/editorColorRegistry.js

@@ -1,6 +1,6 @@
 import { localizeWithPath } from '../../../nls.js';
 import { Color, RGBA } from '../../../base/common/color.js';
-import { registerColor, contrastBorder, activeContrastBorder, editorFindMatchHighlight, editorBackground, editorWarningForeground, editorWarningBorder, editorInfoForeground, editorInfoBorder } from '../../../platform/theme/common/colorRegistry.js';
+import { registerColor, contrastBorder, activeContrastBorder, editorFindMatchHighlight, editorBackground, editorWarningForeground, editorWarningBorder, editorInfoForeground, editorInfoBorder, editorWarningBackground } from '../../../platform/theme/common/colorRegistry.js';
 import { registerThemingParticipant } from '../../../platform/theme/common/themeService.js';
 const editorLineHighlight = registerColor('editor.lineHighlightBackground', { dark: null, light: null, hcDark: null, hcLight: null }, ( localizeWithPath(
  'vs/editor/common/core/editorColorRegistry',
@@ -325,12 +325,12 @@ const editorBracketPairGuideActiveBackground6 = registerColor('editorBracketPair
  'editorBracketPairGuide.activeBackground6',
  'Background color of active bracket pair guides (6). Requires enabling bracket pair guides.'
 )));
-registerColor('editorUnicodeHighlight.border', { dark: '#BD9B03', light: '#CEA33D', hcDark: '#ff0000', hcLight: '#CEA33D' }, ( localizeWithPath(
+registerColor('editorUnicodeHighlight.border', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: editorWarningForeground, hcLight: editorWarningForeground }, ( localizeWithPath(
  'vs/editor/common/core/editorColorRegistry',
  'editorUnicodeHighlight.border',
  'Border color used to highlight unicode characters.'
 )));
-registerColor('editorUnicodeHighlight.background', { dark: '#bd9b0326', light: '#cea33d14', hcDark: '#00000000', hcLight: '#cea33d14' }, ( localizeWithPath(
+registerColor('editorUnicodeHighlight.background', { dark: editorWarningBackground, light: editorWarningBackground, hcDark: editorWarningBackground, hcLight: editorWarningBackground }, ( localizeWithPath(
  'vs/editor/common/core/editorColorRegistry',
  'editorUnicodeHighlight.background',
  'Background color used to highlight unicode characters.'

package/vscode/src/vs/editor/common/core/offsetRange.d.ts

@@ -34,10 +34,12 @@ declare class OffsetRange implements IOffsetRange {
      * If the ranges don't even touch, the result is undefined.
      */
     intersect(other: OffsetRange): OffsetRange | undefined;
+    intersects(other: OffsetRange): boolean;
     intersectsOrTouches(other: OffsetRange): boolean;
     isBefore(other: OffsetRange): boolean;
     isAfter(other: OffsetRange): boolean;
     slice<T>(arr: T[]): T[];
+    substring(str: string): string;
     /**
      * Returns the given value if it is contained in this instance, otherwise the closest value that is contained.
      * The range must not be empty.

package/vscode/src/vs/editor/common/core/offsetRange.js

@@ -78,6 +78,11 @@ class OffsetRange {
         }
         return undefined;
     }
+    intersects(other) {
+        const start = Math.max(this.start, other.start);
+        const end = Math.min(this.endExclusive, other.endExclusive);
+        return start < end;
+    }
     intersectsOrTouches(other) {
         const start = Math.max(this.start, other.start);
         const end = Math.min(this.endExclusive, other.endExclusive);
@@ -92,6 +97,9 @@ class OffsetRange {
     slice(arr) {
         return arr.slice(this.start, this.endExclusive);
     }
+    substring(str) {
+        return str.substring(this.start, this.endExclusive);
+    }
     clip(value) {
         if (this.isEmpty) {
             throw new BugIndicatingError(`Invalid clipping range: ${this.toString()}`);

package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js

@@ -87,6 +87,15 @@ class OffsetPair {
     toString() {
         return `${this.offset1} <-> ${this.offset2}`;
     }
+    delta(offset) {
+        if (offset === 0) {
+            return this;
+        }
+        return ( new OffsetPair(this.offset1 + offset, this.offset2 + offset));
+    }
+    equals(other) {
+        return this.offset1 === other.offset1 && this.offset2 === other.offset2;
+    }
 }
 class InfiniteTimeout {
     static { this.instance = ( new InfiniteTimeout()); }

package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.js

@@ -72,12 +72,12 @@ function shiftSequenceDiffs(sequence1, sequence2, sequenceDiffs) {
         const diff = sequenceDiffs[i];
         const nextDiff = (i + 1 < sequenceDiffs.length ? sequenceDiffs[i + 1] : undefined);
         const seq1ValidRange = ( new OffsetRange(
-            prevDiff ? prevDiff.seq1Range.start + 1 : 0,
-            nextDiff ? nextDiff.seq1Range.endExclusive - 1 : sequence1.length
+            prevDiff ? prevDiff.seq1Range.endExclusive + 1 : 0,
+            nextDiff ? nextDiff.seq1Range.start - 1 : sequence1.length
         ));
         const seq2ValidRange = ( new OffsetRange(
-            prevDiff ? prevDiff.seq2Range.start + 1 : 0,
-            nextDiff ? nextDiff.seq2Range.endExclusive - 1 : sequence2.length
+            prevDiff ? prevDiff.seq2Range.endExclusive + 1 : 0,
+            nextDiff ? nextDiff.seq2Range.start - 1 : sequence2.length
         ));
         if (diff.seq1Range.isEmpty) {
             sequenceDiffs[i] = shiftDiffToBetterPosition(diff, sequence1, sequence2, seq1ValidRange, seq2ValidRange);
@@ -138,57 +138,55 @@ function removeShortMatches(sequence1, sequence2, sequenceDiffs) {
     return result;
 }
 function extendDiffsToEntireWordIfAppropriate(sequence1, sequence2, sequenceDiffs) {
+    const equalMappings = SequenceDiff.invert(sequenceDiffs, sequence1.length);
     const additional = [];
-    let lastModifiedWord = undefined;
-    function maybePushWordToAdditional() {
-        if (!lastModifiedWord) {
+    let lastPoint = ( new OffsetPair(0, 0));
+    function scanWord(pair, equalMapping) {
+        if (pair.offset1 < lastPoint.offset1 || pair.offset2 < lastPoint.offset2) {
             return;
         }
-        const originalLength1 = lastModifiedWord.s1Range.length - lastModifiedWord.deleted;
-        if (Math.max(lastModifiedWord.deleted, lastModifiedWord.added) + (lastModifiedWord.count - 1) > originalLength1) {
-            additional.push(( new SequenceDiff(lastModifiedWord.s1Range, lastModifiedWord.s2Range)));
+        const w1 = sequence1.findWordContaining(pair.offset1);
+        const w2 = sequence2.findWordContaining(pair.offset2);
+        if (!w1 || !w2) {
+            return;
         }
-        lastModifiedWord = undefined;
-    }
-    for (const s of sequenceDiffs) {
-        function processWord(s1Range, s2Range) {
-            if (!lastModifiedWord || !lastModifiedWord.s1Range.containsRange(s1Range) || !lastModifiedWord.s2Range.containsRange(s2Range)) {
-                if (lastModifiedWord && !(lastModifiedWord.s1Range.endExclusive < s1Range.start && lastModifiedWord.s2Range.endExclusive < s2Range.start)) {
-                    const s1Added = OffsetRange.tryCreate(lastModifiedWord.s1Range.endExclusive, s1Range.start);
-                    const s2Added = OffsetRange.tryCreate(lastModifiedWord.s2Range.endExclusive, s2Range.start);
-                    lastModifiedWord.deleted += s1Added?.length ?? 0;
-                    lastModifiedWord.added += s2Added?.length ?? 0;
-                    lastModifiedWord.s1Range = lastModifiedWord.s1Range.join(s1Range);
-                    lastModifiedWord.s2Range = lastModifiedWord.s2Range.join(s2Range);
-                }
-                else {
-                    maybePushWordToAdditional();
-                    lastModifiedWord = { added: 0, deleted: 0, count: 0, s1Range: s1Range, s2Range: s2Range };
-                }
+        let w = ( new SequenceDiff(w1, w2));
+        const equalPart = w.intersect(equalMapping);
+        let equalChars1 = equalPart.seq1Range.length;
+        let equalChars2 = equalPart.seq2Range.length;
+        while (equalMappings.length > 0) {
+            const next = equalMappings[0];
+            const intersects = next.seq1Range.intersects(w1) || next.seq2Range.intersects(w2);
+            if (!intersects) {
+                break;
             }
-            const changedS1 = s1Range.intersect(s.seq1Range);
-            const changedS2 = s2Range.intersect(s.seq2Range);
-            lastModifiedWord.count++;
-            lastModifiedWord.deleted += changedS1?.length ?? 0;
-            lastModifiedWord.added += changedS2?.length ?? 0;
-        }
-        const w1Before = sequence1.findWordContaining(s.seq1Range.start - 1);
-        const w2Before = sequence2.findWordContaining(s.seq2Range.start - 1);
-        const w1After = sequence1.findWordContaining(s.seq1Range.endExclusive);
-        const w2After = sequence2.findWordContaining(s.seq2Range.endExclusive);
-        if (w1Before && w1After && w2Before && w2After && w1Before.equals(w1After) && w2Before.equals(w2After)) {
-            processWord(w1Before, w2Before);
-        }
-        else {
-            if (w1Before && w2Before) {
-                processWord(w1Before, w2Before);
+            const v1 = sequence1.findWordContaining(next.seq1Range.start);
+            const v2 = sequence2.findWordContaining(next.seq2Range.start);
+            const v = ( new SequenceDiff(v1, v2));
+            const equalPart = v.intersect(next);
+            equalChars1 += equalPart.seq1Range.length;
+            equalChars2 += equalPart.seq2Range.length;
+            w = w.join(v);
+            if (w.seq1Range.endExclusive >= next.seq1Range.endExclusive) {
+                equalMappings.shift();
             }
-            if (w1After && w2After) {
-                processWord(w1After, w2After);
+            else {
+                break;
             }
         }
+        if (equalChars1 + equalChars2 < (w.seq1Range.length + w.seq2Range.length) * 2 / 3) {
+            additional.push(w);
+        }
+        lastPoint = w.getEndExclusives();
+    }
+    while (equalMappings.length > 0) {
+        const next = equalMappings.shift();
+        if (next.seq1Range.isEmpty) {
+            continue;
+        }
+        scanWord(next.getStarts(), next);
+        scanWord(next.getEndExclusives().delta(-1), next);
     }
-    maybePushWordToAdditional();
     const merged = mergeSequenceDiffs(sequenceDiffs, additional);
     return merged;
 }
@@ -322,7 +320,12 @@ function removeVeryShortMatchingTextBetweenLongDiffs(sequence1, sequence2, seque
         }
         const availableSpace = SequenceDiff.fromOffsetPairs(prev ? prev.getEndExclusives() : OffsetPair.zero, next ? next.getStarts() : OffsetPair.max);
         const result = newDiff.intersect(availableSpace);
-        newDiffs.push(result);
+        if (newDiffs.length > 0 && result.getStarts().equals(newDiffs[newDiffs.length - 1].getEndExclusives())) {
+            newDiffs[newDiffs.length - 1] = newDiffs[newDiffs.length - 1].join(result);
+        }
+        else {
+            newDiffs.push(result);
+        }
     });
     return newDiffs;
 }

package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.js

@@ -62,6 +62,9 @@ class LinesSliceCharSequence {
         if (prevCategory === 7  && nextCategory === 8 ) {
             return 0;
         }
+        if (prevCategory === 8 ) {
+            return 150;
+        }
         let score = 0;
         if (prevCategory !== nextCategory) {
             score += 10;
@@ -126,7 +129,7 @@ const score = {
     [2 ]: 0,
     [3 ]: 10,
     [4 ]: 2,
-    [5 ]: 3,
+    [5 ]: 30,
     [6 ]: 3,
     [7 ]: 10,
     [8 ]: 10,

package/vscode/src/vs/editor/common/diff/rangeMapping.d.ts

@@ -5,7 +5,8 @@ import { Range } from '../core/range.js';
  * Maps a line range in the original text model to a line range in the modified text model.
  */
 declare class LineRangeMapping {
-    static inverse(mapping: readonly DetailedLineRangeMapping[], originalLineCount: number, modifiedLineCount: number): DetailedLineRangeMapping[];
+    static inverse(mapping: readonly LineRangeMapping[], originalLineCount: number, modifiedLineCount: number): LineRangeMapping[];
+    static clip(mapping: readonly LineRangeMapping[], originalRange: LineRange, modifiedRange: LineRange): LineRangeMapping[];
     /**
      * The line range in the original text model.
      */

package/vscode/src/vs/editor/common/diff/rangeMapping.js

@@ -5,19 +5,30 @@ class LineRangeMapping {
         let lastOriginalEndLineNumber = 1;
         let lastModifiedEndLineNumber = 1;
         for (const m of mapping) {
-            const r = ( new DetailedLineRangeMapping(( new LineRange(lastOriginalEndLineNumber, m.original.startLineNumber)), ( new LineRange(lastModifiedEndLineNumber, m.modified.startLineNumber)), undefined));
+            const r = ( new LineRangeMapping(( new LineRange(lastOriginalEndLineNumber, m.original.startLineNumber)), ( new LineRange(lastModifiedEndLineNumber, m.modified.startLineNumber))));
             if (!r.modified.isEmpty) {
                 result.push(r);
             }
             lastOriginalEndLineNumber = m.original.endLineNumberExclusive;
             lastModifiedEndLineNumber = m.modified.endLineNumberExclusive;
         }
-        const r = ( new DetailedLineRangeMapping(( new LineRange(lastOriginalEndLineNumber, originalLineCount + 1)), ( new LineRange(lastModifiedEndLineNumber, modifiedLineCount + 1)), undefined));
+        const r = ( new LineRangeMapping(( new LineRange(lastOriginalEndLineNumber, originalLineCount + 1)), ( new LineRange(lastModifiedEndLineNumber, modifiedLineCount + 1))));
         if (!r.modified.isEmpty) {
             result.push(r);
         }
         return result;
     }
+    static clip(mapping, originalRange, modifiedRange) {
+        const result = [];
+        for (const m of mapping) {
+            const original = m.original.intersect(originalRange);
+            const modified = m.modified.intersect(modifiedRange);
+            if (original && !original.isEmpty && modified && !modified.isEmpty) {
+                result.push(( new LineRangeMapping(original, modified)));
+            }
+        }
+        return result;
+    }
     constructor(originalRange, modifiedRange) {
         this.original = originalRange;
         this.modified = modifiedRange;

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

@@ -473,6 +473,7 @@ interface CodeAction {
     isPreferred?: boolean;
     isAI?: boolean;
     disabled?: string;
+    ranges?: IRange[];
 }
 declare const enum CodeActionTriggerType {
     Invoke = 1,
@@ -529,6 +530,13 @@ interface DocumentPasteEdit {
     };
     additionalEdit?: WorkspaceEdit;
 }
+/**
+ * @internal
+ */
+interface DocumentPasteContext {
+    readonly only?: string;
+    readonly trigger: 'explicit' | 'implicit';
+}
 /**
  * @internal
  */
@@ -537,7 +545,7 @@ interface DocumentPasteEditProvider {
     readonly copyMimeTypes?: readonly string[];
     readonly pasteMimeTypes?: readonly string[];
     prepareDocumentPaste?(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<undefined | IReadonlyVSDataTransfer>;
-    provideDocumentPasteEdits?(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<DocumentPasteEdit | undefined>;
+    provideDocumentPasteEdits?(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEdit | undefined>;
 }
 /**
  * Represents a parameter of a callable-signature. A parameter can
@@ -1299,4 +1307,4 @@ interface MappedEditsProvider {
     provideMappedEdits(document: ITextModel, codeBlocks: string[], context: MappedEditsContext, token: CancellationToken): Promise<WorkspaceEdit | null>;
 }
 
-export { type CodeAction, type CodeActionContext, type CodeActionList, type CodeActionProvider, CodeActionTriggerType, type CodeLens, type CodeLensList, type CodeLensProvider, Command, type CompletionContext, type CompletionItem, CompletionItemInsertTextRule, CompletionItemKind, type CompletionItemLabel, type CompletionItemProvider, type CompletionItemRanges, CompletionItemTag, type CompletionList, CompletionTriggerKind, type DeclarationProvider, type Definition, type DefinitionProvider, type DocumentColorProvider, type DocumentContextItem, type DocumentFormattingEditProvider, type DocumentHighlight, DocumentHighlightKind, type DocumentHighlightProvider, type DocumentOnDropEdit, type DocumentOnDropEditProvider, type DocumentPasteEdit, type DocumentPasteEditProvider, type DocumentRangeFormattingEditProvider, type DocumentRangeSemanticTokensProvider, type DocumentSemanticTokensProvider, type DocumentSymbol, type DocumentSymbolProvider, type DropYieldTo, type EvaluatableExpression, type EvaluatableExpressionProvider, type FoldingContext, type FoldingRange, FoldingRangeKind, type FoldingRangeProvider, type FormattingOptions, type Hover, type HoverProvider, type IColor, type IColorInformation, type IColorPresentation, type IInplaceReplaceSupportResult, type ILanguageIdCodec, type ILink, type ILinksList, type IWorkspaceFileEdit, type IWorkspaceTextEdit, type ImplementationProvider, type InlayHint, InlayHintKind, type InlayHintLabelPart, type InlayHintList, type InlayHintsProvider, type InlineCompletion, type InlineCompletionContext, type InlineCompletionProviderGroupId, InlineCompletionTriggerKind, type InlineCompletions, type InlineCompletionsProvider, type InlineValue, type InlineValueContext, type InlineValueExpression, type InlineValueText, type InlineValueVariableLookup, type InlineValuesProvider, type LinkProvider, type LinkedEditingRangeProvider, type LinkedEditingRanges, type Location, type LocationLink, type MappedEditsContext, type MappedEditsProvider, type MultiDocumentHighlightProvider, type OnTypeFormattingEditProvider, type ParameterInformation, type ProviderResult, type ReferenceContext, type ReferenceProvider, type Rejection, type RenameLocation, type RenameProvider, SelectedSuggestionInfo, type SelectionRange, type SelectionRangeProvider, type SemanticTokens, type SemanticTokensEdit, type SemanticTokensEdits, type SemanticTokensLegend, type SignatureHelp, type SignatureHelpContext, type SignatureHelpProvider, type SignatureHelpResult, SignatureHelpTriggerKind, type SignatureInformation, SymbolKind, SymbolTag, TextEdit, type TypeDefinitionProvider, type WorkspaceEdit, type WorkspaceEditMetadata, type WorkspaceFileEditOptions };
+export { type CodeAction, type CodeActionContext, type CodeActionList, type CodeActionProvider, CodeActionTriggerType, type CodeLens, type CodeLensList, type CodeLensProvider, Command, type CompletionContext, type CompletionItem, CompletionItemInsertTextRule, CompletionItemKind, type CompletionItemLabel, type CompletionItemProvider, type CompletionItemRanges, CompletionItemTag, type CompletionList, CompletionTriggerKind, type DeclarationProvider, type Definition, type DefinitionProvider, type DocumentColorProvider, type DocumentContextItem, type DocumentFormattingEditProvider, type DocumentHighlight, DocumentHighlightKind, type DocumentHighlightProvider, type DocumentOnDropEdit, type DocumentOnDropEditProvider, type DocumentPasteContext, type DocumentPasteEdit, type DocumentPasteEditProvider, type DocumentRangeFormattingEditProvider, type DocumentRangeSemanticTokensProvider, type DocumentSemanticTokensProvider, type DocumentSymbol, type DocumentSymbolProvider, type DropYieldTo, type EvaluatableExpression, type EvaluatableExpressionProvider, type FoldingContext, type FoldingRange, FoldingRangeKind, type FoldingRangeProvider, type FormattingOptions, type Hover, type HoverProvider, type IColor, type IColorInformation, type IColorPresentation, type IInplaceReplaceSupportResult, type ILanguageIdCodec, type ILink, type ILinksList, type IWorkspaceFileEdit, type IWorkspaceTextEdit, type ImplementationProvider, type InlayHint, InlayHintKind, type InlayHintLabelPart, type InlayHintList, type InlayHintsProvider, type InlineCompletion, type InlineCompletionContext, type InlineCompletionProviderGroupId, InlineCompletionTriggerKind, type InlineCompletions, type InlineCompletionsProvider, type InlineValue, type InlineValueContext, type InlineValueExpression, type InlineValueText, type InlineValueVariableLookup, type InlineValuesProvider, type LinkProvider, type LinkedEditingRangeProvider, type LinkedEditingRanges, type Location, type LocationLink, type MappedEditsContext, type MappedEditsProvider, type MultiDocumentHighlightProvider, type OnTypeFormattingEditProvider, type ParameterInformation, type ProviderResult, type ReferenceContext, type ReferenceProvider, type Rejection, type RenameLocation, type RenameProvider, SelectedSuggestionInfo, type SelectionRange, type SelectionRangeProvider, type SemanticTokens, type SemanticTokensEdit, type SemanticTokensEdits, type SemanticTokensLegend, type SignatureHelp, type SignatureHelpContext, type SignatureHelpProvider, type SignatureHelpResult, SignatureHelpTriggerKind, type SignatureInformation, SymbolKind, SymbolTag, TextEdit, type TypeDefinitionProvider, type WorkspaceEdit, type WorkspaceEditMetadata, type WorkspaceFileEditOptions };

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

@@ -5,7 +5,7 @@ import { illegalArgument, BugIndicatingError, onUnexpectedError } from '../../..
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable, combinedDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { listenStream } from '../../../base/common/stream.js';
-import { singleLetterHash, UNUSUAL_LINE_TERMINATORS, isHighSurrogate } from '../../../base/common/strings.js';
+import { singleLetterHash, UNUSUAL_LINE_TERMINATORS, isHighSurrogate, htmlAttributeEncodeValue } from '../../../base/common/strings.js';
 import { URI } from '../../../base/common/uri.js';
 import { countEOL } from '../core/eolCounter.js';
 import { normalizeIndentation } from '../core/indentation.js';
@@ -1368,7 +1368,9 @@ let TextModel = class TextModel extends Disposable {
             const nodeRange = this._decorationsTree.getNodeRange(this, node);
             this._onDidChangeDecorations.recordLineAffectedByInjectedText(nodeRange.startLineNumber);
         }
-        if (nodeWasInOverviewRuler !== nodeIsInOverviewRuler) {
+        const movedInOverviewRuler = nodeWasInOverviewRuler !== nodeIsInOverviewRuler;
+        const changedWhetherInjectedText = isOptionsInjectedText(options) !== isNodeInjectedText(node);
+        if (movedInOverviewRuler || changedWhetherInjectedText) {
             this._decorationsTree.delete(node);
             node.setOptions(options);
             this._decorationsTree.insert(node);
@@ -1500,6 +1502,9 @@ function indentOfLine(line) {
 function isNodeInOverviewRuler(node) {
     return (node.options.overviewRuler && node.options.overviewRuler.color ? true : false);
 }
+function isOptionsInjectedText(options) {
+    return !!options.after || !!options.before;
+}
 function isNodeInjectedText(node) {
     return !!node.options.after || !!node.options.before;
 }
@@ -1660,7 +1665,8 @@ class ModelDecorationOverviewRulerOptions extends DecorationOptions {
 }
 class ModelDecorationGlyphMarginOptions {
     constructor(options) {
-        this.position = options?.position ?? GlyphMarginLane.Left;
+        this.position = options?.position ?? GlyphMarginLane.Center;
+        this.persistLane = options?.persistLane;
     }
 }
 class ModelDecorationMinimapOptions extends DecorationOptions {
@@ -1723,6 +1729,7 @@ class ModelDecorationOptions {
         this.shouldFillLineOnLineBreak = options.shouldFillLineOnLineBreak ?? null;
         this.hoverMessage = options.hoverMessage || null;
         this.glyphMarginHoverMessage = options.glyphMarginHoverMessage || null;
+        this.lineNumberHoverMessage = options.lineNumberHoverMessage || null;
         this.isWholeLine = options.isWholeLine || false;
         this.showIfCollapsed = options.showIfCollapsed || false;
         this.collapseOnReplaceEdit = options.collapseOnReplaceEdit || false;
@@ -1731,6 +1738,8 @@ class ModelDecorationOptions {
         this.glyphMargin = options.glyphMarginClassName ? ( new ModelDecorationGlyphMarginOptions(options.glyphMargin)) : null;
         this.glyphMarginClassName = options.glyphMarginClassName ? cleanClassName(options.glyphMarginClassName) : null;
         this.linesDecorationsClassName = options.linesDecorationsClassName ? cleanClassName(options.linesDecorationsClassName) : null;
+        this.lineNumberClassName = options.lineNumberClassName ? cleanClassName(options.lineNumberClassName) : null;
+        this.linesDecorationsTooltip = options.linesDecorationsTooltip ? htmlAttributeEncodeValue(options.linesDecorationsTooltip) : null;
         this.firstLineDecorationClassName = options.firstLineDecorationClassName ? cleanClassName(options.firstLineDecorationClassName) : null;
         this.marginClassName = options.marginClassName ? cleanClassName(options.marginClassName) : null;
         this.inlineClassName = options.inlineClassName ? cleanClassName(options.inlineClassName) : null;
@@ -1768,6 +1777,7 @@ class DidChangeDecorationsEmitter extends Disposable {
         this._affectsMinimap = false;
         this._affectsOverviewRuler = false;
         this._affectsGlyphMargin = false;
+        this._affectsLineNumber = false;
     }
     hasListeners() {
         return this._actual.hasListeners();
@@ -1792,15 +1802,10 @@ class DidChangeDecorationsEmitter extends Disposable {
         this._affectedInjectedTextLines.add(lineNumber);
     }
     checkAffectedAndFire(options) {
-        if (!this._affectsMinimap) {
-            this._affectsMinimap = options.minimap && options.minimap.position ? true : false;
-        }
-        if (!this._affectsOverviewRuler) {
-            this._affectsOverviewRuler = options.overviewRuler && options.overviewRuler.color ? true : false;
-        }
-        if (!this._affectsGlyphMargin) {
-            this._affectsGlyphMargin = options.glyphMarginClassName ? true : false;
-        }
+        this._affectsMinimap ||= !!options.minimap?.position;
+        this._affectsOverviewRuler ||= !!options.overviewRuler?.color;
+        this._affectsGlyphMargin ||= !!options.glyphMarginClassName;
+        this._affectsLineNumber ||= !!options.lineNumberClassName;
         this.tryFire();
     }
     fire() {
@@ -1822,7 +1827,8 @@ class DidChangeDecorationsEmitter extends Disposable {
         const event = {
             affectsMinimap: this._affectsMinimap,
             affectsOverviewRuler: this._affectsOverviewRuler,
-            affectsGlyphMargin: this._affectsGlyphMargin
+            affectsGlyphMargin: this._affectsGlyphMargin,
+            affectsLineNumber: this._affectsLineNumber,
         };
         this._shouldFireDeferred = false;
         this._affectsMinimap = false;

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

@@ -329,7 +329,7 @@ class GrammarTokens extends Disposable {
             if (tokenizationSupport && tokenizationSupport.createBackgroundTokenizer && !tokenizationSupport.backgroundTokenizerShouldOnlyVerifyTokens) {
                 this._backgroundTokenizer.value = tokenizationSupport.createBackgroundTokenizer(this._textModel, b);
             }
-            if (!this._backgroundTokenizer.value) {
+            if (!this._backgroundTokenizer.value && !this._textModel.isTooLargeForTokenization()) {
                 this._backgroundTokenizer.value = this._defaultBackgroundTokenizer =
                     ( new DefaultBackgroundTokenizer(this._tokenizer, b));
                 this._defaultBackgroundTokenizer.handleChanges();