@codingame/monaco-vscode-api 6.0.2 → 7.0.0

package/vscode/src/vs/editor/common/cursor/cursorWordOperations.js

@@ -139,7 +139,7 @@ class WordOperations {
         }
         return 0;
     }
-    static moveWordLeft(wordSeparators, model, position, wordNavigationType) {
+    static moveWordLeft(wordSeparators, model, position, wordNavigationType, hasMulticursor) {
         let lineNumber = position.lineNumber;
         let column = position.column;
         if (column === 1) {
@@ -153,7 +153,8 @@ class WordOperations {
             return ( new Position(lineNumber, prevWordOnLine ? prevWordOnLine.start + 1 : 1));
         }
         if (wordNavigationType === WordNavigationType.WordStartFast) {
-            if (prevWordOnLine
+            if (!hasMulticursor
+                && prevWordOnLine
                 && prevWordOnLine.wordType === WordType.Separator
                 && prevWordOnLine.end - prevWordOnLine.start === 1
                 && prevWordOnLine.nextCharClass === WordCharacterClass.Regular) {
@@ -678,10 +679,10 @@ class WordPartOperations extends WordOperations {
         candidates.sort(Range.compareRangesUsingStarts);
         return candidates[0];
     }
-    static moveWordPartLeft(wordSeparators, model, position) {
+    static moveWordPartLeft(wordSeparators, model, position, hasMulticursor) {
         const candidates = enforceDefined([
-            WordOperations.moveWordLeft(wordSeparators, model, position, WordNavigationType.WordStart),
-            WordOperations.moveWordLeft(wordSeparators, model, position, WordNavigationType.WordEnd),
+            WordOperations.moveWordLeft(wordSeparators, model, position, WordNavigationType.WordStart, hasMulticursor),
+            WordOperations.moveWordLeft(wordSeparators, model, position, WordNavigationType.WordEnd, hasMulticursor),
             WordOperations._moveWordPartLeft(model, position)
         ]);
         candidates.sort(Position.compare);

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

@@ -21,6 +21,7 @@ declare class LanguageFeatureRegistry<T> {
     register(selector: LanguageSelector, provider: T): IDisposable;
     has(model: ITextModel): boolean;
     all(model: ITextModel): T[];
+    allNoModel(): T[];
     ordered(model: ITextModel): T[];
     orderedGroups(model: ITextModel): T[][];
     private _orderedForEach;

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

@@ -73,6 +73,9 @@ class LanguageFeatureRegistry {
         }
         return result;
     }
+    allNoModel() {
+        return ( this._entries.map(entry => entry.provider));
+    }
     ordered(model) {
         const result = [];
         this._orderedForEach(model, entry => result.push(entry.provider));

package/vscode/src/vs/editor/common/languages/autoIndent.js

@@ -253,7 +253,8 @@ function getIndentForEnter(autoIndent, model, range, indentConverter, languageCo
         afterEnter: afterEnterIndent
     };
 }
-function getIndentActionForType(autoIndent, model, range, ch, indentConverter, languageConfigurationService) {
+function getIndentActionForType(cursorConfig, model, range, ch, indentConverter, languageConfigurationService) {
+    const autoIndent = cursorConfig.autoIndent;
     if (autoIndent < EditorAutoIndentStrategy.Full) {
         return null;
     }
@@ -283,6 +284,27 @@ function getIndentActionForType(autoIndent, model, range, ch, indentConverter, l
         }
         return indentation;
     }
+    const previousLineNumber = range.startLineNumber - 1;
+    if (previousLineNumber > 0) {
+        const previousLine = model.getLineContent(previousLineNumber);
+        if (indentRulesSupport.shouldIndentNextLine(previousLine) && indentRulesSupport.shouldIncrease(textAroundRangeWithCharacter)) {
+            const inheritedIndentationData = getInheritIndentForLine(autoIndent, model, range.startLineNumber, false, languageConfigurationService);
+            const inheritedIndentation = inheritedIndentationData?.indentation;
+            if (inheritedIndentation !== undefined) {
+                const currentLine = model.getLineContent(range.startLineNumber);
+                const actualCurrentIndentation = getLeadingWhitespace(currentLine);
+                const inferredCurrentIndentation = indentConverter.shiftIndent(inheritedIndentation);
+                const inferredIndentationEqualsActual = inferredCurrentIndentation === actualCurrentIndentation;
+                const textAroundRangeContainsOnlyWhitespace = /^\s*$/.test(textAroundRange);
+                const autoClosingPairs = cursorConfig.autoClosingPairs.autoClosingPairsOpenByEnd.get(ch);
+                const autoClosingPairExists = autoClosingPairs && autoClosingPairs.length > 0;
+                const isChFirstNonWhitespaceCharacterAndInAutoClosingPair = autoClosingPairExists && textAroundRangeContainsOnlyWhitespace;
+                if (inferredIndentationEqualsActual && isChFirstNonWhitespaceCharacterAndInAutoClosingPair) {
+                    return inheritedIndentation;
+                }
+            }
+        }
+    }
     return null;
 }
 function getIndentMetadata(model, lineNumber, languageConfigurationService) {

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

@@ -419,6 +419,11 @@ interface InlineCompletionContext {
      */
     readonly triggerKind: InlineCompletionTriggerKind;
     readonly selectedSuggestionInfo: SelectedSuggestionInfo | undefined;
+    /**
+     * @experimental
+     * @internal
+    */
+    readonly userPrompt?: string | undefined;
 }
 declare class SelectedSuggestionInfo {
     readonly range: IRange;
@@ -478,6 +483,11 @@ interface InlineCompletions<TItem extends InlineCompletion = InlineCompletion> {
 type InlineCompletionProviderGroupId = string;
 interface InlineCompletionsProvider<T extends InlineCompletions = InlineCompletions> {
     provideInlineCompletions(model: ITextModel, position: Position, context: InlineCompletionContext, token: CancellationToken): ProviderResult<T>;
+    /**
+     * @experimental
+     * @internal
+    */
+    provideInlineEdits?(model: ITextModel, range: Range, context: InlineCompletionContext, token: CancellationToken): ProviderResult<T>;
     /**
      * Will be called when an item is shown.
      * @param updatedInsertText Is useful to understand bracket completion.
@@ -1348,13 +1358,20 @@ interface DocumentDropEdit {
     };
     additionalEdit?: WorkspaceEdit;
 }
+/**
+ * @internal
+ */
+interface DocumentDropEditsSession {
+    edits: readonly DocumentDropEdit[];
+    dispose(): void;
+}
 /**
  * @internal
  */
 interface DocumentDropEditProvider {
     readonly id?: string;
     readonly dropMimeTypes?: readonly string[];
-    provideDocumentDropEdits(model: ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): ProviderResult<DocumentDropEdit[]>;
+    provideDocumentDropEdits(model: ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): ProviderResult<DocumentDropEditsSession>;
     resolveDocumentDropEdit?(edit: DocumentDropEdit, token: CancellationToken): Promise<DocumentDropEdit>;
 }
 interface DocumentContextItem {
@@ -1372,7 +1389,7 @@ interface MappedEditsProvider {
      *
      * @param document The document to provide mapped edits for.
      * @param codeBlocks Code blocks that come from an LLM's reply.
-     * 						"Insert at cursor" in the panel chat only sends one edit that the user clicks on, but inline chat can send multiple blocks and let the lang server decide what to do with them.
+     * 						"Apply in Editor" in the panel chat only sends one edit that the user clicks on, but inline chat can send multiple blocks and let the lang server decide what to do with them.
      * @param context The context for providing mapped edits.
      * @param token A cancellation token.
      * @returns A provider result of text edits.
@@ -1397,4 +1414,4 @@ interface InlineEditProvider<T extends IInlineEdit = IInlineEdit> {
     freeInlineEdit(edit: T): void;
 }
 
-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 DocumentDropEdit, type DocumentDropEditProvider, type DocumentFormattingEditProvider, type DocumentHighlight, DocumentHighlightKind, type DocumentHighlightProvider, type DocumentPasteContext, type DocumentPasteEdit, type DocumentPasteEditProvider, type DocumentPasteEditsSession, DocumentPasteTriggerKind, 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 HoverContext, type HoverProvider, type HoverVerbosityRequest, type IColor, type IColorInformation, type IColorPresentation, type IInlineEdit, type IInlineEditContext, 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 InlineEditProvider, InlineEditTriggerKind, 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 NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, type NewSymbolNamesProvider, type OnTypeFormattingEditProvider, type ParameterInformation, type PartialAcceptInfo, PartialAcceptTriggerKind, 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 DocumentDropEdit, type DocumentDropEditProvider, type DocumentDropEditsSession, type DocumentFormattingEditProvider, type DocumentHighlight, DocumentHighlightKind, type DocumentHighlightProvider, type DocumentPasteContext, type DocumentPasteEdit, type DocumentPasteEditProvider, type DocumentPasteEditsSession, DocumentPasteTriggerKind, 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 HoverContext, type HoverProvider, type HoverVerbosityRequest, type IColor, type IColorInformation, type IColorPresentation, type IInlineEdit, type IInlineEditContext, 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 InlineEditProvider, InlineEditTriggerKind, 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 NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, type NewSymbolNamesProvider, type OnTypeFormattingEditProvider, type ParameterInformation, type PartialAcceptInfo, PartialAcceptTriggerKind, 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/bracketPairsTextModelPart/bracketPairsImpl.js

@@ -18,12 +18,12 @@ class BracketPairsTextModelPart extends Disposable {
         this.onDidChangeEmitter = ( new Emitter());
         this.onDidChange = this.onDidChangeEmitter.event;
         this.bracketsRequested = false;
-        this._register(this.languageConfigurationService.onDidChange(e => {
-            if (!e.languageId || this.bracketPairsTree.value?.object.didLanguageChange(e.languageId)) {
-                this.bracketPairsTree.clear();
-                this.updateBracketPairsTree();
-            }
-        }));
+    }
+    handleLanguageConfigurationServiceChange(e) {
+        if (!e.languageId || this.bracketPairsTree.value?.object.didLanguageChange(e.languageId)) {
+            this.bracketPairsTree.clear();
+            this.updateBracketPairsTree();
+        }
     }
     handleDidChangeOptions(e) {
         this.bracketPairsTree.clear();

package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.js

@@ -506,6 +506,25 @@ class PieceTreeBase {
         const nodePos = this.nodeAt(offset);
         return this._getCharCode(nodePos);
     }
+    getNearestChunk(offset) {
+        const nodePos = this.nodeAt(offset);
+        if (nodePos.remainder === nodePos.node.piece.length) {
+            const matchingNode = nodePos.node.next();
+            if (!matchingNode || matchingNode === SENTINEL) {
+                return '';
+            }
+            const buffer = this._buffers[matchingNode.piece.bufferIndex];
+            const startOffset = this.offsetInBuffer(matchingNode.piece.bufferIndex, matchingNode.piece.start);
+            return buffer.buffer.substring(startOffset, startOffset + matchingNode.piece.length);
+        }
+        else {
+            const buffer = this._buffers[nodePos.node.piece.bufferIndex];
+            const startOffset = this.offsetInBuffer(nodePos.node.piece.bufferIndex, nodePos.node.piece.start);
+            const targetOffset = startOffset + nodePos.remainder;
+            const targetEnd = startOffset + nodePos.node.piece.length;
+            return buffer.buffer.substring(targetOffset, targetEnd);
+        }
+    }
     findMatchesInNode(node, searcher, startLineNumber, startColumn, startCursor, endCursor, searchData, captureMatches, limitResultCount, resultLen, result) {
         const buffer = this._buffers[node.piece.bufferIndex];
         const startOffsetInBuffer = this.offsetInBuffer(node.piece.bufferIndex, node.piece.start);

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

@@ -117,6 +117,9 @@ class PieceTreeTextBuffer extends Disposable {
         }
         return this.getValueLengthInRange(range, eol);
     }
+    getNearestChunk(offset) {
+        return this._pieceTree.getNearestChunk(offset);
+    }
     getLength() {
         return this._pieceTree.getLength();
     }

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { pushMany, ArrayQueue } from '../../../base/common/arrays.js';
 import { Color } from '../../../base/common/color.js';
-import { illegalArgument, BugIndicatingError, onUnexpectedError } from '../../../base/common/errors.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 { listenStream } from '../../../base/common/stream.js';
@@ -246,6 +246,10 @@ let TextModel = class TextModel extends Disposable {
             this._onDidChangeDecorations.endDeferredEmit();
         }));
         this._languageService.requestRichLanguageFeatures(languageId);
+        this._register(this._languageConfigurationService.onDidChange(e => {
+            this._bracketPairs.handleLanguageConfigurationServiceChange(e);
+            this._tokenizationTextModelPart.handleLanguageConfigurationServiceChange(e);
+        }));
     }
     dispose() {
         this.__isDisposing = true;
@@ -271,7 +275,7 @@ let TextModel = class TextModel extends Disposable {
     }
     _assertNotDisposed() {
         if (this._isDisposed) {
-            throw ( new Error('Model is disposed!'));
+            throw ( new BugIndicatingError('Model is disposed!'));
         }
     }
     equalsTextBuffer(other) {

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

@@ -38,11 +38,6 @@ class TokenizationTextModelPart extends TextModelPart {
             () => this._languageId,
             this._attachedViews
         )));
-        this._register(this._languageConfigurationService.onDidChange(e => {
-            if (e.affects(this._languageId)) {
-                this._onDidChangeLanguageConfiguration.fire({});
-            }
-        }));
         this._register(this.grammarTokens.onDidChangeTokens(e => {
             this._emitModelTokensChangedEvent(e);
         }));
@@ -55,6 +50,11 @@ class TokenizationTextModelPart extends TextModelPart {
             || this._onDidChangeLanguageConfiguration.hasListeners()
             || this._onDidChangeTokens.hasListeners());
     }
+    handleLanguageConfigurationServiceChange(e) {
+        if (e.affects(this._languageId)) {
+            this._onDidChangeLanguageConfiguration.fire({});
+        }
+    }
     handleDidChangeContent(e) {
         if (e.isFlush) {
             this._semanticTokens.flush();

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

@@ -510,6 +510,10 @@ interface IReadonlyTextBuffer {
     getLineFirstNonWhitespaceColumn(lineNumber: number): number;
     getLineLastNonWhitespaceColumn(lineNumber: number): number;
     findMatchesLineByLine(searchRange: Range, searchData: SearchData, captureMatches: boolean, limitResultCount: number): FindMatch[];
+    /**
+     * Get nearest chunk of text after `offset` in the text buffer.
+     */
+    getNearestChunk(offset: number): string;
 }
 /**
  * @internal

package/vscode/src/vs/editor/common/services/getIconClasses.js

@@ -84,6 +84,6 @@ function detectLanguageId(modelService, languageService, resource) {
     return languageService.guessLanguageIdByFilepathOrFirstLine(resource);
 }
 function cssEscape(str) {
-    return str.replace(/[\11\12\14\15\40]/g, '/');
+    return str.replace(/[\x11\x12\x14\x15\x40]/g, '/');
 }
 export { getIconClasses, getIconClassesForLanguageId };

package/vscode/src/vs/editor/common/services/semanticTokensProviderStyling.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { TokenMetadata, MetadataConsts, FontStyle } from '../encodedTokenAttributes.js';
+import { MetadataConsts, FontStyle } from '../encodedTokenAttributes.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.service.js';
-import { LogLevel } from '../../../platform/log/common/log.js';
+import '../../../platform/log/common/log.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { SparseMultilineTokens } from '../tokens/sparseMultilineTokens.js';
 import { ILanguageService } from '../languages/language.js';
@@ -28,9 +28,6 @@ let SemanticTokensProviderStyling = class SemanticTokensProviderStyling {
         let metadata;
         if (entry) {
             metadata = entry.metadata;
-            if (this._logService.getLevel() === LogLevel.Trace) {
-                this._logService.trace(`SemanticTokensProviderStyling [CACHED] ${tokenTypeIndex} / ${tokenModifierSet}: foreground ${TokenMetadata.getForeground(metadata)}, fontStyle ${( TokenMetadata.getFontStyle(metadata).toString(2))}`);
-            }
         }
         else {
             let tokenType = this._legend.tokenTypes[tokenTypeIndex];
@@ -43,10 +40,6 @@ let SemanticTokensProviderStyling = class SemanticTokensProviderStyling {
                     }
                     modifierSet = modifierSet >> 1;
                 }
-                if (modifierSet > 0 && this._logService.getLevel() === LogLevel.Trace) {
-                    this._logService.trace(`SemanticTokensProviderStyling: unknown token modifier index: ${( tokenModifierSet.toString(2))} for legend: ${JSON.stringify(this._legend.tokenModifiers)}`);
-                    tokenModifiers.push('not-in-legend');
-                }
                 const tokenStyle = this._themeService.getColorTheme().getTokenStyleMetadata(tokenType, tokenModifiers, languageId);
                 if (typeof tokenStyle === 'undefined') {
                     metadata = SemanticTokensProviderStylingConstants.NO_STYLING;
@@ -79,16 +72,10 @@ let SemanticTokensProviderStyling = class SemanticTokensProviderStyling {
                 }
             }
             else {
-                if (this._logService.getLevel() === LogLevel.Trace) {
-                    this._logService.trace(`SemanticTokensProviderStyling: unknown token type index: ${tokenTypeIndex} for legend: ${JSON.stringify(this._legend.tokenTypes)}`);
-                }
                 metadata = SemanticTokensProviderStylingConstants.NO_STYLING;
                 tokenType = 'not-in-legend';
             }
             this._hashTable.add(tokenTypeIndex, tokenModifierSet, encodedLanguageId, metadata);
-            if (this._logService.getLevel() === LogLevel.Trace) {
-                this._logService.trace(`SemanticTokensProviderStyling ${tokenTypeIndex} (${tokenType}) / ${tokenModifierSet} (${tokenModifiers.join(' ')}): foreground ${TokenMetadata.getForeground(metadata)}, fontStyle ${( TokenMetadata.getFontStyle(metadata).toString(2))}`);
-            }
         }
         return metadata;
     }

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

@@ -181,68 +181,69 @@ var EditorOption;
     EditorOption[EditorOption["pasteAs"] = 85] = "pasteAs";
     EditorOption[EditorOption["parameterHints"] = 86] = "parameterHints";
     EditorOption[EditorOption["peekWidgetDefaultFocus"] = 87] = "peekWidgetDefaultFocus";
-    EditorOption[EditorOption["definitionLinkOpensInPeek"] = 88] = "definitionLinkOpensInPeek";
-    EditorOption[EditorOption["quickSuggestions"] = 89] = "quickSuggestions";
-    EditorOption[EditorOption["quickSuggestionsDelay"] = 90] = "quickSuggestionsDelay";
-    EditorOption[EditorOption["readOnly"] = 91] = "readOnly";
-    EditorOption[EditorOption["readOnlyMessage"] = 92] = "readOnlyMessage";
-    EditorOption[EditorOption["renameOnType"] = 93] = "renameOnType";
-    EditorOption[EditorOption["renderControlCharacters"] = 94] = "renderControlCharacters";
-    EditorOption[EditorOption["renderFinalNewline"] = 95] = "renderFinalNewline";
-    EditorOption[EditorOption["renderLineHighlight"] = 96] = "renderLineHighlight";
-    EditorOption[EditorOption["renderLineHighlightOnlyWhenFocus"] = 97] = "renderLineHighlightOnlyWhenFocus";
-    EditorOption[EditorOption["renderValidationDecorations"] = 98] = "renderValidationDecorations";
-    EditorOption[EditorOption["renderWhitespace"] = 99] = "renderWhitespace";
-    EditorOption[EditorOption["revealHorizontalRightPadding"] = 100] = "revealHorizontalRightPadding";
-    EditorOption[EditorOption["roundedSelection"] = 101] = "roundedSelection";
-    EditorOption[EditorOption["rulers"] = 102] = "rulers";
-    EditorOption[EditorOption["scrollbar"] = 103] = "scrollbar";
-    EditorOption[EditorOption["scrollBeyondLastColumn"] = 104] = "scrollBeyondLastColumn";
-    EditorOption[EditorOption["scrollBeyondLastLine"] = 105] = "scrollBeyondLastLine";
-    EditorOption[EditorOption["scrollPredominantAxis"] = 106] = "scrollPredominantAxis";
-    EditorOption[EditorOption["selectionClipboard"] = 107] = "selectionClipboard";
-    EditorOption[EditorOption["selectionHighlight"] = 108] = "selectionHighlight";
-    EditorOption[EditorOption["selectOnLineNumbers"] = 109] = "selectOnLineNumbers";
-    EditorOption[EditorOption["showFoldingControls"] = 110] = "showFoldingControls";
-    EditorOption[EditorOption["showUnused"] = 111] = "showUnused";
-    EditorOption[EditorOption["snippetSuggestions"] = 112] = "snippetSuggestions";
-    EditorOption[EditorOption["smartSelect"] = 113] = "smartSelect";
-    EditorOption[EditorOption["smoothScrolling"] = 114] = "smoothScrolling";
-    EditorOption[EditorOption["stickyScroll"] = 115] = "stickyScroll";
-    EditorOption[EditorOption["stickyTabStops"] = 116] = "stickyTabStops";
-    EditorOption[EditorOption["stopRenderingLineAfter"] = 117] = "stopRenderingLineAfter";
-    EditorOption[EditorOption["suggest"] = 118] = "suggest";
-    EditorOption[EditorOption["suggestFontSize"] = 119] = "suggestFontSize";
-    EditorOption[EditorOption["suggestLineHeight"] = 120] = "suggestLineHeight";
-    EditorOption[EditorOption["suggestOnTriggerCharacters"] = 121] = "suggestOnTriggerCharacters";
-    EditorOption[EditorOption["suggestSelection"] = 122] = "suggestSelection";
-    EditorOption[EditorOption["tabCompletion"] = 123] = "tabCompletion";
-    EditorOption[EditorOption["tabIndex"] = 124] = "tabIndex";
-    EditorOption[EditorOption["unicodeHighlighting"] = 125] = "unicodeHighlighting";
-    EditorOption[EditorOption["unusualLineTerminators"] = 126] = "unusualLineTerminators";
-    EditorOption[EditorOption["useShadowDOM"] = 127] = "useShadowDOM";
-    EditorOption[EditorOption["useTabStops"] = 128] = "useTabStops";
-    EditorOption[EditorOption["wordBreak"] = 129] = "wordBreak";
-    EditorOption[EditorOption["wordSegmenterLocales"] = 130] = "wordSegmenterLocales";
-    EditorOption[EditorOption["wordSeparators"] = 131] = "wordSeparators";
-    EditorOption[EditorOption["wordWrap"] = 132] = "wordWrap";
-    EditorOption[EditorOption["wordWrapBreakAfterCharacters"] = 133] = "wordWrapBreakAfterCharacters";
-    EditorOption[EditorOption["wordWrapBreakBeforeCharacters"] = 134] = "wordWrapBreakBeforeCharacters";
-    EditorOption[EditorOption["wordWrapColumn"] = 135] = "wordWrapColumn";
-    EditorOption[EditorOption["wordWrapOverride1"] = 136] = "wordWrapOverride1";
-    EditorOption[EditorOption["wordWrapOverride2"] = 137] = "wordWrapOverride2";
-    EditorOption[EditorOption["wrappingIndent"] = 138] = "wrappingIndent";
-    EditorOption[EditorOption["wrappingStrategy"] = 139] = "wrappingStrategy";
-    EditorOption[EditorOption["showDeprecated"] = 140] = "showDeprecated";
-    EditorOption[EditorOption["inlayHints"] = 141] = "inlayHints";
-    EditorOption[EditorOption["editorClassName"] = 142] = "editorClassName";
-    EditorOption[EditorOption["pixelRatio"] = 143] = "pixelRatio";
-    EditorOption[EditorOption["tabFocusMode"] = 144] = "tabFocusMode";
-    EditorOption[EditorOption["layoutInfo"] = 145] = "layoutInfo";
-    EditorOption[EditorOption["wrappingInfo"] = 146] = "wrappingInfo";
-    EditorOption[EditorOption["defaultColorDecorators"] = 147] = "defaultColorDecorators";
-    EditorOption[EditorOption["colorDecoratorsActivatedOn"] = 148] = "colorDecoratorsActivatedOn";
-    EditorOption[EditorOption["inlineCompletionsAccessibilityVerbose"] = 149] = "inlineCompletionsAccessibilityVerbose";
+    EditorOption[EditorOption["placeholder"] = 88] = "placeholder";
+    EditorOption[EditorOption["definitionLinkOpensInPeek"] = 89] = "definitionLinkOpensInPeek";
+    EditorOption[EditorOption["quickSuggestions"] = 90] = "quickSuggestions";
+    EditorOption[EditorOption["quickSuggestionsDelay"] = 91] = "quickSuggestionsDelay";
+    EditorOption[EditorOption["readOnly"] = 92] = "readOnly";
+    EditorOption[EditorOption["readOnlyMessage"] = 93] = "readOnlyMessage";
+    EditorOption[EditorOption["renameOnType"] = 94] = "renameOnType";
+    EditorOption[EditorOption["renderControlCharacters"] = 95] = "renderControlCharacters";
+    EditorOption[EditorOption["renderFinalNewline"] = 96] = "renderFinalNewline";
+    EditorOption[EditorOption["renderLineHighlight"] = 97] = "renderLineHighlight";
+    EditorOption[EditorOption["renderLineHighlightOnlyWhenFocus"] = 98] = "renderLineHighlightOnlyWhenFocus";
+    EditorOption[EditorOption["renderValidationDecorations"] = 99] = "renderValidationDecorations";
+    EditorOption[EditorOption["renderWhitespace"] = 100] = "renderWhitespace";
+    EditorOption[EditorOption["revealHorizontalRightPadding"] = 101] = "revealHorizontalRightPadding";
+    EditorOption[EditorOption["roundedSelection"] = 102] = "roundedSelection";
+    EditorOption[EditorOption["rulers"] = 103] = "rulers";
+    EditorOption[EditorOption["scrollbar"] = 104] = "scrollbar";
+    EditorOption[EditorOption["scrollBeyondLastColumn"] = 105] = "scrollBeyondLastColumn";
+    EditorOption[EditorOption["scrollBeyondLastLine"] = 106] = "scrollBeyondLastLine";
+    EditorOption[EditorOption["scrollPredominantAxis"] = 107] = "scrollPredominantAxis";
+    EditorOption[EditorOption["selectionClipboard"] = 108] = "selectionClipboard";
+    EditorOption[EditorOption["selectionHighlight"] = 109] = "selectionHighlight";
+    EditorOption[EditorOption["selectOnLineNumbers"] = 110] = "selectOnLineNumbers";
+    EditorOption[EditorOption["showFoldingControls"] = 111] = "showFoldingControls";
+    EditorOption[EditorOption["showUnused"] = 112] = "showUnused";
+    EditorOption[EditorOption["snippetSuggestions"] = 113] = "snippetSuggestions";
+    EditorOption[EditorOption["smartSelect"] = 114] = "smartSelect";
+    EditorOption[EditorOption["smoothScrolling"] = 115] = "smoothScrolling";
+    EditorOption[EditorOption["stickyScroll"] = 116] = "stickyScroll";
+    EditorOption[EditorOption["stickyTabStops"] = 117] = "stickyTabStops";
+    EditorOption[EditorOption["stopRenderingLineAfter"] = 118] = "stopRenderingLineAfter";
+    EditorOption[EditorOption["suggest"] = 119] = "suggest";
+    EditorOption[EditorOption["suggestFontSize"] = 120] = "suggestFontSize";
+    EditorOption[EditorOption["suggestLineHeight"] = 121] = "suggestLineHeight";
+    EditorOption[EditorOption["suggestOnTriggerCharacters"] = 122] = "suggestOnTriggerCharacters";
+    EditorOption[EditorOption["suggestSelection"] = 123] = "suggestSelection";
+    EditorOption[EditorOption["tabCompletion"] = 124] = "tabCompletion";
+    EditorOption[EditorOption["tabIndex"] = 125] = "tabIndex";
+    EditorOption[EditorOption["unicodeHighlighting"] = 126] = "unicodeHighlighting";
+    EditorOption[EditorOption["unusualLineTerminators"] = 127] = "unusualLineTerminators";
+    EditorOption[EditorOption["useShadowDOM"] = 128] = "useShadowDOM";
+    EditorOption[EditorOption["useTabStops"] = 129] = "useTabStops";
+    EditorOption[EditorOption["wordBreak"] = 130] = "wordBreak";
+    EditorOption[EditorOption["wordSegmenterLocales"] = 131] = "wordSegmenterLocales";
+    EditorOption[EditorOption["wordSeparators"] = 132] = "wordSeparators";
+    EditorOption[EditorOption["wordWrap"] = 133] = "wordWrap";
+    EditorOption[EditorOption["wordWrapBreakAfterCharacters"] = 134] = "wordWrapBreakAfterCharacters";
+    EditorOption[EditorOption["wordWrapBreakBeforeCharacters"] = 135] = "wordWrapBreakBeforeCharacters";
+    EditorOption[EditorOption["wordWrapColumn"] = 136] = "wordWrapColumn";
+    EditorOption[EditorOption["wordWrapOverride1"] = 137] = "wordWrapOverride1";
+    EditorOption[EditorOption["wordWrapOverride2"] = 138] = "wordWrapOverride2";
+    EditorOption[EditorOption["wrappingIndent"] = 139] = "wrappingIndent";
+    EditorOption[EditorOption["wrappingStrategy"] = 140] = "wrappingStrategy";
+    EditorOption[EditorOption["showDeprecated"] = 141] = "showDeprecated";
+    EditorOption[EditorOption["inlayHints"] = 142] = "inlayHints";
+    EditorOption[EditorOption["editorClassName"] = 143] = "editorClassName";
+    EditorOption[EditorOption["pixelRatio"] = 144] = "pixelRatio";
+    EditorOption[EditorOption["tabFocusMode"] = 145] = "tabFocusMode";
+    EditorOption[EditorOption["layoutInfo"] = 146] = "layoutInfo";
+    EditorOption[EditorOption["wrappingInfo"] = 147] = "wrappingInfo";
+    EditorOption[EditorOption["defaultColorDecorators"] = 148] = "defaultColorDecorators";
+    EditorOption[EditorOption["colorDecoratorsActivatedOn"] = 149] = "colorDecoratorsActivatedOn";
+    EditorOption[EditorOption["inlineCompletionsAccessibilityVerbose"] = 150] = "inlineCompletionsAccessibilityVerbose";
 })(EditorOption || (EditorOption = {})));
 var EndOfLinePreference;
 ( (function(EndOfLinePreference) {

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

@@ -26,11 +26,12 @@ import { ViewModelEventDispatcher, ScrollChangedEvent, FocusChangedEvent, ModelC
 import { ViewModelLinesFromModelAsIs, ViewModelLinesFromProjectedModel } from './viewModelLines.js';
 import { GlyphMarginLanesModel } from './glyphLanesModel.js';
 class ViewModel extends Disposable {
-    constructor(editorId, configuration, model, domLineBreaksComputerFactory, monospaceLineBreaksComputerFactory, scheduleAtNextAnimationFrame, languageConfigurationService, _themeService, _attachedView) {
+    constructor(editorId, configuration, model, domLineBreaksComputerFactory, monospaceLineBreaksComputerFactory, scheduleAtNextAnimationFrame, languageConfigurationService, _themeService, _attachedView, _transactionalTarget) {
         super();
         this.languageConfigurationService = languageConfigurationService;
         this._themeService = _themeService;
         this._attachedView = _attachedView;
+        this._transactionalTarget = _transactionalTarget;
         this.hiddenAreasModel = ( new HiddenAreasModel());
         this.previousHiddenAreas = [];
         this._editorId = editorId;
@@ -962,13 +963,15 @@ class ViewModel extends Disposable {
         }
     }
     _withViewEventsCollector(callback) {
-        try {
-            const eventsCollector = this._eventDispatcher.beginEmitViewEvents();
-            return callback(eventsCollector);
-        }
-        finally {
-            this._eventDispatcher.endEmitViewEvents();
-        }
+        return this._transactionalTarget.batchChanges(() => {
+            try {
+                const eventsCollector = this._eventDispatcher.beginEmitViewEvents();
+                return callback(eventsCollector);
+            }
+            finally {
+                this._eventDispatcher.endEmitViewEvents();
+            }
+        });
     }
     batchEvents(callback) {
         this._withViewEventsCollector(() => { callback(); });

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

@@ -26,7 +26,7 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 const _moduleId = "vs/editor/contrib/bracketMatching/browser/bracketMatching";
-const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', { dark: '#A0A0A0', light: '#A0A0A0', hcDark: '#A0A0A0', hcLight: '#A0A0A0' }, ( localizeWithPath(_moduleId, 0, 'Overview ruler marker color for matching brackets.')));
+const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', '#A0A0A0', ( localizeWithPath(_moduleId, 0, 'Overview ruler marker color for matching brackets.')));
 class JumpToBracketAction extends EditorAction {
     constructor() {
         super({

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js

@@ -38,7 +38,6 @@ import { registerThemingParticipant } from '../../../../platform/theme/common/th
 import { CodeActionTriggerSource, CodeActionAutoApply, CodeActionKind } from '../common/types.js';
 import { CodeActionModel, CodeActionsState } from './codeActionModel.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 var CodeActionController_1;
 const _moduleId = "vs/editor/contrib/codeAction/browser/codeActionController";
 const DECORATION_CLASS_NAME = 'quickfix-edit-highlight';
@@ -48,13 +47,12 @@ let CodeActionController = class CodeActionController extends Disposable {
     static get(editor) {
         return editor.getContribution(CodeActionController_1.ID);
     }
-    constructor(editor, markerService, contextKeyService, instantiationService, languageFeaturesService, progressService, _commandService, _configurationService, _actionWidgetService, _instantiationService, _telemetryService) {
+    constructor(editor, markerService, contextKeyService, instantiationService, languageFeaturesService, progressService, _commandService, _configurationService, _actionWidgetService, _instantiationService) {
         super();
         this._commandService = _commandService;
         this._configurationService = _configurationService;
         this._actionWidgetService = _actionWidgetService;
         this._instantiationService = _instantiationService;
-        this._telemetryService = _telemetryService;
         this._activeCodeActions = this._register(( (new MutableDisposable())));
         this._showDisabled = false;
         this._disposed = false;
@@ -83,11 +81,6 @@ let CodeActionController = class CodeActionController extends Disposable {
         super.dispose();
     }
     async showCodeActionsFromLightbulb(actions, at) {
-        this._telemetryService.publicLog2('codeAction.showCodeActionsFromLightbulb', {
-            codeActionListLength: actions.validActions.length,
-            codeActions: ( (actions.validActions.map(action => action.action.title))),
-            codeActionProviders: ( (actions.validActions.map(action => action.provider?.displayName ?? ''))),
-        });
         if (actions.allAIFixes && actions.validActions.length === 1) {
             const actionItem = actions.validActions[0];
             const command = actionItem.action.command;
@@ -235,13 +228,6 @@ let CodeActionController = class CodeActionController extends Disposable {
             onHide: (didCancel) => {
                 this._editor?.focus();
                 currentDecorations.clear();
-                if (options.fromLightbulb && didCancel !== undefined) {
-                    this._telemetryService.publicLog2('codeAction.showCodeActionList.onHide', {
-                        codeActionListLength: actions.validActions.length,
-                        didCancel: didCancel,
-                        codeActions: ( (actions.validActions.map(action => action.action.title))),
-                    });
-                }
             },
             onHover: async (action, token) => {
                 if (token.isCancellationRequested) {
@@ -364,8 +350,7 @@ CodeActionController = CodeActionController_1 = ( (__decorate([
     ( (__param(6, ICommandService))),
     ( (__param(7, IConfigurationService))),
     ( (__param(8, IActionWidgetService))),
-    ( (__param(9, IInstantiationService))),
-    ( (__param(10, ITelemetryService)))
+    ( (__param(9, IInstantiationService)))
 ], CodeActionController)));
 registerThemingParticipant((theme, collector) => {
     const addBackgroundColorRule = (selector, color) => {

package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .lightBulbWidget{align-items:center;display:flex;justify-content:center}.monaco-editor .lightBulbWidget:hover{cursor:pointer}.monaco-editor .lightBulbWidget.codicon-light-bulb,.monaco-editor .lightBulbWidget.codicon-lightbulb-sparkle{color:var(--vscode-editorLightBulb-foreground)}.monaco-editor .lightBulbWidget.codicon-lightbulb-autofix,.monaco-editor .lightBulbWidget.codicon-lightbulb-sparkle-autofix{color:var(--vscode-editorLightBulbAutoFix-foreground,var(--vscode-editorLightBulb-foreground))}.monaco-editor .lightBulbWidget.codicon-sparkle-filled{color:var(--vscode-editorLightBulbAi-foreground,var(--vscode-icon-foreground))}.monaco-editor .lightBulbWidget:before{position:relative;z-index:2}.monaco-editor .lightBulbWidget:after{background-color:var(--vscode-editor-background);content:\"\";display:block;height:100%;left:0;opacity:.3;position:absolute;top:0;width:100%;z-index:1}";
+var css = ".monaco-editor .lightBulbWidget{align-items:center;display:flex;justify-content:center}.monaco-editor .lightBulbWidget:hover{cursor:pointer}.monaco-editor .lightBulbWidget.codicon-light-bulb,.monaco-editor .lightBulbWidget.codicon-lightbulb-sparkle{color:var(--vscode-editorLightBulb-foreground)}.monaco-editor .lightBulbWidget.codicon-lightbulb-autofix,.monaco-editor .lightBulbWidget.codicon-lightbulb-sparkle-autofix{color:var(--vscode-editorLightBulbAutoFix-foreground,var(--vscode-editorLightBulb-foreground))}.monaco-editor .lightBulbWidget.codicon-sparkle-filled{color:var(--vscode-editorLightBulbAi-foreground,var(--vscode-icon-foreground))}.monaco-editor .lightBulbWidget:before{position:relative;z-index:2}.monaco-editor .lightBulbWidget:after{content:\"\";display:block;height:100%;left:0;opacity:.3;position:absolute;top:0;width:100%;z-index:1}";
 n(css,{});
 export { css, css as default };