@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -15,6 +15,7 @@ import { ITextModel, EndOfLineSequence } from './model.js';
 import { ExtensionIdentifier } from '../../platform/extensions/common/extensions.js';
 import { IMarkerData } from '../../platform/markers/common/markers.js';
 import { LanguageFilter } from './languageSelector.js';
+import { HierarchicalKind } from '../../base/common/hierarchicalKind.js';
 
 /**
  * @internal
@@ -303,6 +304,20 @@ interface CompletionList {
      */
     duration?: number;
 }
+/**
+ * Info provided on partial acceptance.
+ */
+interface PartialAcceptInfo {
+    kind: PartialAcceptTriggerKind;
+}
+/**
+ * How a partial acceptance was triggered.
+ */
+declare const enum PartialAcceptTriggerKind {
+    Word = 0,
+    Line = 1,
+    Suggest = 2
+}
 /**
  * How a suggest provider was triggered.
  */
@@ -447,7 +462,7 @@ interface InlineCompletionsProvider<T extends InlineCompletions = InlineCompleti
     /**
      * Will be called when an item is partially accepted.
      */
-    handlePartialAccept?(completions: T, item: T['items'][number], acceptedCharacters: number): void;
+    handlePartialAccept?(completions: T, item: T['items'][number], acceptedCharacters: number, info: PartialAcceptInfo): void;
     /**
      * Will be called when a completions list is no longer in use and can be garbage-collected.
     */
@@ -521,8 +536,8 @@ interface CodeActionProvider {
  * @internal
  */
 interface DocumentPasteEdit {
-    readonly label: string;
-    readonly detail: string;
+    readonly title: string;
+    readonly kind: HierarchicalKind;
     readonly handledMimeType?: string;
     readonly yieldTo?: readonly DropYieldTo[];
     insertText: string | {
@@ -530,22 +545,38 @@ interface DocumentPasteEdit {
     };
     additionalEdit?: WorkspaceEdit;
 }
+/**
+ * @internal
+ */
+declare enum DocumentPasteTriggerKind {
+    Automatic = 0,
+    PasteAs = 1
+}
 /**
  * @internal
  */
 interface DocumentPasteContext {
-    readonly only?: string;
-    readonly trigger: 'explicit' | 'implicit';
+    readonly only?: HierarchicalKind;
+    readonly triggerKind: DocumentPasteTriggerKind;
+}
+/**
+ * @internal
+ */
+interface DocumentPasteEditsSession {
+    edits: readonly DocumentPasteEdit[];
+    dispose(): void;
 }
 /**
  * @internal
  */
 interface DocumentPasteEditProvider {
-    readonly id: string;
+    readonly id?: string;
     readonly copyMimeTypes?: readonly string[];
     readonly pasteMimeTypes?: readonly string[];
+    readonly providedPasteEditKinds?: readonly HierarchicalKind[];
     prepareDocumentPaste?(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<undefined | IReadonlyVSDataTransfer>;
-    provideDocumentPasteEdits?(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEdit | undefined>;
+    provideDocumentPasteEdits?(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEditsSession | undefined>;
+    resolveDocumentPasteEdit?(edit: DocumentPasteEdit, token: CancellationToken): Promise<DocumentPasteEdit>;
 }
 /**
  * Represents a parameter of a callable-signature. A parameter can
@@ -1270,7 +1301,7 @@ interface DocumentRangeSemanticTokensProvider {
  * @internal
  */
 type DropYieldTo = {
-    readonly providerId: string;
+    readonly kind: HierarchicalKind;
 } | {
     readonly mimeType: string;
 };
@@ -1278,7 +1309,8 @@ type DropYieldTo = {
  * @internal
  */
 interface DocumentOnDropEdit {
-    readonly label: string;
+    readonly title: string;
+    readonly kind: HierarchicalKind | undefined;
     readonly handledMimeType?: string;
     readonly yieldTo?: readonly DropYieldTo[];
     insertText: string | {
@@ -1292,7 +1324,7 @@ interface DocumentOnDropEdit {
 interface DocumentOnDropEditProvider {
     readonly id?: string;
     readonly dropMimeTypes?: readonly string[];
-    provideDocumentOnDropEdits(model: ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): ProviderResult<DocumentOnDropEdit>;
+    provideDocumentOnDropEdits(model: ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): ProviderResult<DocumentOnDropEdit[]>;
 }
 interface DocumentContextItem {
     readonly uri: URI;
@@ -1334,4 +1366,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 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 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, type NewSymbolNamesProvider, 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 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 HoverProvider, 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, 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/languages.js

@@ -130,6 +130,11 @@ class SelectedSuggestionInfo {
             && this.isSnippetText === other.isSnippetText;
     }
 }
+var DocumentPasteTriggerKind;
+( (function(DocumentPasteTriggerKind) {
+    DocumentPasteTriggerKind[DocumentPasteTriggerKind["Automatic"] = 0] = "Automatic";
+    DocumentPasteTriggerKind[DocumentPasteTriggerKind["PasteAs"] = 1] = "PasteAs";
+})(DocumentPasteTriggerKind || (DocumentPasteTriggerKind = {})));
 var SignatureHelpTriggerKind;
 ( (function(SignatureHelpTriggerKind) {
     SignatureHelpTriggerKind[SignatureHelpTriggerKind["Invoke"] = 1] = "Invoke";
@@ -245,6 +250,10 @@ class FoldingRangeKind {
         this.value = value;
     }
 }
+var NewSymbolNameTag;
+( (function(NewSymbolNameTag) {
+    NewSymbolNameTag[NewSymbolNameTag["AIGenerated"] = 1] = "AIGenerated";
+})(NewSymbolNameTag || (NewSymbolNameTag = {})));
 var Command;
 ( (function(Command) {
     function is(obj) {
@@ -266,6 +275,11 @@ var CommentThreadState;
     CommentThreadState[CommentThreadState["Unresolved"] = 0] = "Unresolved";
     CommentThreadState[CommentThreadState["Resolved"] = 1] = "Resolved";
 })(CommentThreadState || (CommentThreadState = {})));
+var CommentThreadApplicability;
+( (function(CommentThreadApplicability) {
+    CommentThreadApplicability[CommentThreadApplicability["Current"] = 0] = "Current";
+    CommentThreadApplicability[CommentThreadApplicability["Outdated"] = 1] = "Outdated";
+})(CommentThreadApplicability || (CommentThreadApplicability = {})));
 var CommentMode;
 ( (function(CommentMode) {
     CommentMode[CommentMode["Editing"] = 0] = "Editing";
@@ -310,4 +324,4 @@ var InlineEditTriggerKind;
     InlineEditTriggerKind[InlineEditTriggerKind["Invoke"] = 0] = "Invoke";
     InlineEditTriggerKind[InlineEditTriggerKind["Automatic"] = 1] = "Automatic";
 })(InlineEditTriggerKind || (InlineEditTriggerKind = {})));
-export { Command, CommentMode, CommentThreadCollapsibleState, CommentThreadState, CompletionItemKinds, DocumentHighlightKind, EncodedTokenizationResult, ExternalUriOpenerPriority, FoldingRangeKind, InlayHintKind, InlineCompletionTriggerKind, InlineEditTriggerKind, LazyTokenizationSupport, SelectedSuggestionInfo, SignatureHelpTriggerKind, SymbolKinds, TextEdit, Token, TokenizationRegistry, TokenizationResult, getAriaLabelForSymbol, isLocationLink, symbolKindNames };
+export { Command, CommentMode, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadState, CompletionItemKinds, DocumentHighlightKind, DocumentPasteTriggerKind, EncodedTokenizationResult, ExternalUriOpenerPriority, FoldingRangeKind, InlayHintKind, InlineCompletionTriggerKind, InlineEditTriggerKind, LazyTokenizationSupport, NewSymbolNameTag, SelectedSuggestionInfo, SignatureHelpTriggerKind, SymbolKinds, TextEdit, Token, TokenizationRegistry, TokenizationResult, getAriaLabelForSymbol, isLocationLink, symbolKindNames };

package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsImpl.js

@@ -7,7 +7,7 @@ import { BracketsUtils } from '../../languages/supports/richEditBrackets.js';
 import { BracketPairsTree } from './bracketPairsTree/bracketPairsTree.js';
 class BracketPairsTextModelPart extends Disposable {
     get canBuildAST() {
-        const maxSupportedDocumentLength =  50000 *  100;
+        const maxSupportedDocumentLength =  50_000 *  100;
         return this.textModel.getValueLength() <= maxSupportedDocumentLength;
     }
     constructor(textModel, languageConfigurationService) {

package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length.js

@@ -1,61 +1,6 @@
 import { splitLines } from '../../../../../base/common/strings.js';
 import { Range } from '../../../core/range.js';
-class LengthObj {
-    static { this.zero = ( new LengthObj(0, 0)); }
-    static lengthDiffNonNegative(start, end) {
-        if (end.isLessThan(start)) {
-            return LengthObj.zero;
-        }
-        if (start.lineCount === end.lineCount) {
-            return ( new LengthObj(0, end.columnCount - start.columnCount));
-        }
-        else {
-            return ( new LengthObj(end.lineCount - start.lineCount, end.columnCount));
-        }
-    }
-    constructor(lineCount, columnCount) {
-        this.lineCount = lineCount;
-        this.columnCount = columnCount;
-    }
-    isZero() {
-        return this.lineCount === 0 && this.columnCount === 0;
-    }
-    toLength() {
-        return toLength(this.lineCount, this.columnCount);
-    }
-    isLessThan(other) {
-        if (this.lineCount !== other.lineCount) {
-            return this.lineCount < other.lineCount;
-        }
-        return this.columnCount < other.columnCount;
-    }
-    isGreaterThan(other) {
-        if (this.lineCount !== other.lineCount) {
-            return this.lineCount > other.lineCount;
-        }
-        return this.columnCount > other.columnCount;
-    }
-    equals(other) {
-        return this.lineCount === other.lineCount && this.columnCount === other.columnCount;
-    }
-    compare(other) {
-        if (this.lineCount !== other.lineCount) {
-            return this.lineCount - other.lineCount;
-        }
-        return this.columnCount - other.columnCount;
-    }
-    add(other) {
-        if (other.lineCount === 0) {
-            return ( new LengthObj(this.lineCount, this.columnCount + other.columnCount));
-        }
-        else {
-            return ( new LengthObj(this.lineCount + other.lineCount, other.columnCount));
-        }
-    }
-    toString() {
-        return `${this.lineCount},${this.columnCount}`;
-    }
-}
+import { TextLength } from '../../../core/textLength.js';
 function lengthDiff(startLineCount, startColumnCount, endLineCount, endColumnCount) {
     return (startLineCount !== endLineCount)
         ? toLength(endLineCount - startLineCount, endColumnCount)
@@ -73,7 +18,7 @@ function lengthToObj(length) {
     const l = length;
     const lineCount = Math.floor(l / factor);
     const columnCount = l - lineCount * factor;
-    return ( new LengthObj(lineCount, columnCount));
+    return ( new TextLength(lineCount, columnCount));
 }
 function lengthGetLineCount(length) {
     return Math.floor(length / factor);
@@ -137,4 +82,4 @@ function lengthOfString(str) {
     const lines = splitLines(str);
     return toLength(lines.length - 1, lines[lines.length - 1].length);
 }
-export { LengthObj, lengthAdd, lengthDiff, lengthDiffNonNegative, lengthEquals, lengthGetColumnCountIfZeroLineCount, lengthGetLineCount, lengthGreaterThanEqual, lengthIsZero, lengthLessThan, lengthLessThanEqual, lengthOfString, lengthToObj, lengthZero, lengthsToRange, positionToLength, sumLengths, toLength };
+export { lengthAdd, lengthDiff, lengthDiffNonNegative, lengthEquals, lengthGetColumnCountIfZeroLineCount, lengthGetLineCount, lengthGreaterThanEqual, lengthIsZero, lengthLessThan, lengthLessThanEqual, lengthOfString, lengthToObj, lengthZero, lengthsToRange, positionToLength, sumLengths, toLength };

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

@@ -1673,6 +1673,8 @@ class ModelDecorationMinimapOptions extends DecorationOptions {
     constructor(options) {
         super(options);
         this.position = options.position;
+        this.sectionHeaderStyle = options.sectionHeaderStyle ?? null;
+        this.sectionHeaderText = options.sectionHeaderText ?? null;
     }
     getColor(theme) {
         if (!this._resolvedColor) {

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

@@ -44,7 +44,7 @@ class SearchParams {
         }
         return ( new SearchData(
             regex,
-            this.wordSeparators ? getMapForWordSeparators(this.wordSeparators) : null,
+            this.wordSeparators ? getMapForWordSeparators(this.wordSeparators, []) : null,
             canUseSimpleSearch ? this.searchString : null
         ));
     }

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

@@ -0,0 +1,17 @@
+import { AbstractText } from '../core/textEdit.js';
+import { TextLength } from '../core/textLength.js';
+class TextModelText extends AbstractText {
+    constructor(_textModel) {
+        super();
+        this._textModel = _textModel;
+    }
+    getValueOfRange(range) {
+        return this._textModel.getValueInRange(range);
+    }
+    get length() {
+        const lastLineNumber = this._textModel.getLineCount();
+        const lastLineLen = this._textModel.getLineLength(lastLineNumber);
+        return ( new TextLength(lastLineNumber - 1, lastLineLen));
+    }
+}
+export { TextModelText };

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

@@ -74,6 +74,10 @@ class TokenizerWithStateStoreAndTextModel extends TokenizerWithStateStore {
         const lineTokens = ( new LineTokens(result.tokens, newLineContent, this._languageIdCodec));
         return lineTokens;
     }
+    hasAccurateTokensForLine(lineNumber) {
+        const firstInvalidLineNumber = this.store.getFirstInvalidEndStateLineNumberOrMax();
+        return (lineNumber < firstInvalidLineNumber);
+    }
     isCheapToTokenize(lineNumber) {
         const firstInvalidLineNumber = this.store.getFirstInvalidEndStateLineNumberOrMax();
         if (lineNumber < firstInvalidLineNumber) {

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

@@ -96,6 +96,10 @@ class TokenizationTextModelPart extends TextModelPart {
         this.validateLineNumber(lineNumber);
         this.grammarTokens.forceTokenization(lineNumber);
     }
+    hasAccurateTokensForLine(lineNumber) {
+        this.validateLineNumber(lineNumber);
+        return this.grammarTokens.hasAccurateTokensForLine(lineNumber);
+    }
     isCheapToTokenize(lineNumber) {
         this.validateLineNumber(lineNumber);
         return this.grammarTokens.isCheapToTokenize(lineNumber);
@@ -415,6 +419,12 @@ class GrammarTokens extends Disposable {
         this.setTokens(builder.finalize());
         this._defaultBackgroundTokenizer?.checkFinished();
     }
+    hasAccurateTokensForLine(lineNumber) {
+        if (!this._tokenizer) {
+            return true;
+        }
+        return this._tokenizer.hasAccurateTokensForLine(lineNumber);
+    }
     isCheapToTokenize(lineNumber) {
         if (!this._tokenizer) {
             return true;

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

@@ -30,10 +30,17 @@ declare enum GlyphMarginLane {
 /**
  * Position in the minimap to render the decoration.
  */
-declare enum MinimapPosition {
+declare const enum MinimapPosition {
     Inline = 1,
     Gutter = 2
 }
+/**
+ * Section header style.
+ */
+declare const enum MinimapSectionHeaderStyle {
+    Normal = 1,
+    Underlined = 2
+}
 interface IDecorationOptions {
     /**
      * CSS color to render.
@@ -74,6 +81,14 @@ interface IModelDecorationMinimapOptions extends IDecorationOptions {
      * The position in the minimap.
      */
     position: MinimapPosition;
+    /**
+     * If the decoration is for a section header, which header style.
+     */
+    sectionHeaderStyle?: MinimapSectionHeaderStyle | null;
+    /**
+     * If the decoration is for a section header, the header text.
+     */
+    sectionHeaderText?: string | null;
 }
 /**
  * Options for a model decoration.
@@ -538,4 +553,4 @@ interface IInternalModelContentChange extends IModelContentChange {
     forceMoveMarkers: boolean;
 }
 
-export { ApplyEditsResult, type BracketPairColorizationOptions, DefaultEndOfLine, EndOfLinePreference, EndOfLineSequence, FindMatch, GlyphMarginLane, type IDecorationOptions, type IIdentifiedSingleEditOperation, type IInternalModelContentChange, type IModelDecorationGlyphMarginOptions, type IModelDecorationMinimapOptions, type IModelDecorationOptions, type IModelDecorationOverviewRulerOptions, type IModelDecorationsChangeAccessor, type IModelDeltaDecoration, type IReadonlyTextBuffer, type ISingleEditOperationIdentifier, type ITextBuffer, type ITextBufferFactory, type ITextModel, type ITextModelCreationOptions, type ITextSnapshot, type IValidEditOperation, InjectedTextCursorStops, type InjectedTextOptions, MinimapPosition, OverviewRulerLane, SearchData, TrackedRangeStickiness, ValidAnnotatedEditOperation };
+export { ApplyEditsResult, type BracketPairColorizationOptions, DefaultEndOfLine, EndOfLinePreference, EndOfLineSequence, FindMatch, GlyphMarginLane, type IDecorationOptions, type IIdentifiedSingleEditOperation, type IInternalModelContentChange, type IModelDecorationGlyphMarginOptions, type IModelDecorationMinimapOptions, type IModelDecorationOptions, type IModelDecorationOverviewRulerOptions, type IModelDecorationsChangeAccessor, type IModelDeltaDecoration, type IReadonlyTextBuffer, type ISingleEditOperationIdentifier, type ITextBuffer, type ITextBufferFactory, type ITextModel, type ITextModelCreationOptions, type ITextSnapshot, type IValidEditOperation, InjectedTextCursorStops, type InjectedTextOptions, MinimapPosition, MinimapSectionHeaderStyle, OverviewRulerLane, SearchData, TrackedRangeStickiness, ValidAnnotatedEditOperation };

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

@@ -12,11 +12,6 @@ var GlyphMarginLane;
     GlyphMarginLane[GlyphMarginLane["Center"] = 2] = "Center";
     GlyphMarginLane[GlyphMarginLane["Right"] = 3] = "Right";
 })(GlyphMarginLane || (GlyphMarginLane = {})));
-var MinimapPosition;
-( (function(MinimapPosition) {
-    MinimapPosition[MinimapPosition["Inline"] = 1] = "Inline";
-    MinimapPosition[MinimapPosition["Gutter"] = 2] = "Gutter";
-})(MinimapPosition || (MinimapPosition = {})));
 var InjectedTextCursorStops;
 ( (function(InjectedTextCursorStops) {
     InjectedTextCursorStops[InjectedTextCursorStops["Both"] = 0] = "Both";
@@ -99,4 +94,4 @@ class ApplyEditsResult {
 function shouldSynchronizeModel(model) {
     return (!model.isTooLargeForSyncing() && !model.isForSimpleWidget);
 }
-export { ApplyEditsResult, FindMatch, GlyphMarginLane, InjectedTextCursorStops, MinimapPosition, OverviewRulerLane, SearchData, TextModelResolvedOptions, ValidAnnotatedEditOperation, isITextSnapshot, shouldSynchronizeModel };
+export { ApplyEditsResult, FindMatch, GlyphMarginLane, InjectedTextCursorStops, OverviewRulerLane, SearchData, TextModelResolvedOptions, ValidAnnotatedEditOperation, isITextSnapshot, shouldSynchronizeModel };

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

@@ -14,6 +14,7 @@ import { linesDiffComputers } from '../diff/linesDiffComputers.js';
 import { createProxyObject, getAllMethodNames } from '../../../base/common/objects.js';
 import { BugIndicatingError } from '../../../base/common/errors.js';
 import { computeDefaultDocumentColors } from '../languages/defaultDocumentColorsComputer.js';
+import { findSectionHeaders } from './findSectionHeaders.js';
 class MirrorModel extends MirrorTextModel {
     get uri() {
         return this._uri;
@@ -254,6 +255,13 @@ class EditorSimpleWorker {
         }
         return UnicodeTextModelHighlighter.computeUnicodeHighlights(model, options, range);
     }
+    async findSectionHeaders(url, options) {
+        const model = this._getModel(url);
+        if (!model) {
+            return [];
+        }
+        return findSectionHeaders(model, options);
+    }
     async computeDiff(originalUrl, modifiedUrl, options, algorithm) {
         const original = this._getModel(originalUrl);
         const modified = this._getModel(modifiedUrl);

package/vscode/src/vs/editor/common/services/editorWorker.d.ts

@@ -5,6 +5,7 @@ import { IDocumentDiffProviderOptions, IDocumentDiff } from '../diff/documentDif
 import { IChange } from '../diff/legacyLinesDiffComputer.js';
 import { TextEdit, IInplaceReplaceSupportResult } from '../languages.js';
 import { UnicodeHighlighterOptions } from './unicodeTextModelHighlighter.js';
+import { FindSectionHeaderOptions, SectionHeader } from './findSectionHeaders.js';
 
 type DiffAlgorithmName = 'legacy' | 'advanced';
 
@@ -25,6 +26,7 @@ interface IEditorWorkerService {
     } | null>;
     canNavigateValueSet(resource: URI): boolean;
     navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<IInplaceReplaceSupportResult | null>;
+    findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]>;
 }
 interface IUnicodeHighlightsResult {
     ranges: IRange[];

package/vscode/src/vs/editor/common/services/findSectionHeaders.d.ts

@@ -0,0 +1,28 @@
+import { IRange } from '../core/range.js';
+import { FoldingRules } from '../languages/languageConfiguration.js';
+
+interface FindSectionHeaderOptions {
+    foldingRules?: FoldingRules;
+    findRegionSectionHeaders: boolean;
+    findMarkSectionHeaders: boolean;
+}
+interface SectionHeader {
+    /**
+     * The location of the header text in the text model.
+     */
+    range: IRange;
+    /**
+     * The section header text.
+     */
+    text: string;
+    /**
+     * Whether the section header includes a separator line.
+     */
+    hasSeparatorLine: boolean;
+    /**
+     * This section should be omitted before rendering if it's not in a comment.
+     */
+    shouldBeInComments: boolean;
+}
+
+export type { FindSectionHeaderOptions, SectionHeader };

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

@@ -0,0 +1,71 @@
+const markRegex = /\bMARK:\s*(.*)$/d;
+const trimDashesRegex = /^-+|-+$/g;
+function findSectionHeaders(model, options) {
+    let headers = [];
+    if (options.findRegionSectionHeaders && options.foldingRules?.markers) {
+        const regionHeaders = collectRegionHeaders(model, options);
+        headers = headers.concat(regionHeaders);
+    }
+    if (options.findMarkSectionHeaders) {
+        const markHeaders = collectMarkHeaders(model);
+        headers = headers.concat(markHeaders);
+    }
+    return headers;
+}
+function collectRegionHeaders(model, options) {
+    const regionHeaders = [];
+    const endLineNumber = model.getLineCount();
+    for (let lineNumber = 1; lineNumber <= endLineNumber; lineNumber++) {
+        const lineContent = model.getLineContent(lineNumber);
+        const match = lineContent.match(options.foldingRules.markers.start);
+        if (match) {
+            const range = { startLineNumber: lineNumber, startColumn: match[0].length + 1, endLineNumber: lineNumber, endColumn: lineContent.length + 1 };
+            if (range.endColumn > range.startColumn) {
+                const sectionHeader = {
+                    range,
+                    ...getHeaderText(lineContent.substring(match[0].length)),
+                    shouldBeInComments: false
+                };
+                if (sectionHeader.text || sectionHeader.hasSeparatorLine) {
+                    regionHeaders.push(sectionHeader);
+                }
+            }
+        }
+    }
+    return regionHeaders;
+}
+function collectMarkHeaders(model) {
+    const markHeaders = [];
+    const endLineNumber = model.getLineCount();
+    for (let lineNumber = 1; lineNumber <= endLineNumber; lineNumber++) {
+        const lineContent = model.getLineContent(lineNumber);
+        addMarkHeaderIfFound(lineContent, lineNumber, markHeaders);
+    }
+    return markHeaders;
+}
+function addMarkHeaderIfFound(lineContent, lineNumber, sectionHeaders) {
+    markRegex.lastIndex = 0;
+    const match = markRegex.exec(lineContent);
+    if (match) {
+        const column = match.indices[1][0] + 1;
+        const endColumn = match.indices[1][1] + 1;
+        const range = { startLineNumber: lineNumber, startColumn: column, endLineNumber: lineNumber, endColumn: endColumn };
+        if (range.endColumn > range.startColumn) {
+            const sectionHeader = {
+                range,
+                ...getHeaderText(match[1]),
+                shouldBeInComments: true
+            };
+            if (sectionHeader.text || sectionHeader.hasSeparatorLine) {
+                sectionHeaders.push(sectionHeader);
+            }
+        }
+    }
+}
+function getHeaderText(text) {
+    text = text.trim();
+    const hasSeparatorLine = text.startsWith('-');
+    text = text.replace(trimDashesRegex, '');
+    return { text, hasSeparatorLine };
+}
+export { findSectionHeaders };

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

@@ -1,14 +1,24 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { IMarkerService, MarkerSeverity } from '../../../platform/markers/common/markers.js';
 import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
-import { OverviewRulerLane, MinimapPosition } from '../model.js';
+import { OverviewRulerLane } from '../model.js';
 import { themeColorFromId } from '../../../platform/theme/common/themeService.js';
 import { overviewRulerError, overviewRulerWarning, overviewRulerInfo } from '../core/editorColorRegistry.js';
 import { IModelService } from './model.js';
 import { Range } from '../core/range.js';
 import { Schemas } from '../../../base/common/network.js';
 import { Emitter } from '../../../base/common/event.js';
-import { minimapError, minimapWarning, minimapInfo } from '../../../platform/theme/common/colorRegistry.js';
+import '../../../platform/theme/common/colorUtils.js';
+import '../../../platform/theme/common/colors/baseColors.js';
+import '../../../platform/theme/common/colors/chartsColors.js';
+import '../../../platform/theme/common/colors/editorColors.js';
+import '../../../platform/theme/common/colors/inputColors.js';
+import '../../../platform/theme/common/colors/listColors.js';
+import '../../../platform/theme/common/colors/menuColors.js';
+import { minimapError, minimapWarning, minimapInfo } from '../../../platform/theme/common/colors/minimapColors.js';
+import '../../../platform/theme/common/colors/miscColors.js';
+import '../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../platform/theme/common/colors/searchColors.js';
 import { ResourceMap, BidirectionalMap } from '../../../base/common/map.js';
 import { diffSets } from '../../../base/common/collections.js';
 let MarkerDecorationsService = class MarkerDecorationsService extends Disposable {
@@ -167,7 +177,7 @@ class MarkerDecorations extends Disposable {
                 zIndex = 10;
                 minimap = {
                     color: themeColorFromId(minimapInfo),
-                    position: MinimapPosition.Inline
+                    position: 1
                 };
                 break;
             case MarkerSeverity.Warning:
@@ -176,7 +186,7 @@ class MarkerDecorations extends Disposable {
                 zIndex = 20;
                 minimap = {
                     color: themeColorFromId(minimapWarning),
-                    position: MinimapPosition.Inline
+                    position: 1
                 };
                 break;
             case MarkerSeverity.Error:
@@ -186,7 +196,7 @@ class MarkerDecorations extends Disposable {
                 zIndex = 30;
                 minimap = {
                     color: themeColorFromId(minimapError),
-                    position: MinimapPosition.Inline
+                    position: 1
                 };
                 break;
         }