@codingame/monaco-vscode-api 22.1.9 → 23.0.0

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

@@ -113,35 +113,35 @@ var CompletionItemKinds;
     CompletionItemKinds.toIcon = toIcon;
     function toLabel(kind) {
         switch (kind) {
-            case CompletionItemKind.Method: return localize(791, 'Method');
-            case CompletionItemKind.Function: return localize(792, 'Function');
-            case CompletionItemKind.Constructor: return localize(793, 'Constructor');
-            case CompletionItemKind.Field: return localize(794, 'Field');
-            case CompletionItemKind.Variable: return localize(795, 'Variable');
-            case CompletionItemKind.Class: return localize(796, 'Class');
-            case CompletionItemKind.Struct: return localize(797, 'Struct');
-            case CompletionItemKind.Interface: return localize(798, 'Interface');
-            case CompletionItemKind.Module: return localize(799, 'Module');
-            case CompletionItemKind.Property: return localize(800, 'Property');
-            case CompletionItemKind.Event: return localize(801, 'Event');
-            case CompletionItemKind.Operator: return localize(802, 'Operator');
-            case CompletionItemKind.Unit: return localize(803, 'Unit');
-            case CompletionItemKind.Value: return localize(804, 'Value');
-            case CompletionItemKind.Constant: return localize(805, 'Constant');
-            case CompletionItemKind.Enum: return localize(806, 'Enum');
-            case CompletionItemKind.EnumMember: return localize(807, 'Enum Member');
-            case CompletionItemKind.Keyword: return localize(808, 'Keyword');
-            case CompletionItemKind.Text: return localize(809, 'Text');
-            case CompletionItemKind.Color: return localize(810, 'Color');
-            case CompletionItemKind.File: return localize(811, 'File');
-            case CompletionItemKind.Reference: return localize(812, 'Reference');
-            case CompletionItemKind.Customcolor: return localize(813, 'Custom Color');
-            case CompletionItemKind.Folder: return localize(814, 'Folder');
-            case CompletionItemKind.TypeParameter: return localize(815, 'Type Parameter');
-            case CompletionItemKind.User: return localize(816, 'User');
-            case CompletionItemKind.Issue: return localize(817, 'Issue');
-            case CompletionItemKind.Tool: return localize(818, 'Tool');
-            case CompletionItemKind.Snippet: return localize(819, 'Snippet');
+            case CompletionItemKind.Method: return localize(790, 'Method');
+            case CompletionItemKind.Function: return localize(791, 'Function');
+            case CompletionItemKind.Constructor: return localize(792, 'Constructor');
+            case CompletionItemKind.Field: return localize(793, 'Field');
+            case CompletionItemKind.Variable: return localize(794, 'Variable');
+            case CompletionItemKind.Class: return localize(795, 'Class');
+            case CompletionItemKind.Struct: return localize(796, 'Struct');
+            case CompletionItemKind.Interface: return localize(797, 'Interface');
+            case CompletionItemKind.Module: return localize(798, 'Module');
+            case CompletionItemKind.Property: return localize(799, 'Property');
+            case CompletionItemKind.Event: return localize(800, 'Event');
+            case CompletionItemKind.Operator: return localize(801, 'Operator');
+            case CompletionItemKind.Unit: return localize(802, 'Unit');
+            case CompletionItemKind.Value: return localize(803, 'Value');
+            case CompletionItemKind.Constant: return localize(804, 'Constant');
+            case CompletionItemKind.Enum: return localize(805, 'Enum');
+            case CompletionItemKind.EnumMember: return localize(806, 'Enum Member');
+            case CompletionItemKind.Keyword: return localize(807, 'Keyword');
+            case CompletionItemKind.Text: return localize(808, 'Text');
+            case CompletionItemKind.Color: return localize(809, 'Color');
+            case CompletionItemKind.File: return localize(810, 'File');
+            case CompletionItemKind.Reference: return localize(811, 'Reference');
+            case CompletionItemKind.Customcolor: return localize(812, 'Custom Color');
+            case CompletionItemKind.Folder: return localize(813, 'Folder');
+            case CompletionItemKind.TypeParameter: return localize(814, 'Type Parameter');
+            case CompletionItemKind.User: return localize(815, 'User');
+            case CompletionItemKind.Issue: return localize(816, 'Issue');
+            case CompletionItemKind.Tool: return localize(817, 'Tool');
+            case CompletionItemKind.Snippet: return localize(818, 'Snippet');
             default: return '';
         }
     }
@@ -228,11 +228,11 @@ class SelectedSuggestionInfo {
             && this.isSnippetText === other.isSnippetText;
     }
 }
-var InlineCompletionDisplayLocationKind;
-(function (InlineCompletionDisplayLocationKind) {
-    InlineCompletionDisplayLocationKind[InlineCompletionDisplayLocationKind["Code"] = 1] = "Code";
-    InlineCompletionDisplayLocationKind[InlineCompletionDisplayLocationKind["Label"] = 2] = "Label";
-})(InlineCompletionDisplayLocationKind || (InlineCompletionDisplayLocationKind = {}));
+var InlineCompletionHintStyle;
+(function (InlineCompletionHintStyle) {
+    InlineCompletionHintStyle[InlineCompletionHintStyle["Code"] = 1] = "Code";
+    InlineCompletionHintStyle[InlineCompletionHintStyle["Label"] = 2] = "Label";
+})(InlineCompletionHintStyle || (InlineCompletionHintStyle = {}));
 class ProviderId {
     static fromExtensionId(extensionId) {
         return ( new ProviderId(extensionId, undefined, undefined));
@@ -258,6 +258,16 @@ class ProviderId {
         }
         return result;
     }
+    toStringWithoutVersion() {
+        let result = '';
+        if (this.extensionId) {
+            result += this.extensionId;
+        }
+        if (this.providerId) {
+            result += `:${this.providerId}`;
+        }
+        return result;
+    }
 }
 class VersionedExtensionId {
     static tryCreate(extensionId, version) {
@@ -303,13 +313,13 @@ var DocumentHighlightKind;
     DocumentHighlightKind[DocumentHighlightKind["Write"] = 2] = "Write";
 })(DocumentHighlightKind || (DocumentHighlightKind = {}));
 function isLocationLink(thing) {
-    return thing
+    return !!thing
         && URI.isUri(thing.uri)
         && Range.isIRange(thing.range)
         && (Range.isIRange(thing.originSelectionRange) || Range.isIRange(thing.targetSelectionRange));
 }
 function isLocation(thing) {
-    return thing
+    return !!thing
         && URI.isUri(thing.uri)
         && Range.isIRange(thing.range);
 }
@@ -343,35 +353,35 @@ var SymbolKind;
     SymbolKind[SymbolKind["TypeParameter"] = 25] = "TypeParameter";
 })(SymbolKind || (SymbolKind = {}));
 const symbolKindNames = {
-    [SymbolKind.Array]: ( localize(820, "array")),
-    [SymbolKind.Boolean]: ( localize(821, "boolean")),
-    [SymbolKind.Class]: ( localize(822, "class")),
-    [SymbolKind.Constant]: ( localize(823, "constant")),
-    [SymbolKind.Constructor]: ( localize(824, "constructor")),
-    [SymbolKind.Enum]: ( localize(825, "enumeration")),
-    [SymbolKind.EnumMember]: ( localize(826, "enumeration member")),
-    [SymbolKind.Event]: ( localize(827, "event")),
-    [SymbolKind.Field]: ( localize(828, "field")),
-    [SymbolKind.File]: ( localize(829, "file")),
-    [SymbolKind.Function]: ( localize(830, "function")),
-    [SymbolKind.Interface]: ( localize(831, "interface")),
-    [SymbolKind.Key]: ( localize(832, "key")),
-    [SymbolKind.Method]: ( localize(833, "method")),
-    [SymbolKind.Module]: ( localize(834, "module")),
-    [SymbolKind.Namespace]: ( localize(835, "namespace")),
-    [SymbolKind.Null]: ( localize(836, "null")),
-    [SymbolKind.Number]: ( localize(837, "number")),
-    [SymbolKind.Object]: ( localize(838, "object")),
-    [SymbolKind.Operator]: ( localize(839, "operator")),
-    [SymbolKind.Package]: ( localize(840, "package")),
-    [SymbolKind.Property]: ( localize(841, "property")),
-    [SymbolKind.String]: ( localize(842, "string")),
-    [SymbolKind.Struct]: ( localize(843, "struct")),
-    [SymbolKind.TypeParameter]: ( localize(844, "type parameter")),
-    [SymbolKind.Variable]: ( localize(845, "variable")),
+    [SymbolKind.Array]: ( localize(819, "array")),
+    [SymbolKind.Boolean]: ( localize(820, "boolean")),
+    [SymbolKind.Class]: ( localize(821, "class")),
+    [SymbolKind.Constant]: ( localize(822, "constant")),
+    [SymbolKind.Constructor]: ( localize(823, "constructor")),
+    [SymbolKind.Enum]: ( localize(824, "enumeration")),
+    [SymbolKind.EnumMember]: ( localize(825, "enumeration member")),
+    [SymbolKind.Event]: ( localize(826, "event")),
+    [SymbolKind.Field]: ( localize(827, "field")),
+    [SymbolKind.File]: ( localize(828, "file")),
+    [SymbolKind.Function]: ( localize(829, "function")),
+    [SymbolKind.Interface]: ( localize(830, "interface")),
+    [SymbolKind.Key]: ( localize(831, "key")),
+    [SymbolKind.Method]: ( localize(832, "method")),
+    [SymbolKind.Module]: ( localize(833, "module")),
+    [SymbolKind.Namespace]: ( localize(834, "namespace")),
+    [SymbolKind.Null]: ( localize(835, "null")),
+    [SymbolKind.Number]: ( localize(836, "number")),
+    [SymbolKind.Object]: ( localize(837, "object")),
+    [SymbolKind.Operator]: ( localize(838, "operator")),
+    [SymbolKind.Package]: ( localize(839, "package")),
+    [SymbolKind.Property]: ( localize(840, "property")),
+    [SymbolKind.String]: ( localize(841, "string")),
+    [SymbolKind.Struct]: ( localize(842, "struct")),
+    [SymbolKind.TypeParameter]: ( localize(843, "type parameter")),
+    [SymbolKind.Variable]: ( localize(844, "variable")),
 };
 function getAriaLabelForSymbol(symbolName, kind) {
-    return localize(846, '{0} ({1})', symbolName, symbolKindNames[kind]);
+    return localize(845, '{0} ({1})', symbolName, symbolKindNames[kind]);
 }
 var SymbolTag;
 (function (SymbolTag) {
@@ -560,4 +570,4 @@ var ExternalUriOpenerPriority;
     ExternalUriOpenerPriority[ExternalUriOpenerPriority["Preferred"] = 3] = "Preferred";
 })(ExternalUriOpenerPriority || (ExternalUriOpenerPriority = {}));
 
-export { CodeActionTriggerType, Command, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadState, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemKinds, CompletionItemTag, CompletionTriggerKind, DocumentHighlightKind, DocumentPasteTriggerKind, EncodedTokenizationResult, ExternalUriOpenerPriority, FoldingRangeKind, HoverVerbosityAction, InlayHintKind, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, LazyTokenizationSupport, NewSymbolNameTag, NewSymbolNameTriggerKind, PartialAcceptTriggerKind, ProviderId, SelectedSuggestionInfo, SignatureHelpTriggerKind, SymbolKind, SymbolKinds, SymbolTag, TextEdit, Token, TokenizationRegistry, TokenizationResult, VersionedExtensionId, getAriaLabelForSymbol, isLocation, isLocationLink, symbolKindNames };
+export { CodeActionTriggerType, Command, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadState, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemKinds, CompletionItemTag, CompletionTriggerKind, DocumentHighlightKind, DocumentPasteTriggerKind, EncodedTokenizationResult, ExternalUriOpenerPriority, FoldingRangeKind, HoverVerbosityAction, InlayHintKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionHintStyle, InlineCompletionTriggerKind, LazyTokenizationSupport, NewSymbolNameTag, NewSymbolNameTriggerKind, PartialAcceptTriggerKind, ProviderId, SelectedSuggestionInfo, SignatureHelpTriggerKind, SymbolKind, SymbolKinds, SymbolTag, TextEdit, Token, TokenizationRegistry, TokenizationResult, VersionedExtensionId, getAriaLabelForSymbol, isLocation, isLocationLink, symbolKindNames };

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

@@ -17,5 +17,5 @@ export interface DecorationProvider {
      * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
      */
     getAllDecorations(ownerId?: number, filterOutValidation?: boolean, onlyMinimapDecorations?: boolean): IModelDecoration[];
-    onDidChange: Event<void>;
+    readonly onDidChange: Event<void>;
 }

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

@@ -354,7 +354,7 @@ class EditStack {
         if (isEditStackElement(lastElement) && lastElement.canAppend(this._model)) {
             return lastElement;
         }
-        const newElement = ( new SingleModelEditStackElement(( localize(848, "Typing")), 'undoredo.textBufferEdit', this._model, beforeCursorState));
+        const newElement = ( new SingleModelEditStackElement(( localize(847, "Typing")), 'undoredo.textBufferEdit', this._model, beforeCursorState));
         this._undoRedoService.pushElement(newElement, group);
         return newElement;
     }

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

@@ -31,7 +31,7 @@ interface ITextStream {
     on(event: "data", callback: (data: string) => void): void;
     on(event: "error", callback: (err: Error) => void): void;
     on(event: "end", callback: () => void): void;
-    on(event: string, callback: any): void;
+    on(event: string, callback: (...args: unknown[]) => void): void;
 }
 export declare function createTextBufferFactoryFromStream(stream: ITextStream): Promise<model.ITextBufferFactory>;
 export declare function createTextBufferFactoryFromStream(stream: VSBufferReadableStream): Promise<model.ITextBufferFactory>;
@@ -186,7 +186,7 @@ export declare class TextModel extends Disposable implements model.ITextModel, I
     modifyPosition(rawPosition: IPosition, offset: number): Position;
     getFullModelRange(): Range;
     private findMatchesLineByLine;
-    findMatches(searchString: string, rawSearchScope: any, isRegex: boolean, matchCase: boolean, wordSeparators: string | null, captureMatches: boolean, limitResultCount?: number): model.FindMatch[];
+    findMatches(searchString: string, rawSearchScope: boolean | IRange | IRange[] | null, isRegex: boolean, matchCase: boolean, wordSeparators: string | null, captureMatches: boolean, limitResultCount?: number): model.FindMatch[];
     findNextMatch(searchString: string, rawSearchStart: IPosition, isRegex: boolean, matchCase: boolean, wordSeparators: string, captureMatches: boolean): model.FindMatch | null;
     findPreviousMatch(searchString: string, rawSearchStart: IPosition, isRegex: boolean, matchCase: boolean, wordSeparators: string, captureMatches: boolean): model.FindMatch | null;
     pushStackElement(): void;

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

@@ -34,6 +34,7 @@ import { IInstantiationService } from '../../../platform/instantiation/common/in
 import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.service.js';
 import { SetWithKey } from '../../../base/common/collections.js';
 import { EditSources } from '../textModelEditSource.js';
+import { isDark } from '../../../platform/theme/common/theme.js';
 
 var TextModel_1;
 function createTextBufferFactory(text) {
@@ -832,7 +833,7 @@ let TextModel = class TextModel extends Disposable {
     findMatches(searchString, rawSearchScope, isRegex, matchCase, wordSeparators, captureMatches, limitResultCount = LIMIT_FIND_COUNT) {
         this._assertNotDisposed();
         let searchRanges = null;
-        if (rawSearchScope !== null) {
+        if (rawSearchScope !== null && typeof rawSearchScope !== 'boolean') {
             if (!Array.isArray(rawSearchScope)) {
                 rawSearchScope = [rawSearchScope];
             }
@@ -1743,7 +1744,7 @@ class ModelDecorationOverviewRulerOptions extends DecorationOptions {
     }
     getColor(theme) {
         if (!this._resolvedColor) {
-            if (theme.type !== 'light' && this.darkColor) {
+            if (isDark(theme.type) && this.darkColor) {
                 this._resolvedColor = this._resolveColor(this.darkColor, theme);
             }
             else {
@@ -1781,7 +1782,7 @@ class ModelDecorationMinimapOptions extends DecorationOptions {
     }
     getColor(theme) {
         if (!this._resolvedColor) {
-            if (theme.type !== 'light' && this.darkColor) {
+            if (isDark(theme.type) && this.darkColor) {
                 this._resolvedColor = this._resolveColor(this.darkColor, theme);
             }
             else {

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

@@ -1,6 +1,6 @@
 import { IDisposable } from "../../../../../base/common/lifecycle.js";
 import { ITextModel } from "../../../model.js";
-declare class ListNode implements IDisposable {
+export declare class ListNode implements IDisposable {
     readonly height: number;
     parent?: ListNode;
     private readonly _children;
@@ -25,7 +25,7 @@ export declare enum TokenQuality {
     Accurate = 3
 }
 type Node = ListNode | LeafNode;
-interface LeafNode {
+export interface LeafNode {
     readonly length: number;
     token: number;
     tokenQuality: TokenQuality;

package/vscode/src/vs/editor/common/model/tokens/treeSitter/tokenStore.js

@@ -409,4 +409,4 @@ class TokenStore {
     }
 }
 
-export { TokenQuality, TokenStore };
+export { ListNode, TokenQuality, TokenStore };

package/vscode/src/vs/editor/common/model/tokens/treeSitter/treeSitterSyntaxTokenBackend.js

@@ -35,7 +35,7 @@ let TreeSitterSyntaxTokenBackend = class TreeSitterSyntaxTokenBackend extends Ab
                 return undefined;
             }
             const currentLanguage = this._languageIdObs.read(reader);
-            const treeSitterLang = this._treeSitterLibraryService.getLanguage(currentLanguage, reader);
+            const treeSitterLang = this._treeSitterLibraryService.getLanguage(currentLanguage, false, reader);
             if (!treeSitterLang) {
                 return undefined;
             }

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

@@ -600,7 +600,7 @@ export interface ITextSnapshot {
 /**
  * @internal
  */
-export declare function isITextSnapshot(obj: any): obj is ITextSnapshot;
+export declare function isITextSnapshot(obj: unknown): obj is ITextSnapshot;
 /**
  * A model.
  */
@@ -686,7 +686,7 @@ export declare class ValidAnnotatedEditOperation implements IIdentifiedSingleEdi
  * `lineNumber` is 1 based.
  */
 export interface IReadonlyTextBuffer {
-    onDidChangeContent: Event<void>;
+    readonly onDidChangeContent: Event<void>;
     equals(other: ITextBuffer): boolean;
     mightContainRTL(): boolean;
     mightContainUnusualLineTerminators(): boolean;

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

@@ -105,7 +105,7 @@ var TrackedRangeStickiness;
     TrackedRangeStickiness[TrackedRangeStickiness["GrowsOnlyWhenTypingAfter"] = 3] = "GrowsOnlyWhenTypingAfter";
 })(TrackedRangeStickiness || (TrackedRangeStickiness = {}));
 function isITextSnapshot(obj) {
-    return (obj && typeof obj.read === 'function');
+    return (!!obj && typeof obj.read === 'function');
 }
 function isITextModel(obj) {
     return Boolean(obj && obj.uri);

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

@@ -47,9 +47,9 @@ export interface IWordRange {
  */
 export declare class EditorWorker implements IDisposable, IWorkerTextModelSyncChannelServer, IWebWorkerServerRequestHandler {
     private readonly _foreignModule;
-    _requestHandlerBrand: any;
+    _requestHandlerBrand: void;
     private readonly _workerTextModelSyncServer;
-    constructor(_foreignModule?: any | null);
+    constructor(_foreignModule?: unknown | null);
     dispose(): void;
     $ping(): Promise<string>;
     protected _getModel(uri: string): ICommonModel | undefined;
@@ -80,7 +80,7 @@ export declare class EditorWorker implements IDisposable, IWorkerTextModelSyncCh
         [word: string]: IRange[];
     }>;
     $navigateValueSet(modelUrl: string, range: IRange, up: boolean, wordDef: string, wordDefFlags: string): Promise<IInplaceReplaceSupportResult | null>;
-    $fmr(method: string, args: any[]): Promise<any>;
+    $fmr(method: string, args: unknown[]): Promise<unknown>;
 }
 /**
  * @internal

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

@@ -20,6 +20,7 @@ import '../core/text/positionToOffset.js';
 class EditorWorker {
     constructor(_foreignModule = null) {
         this._foreignModule = _foreignModule;
+        this._requestHandlerBrand = undefined;
         this._workerTextModelSyncServer = ( new WorkerTextModelSyncServer());
     }
     dispose() {

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

@@ -2,6 +2,6 @@ import { IWebWorkerServer, IWebWorkerClient } from "../../../base/common/worker/
 export declare abstract class EditorWorkerHost {
     static CHANNEL_NAME: string;
     static getChannel(workerServer: IWebWorkerServer): EditorWorkerHost;
-    static setChannel(workerClient: IWebWorkerClient<any>, obj: EditorWorkerHost): void;
-    abstract $fhr(method: string, args: any[]): Promise<any>;
+    static setChannel(workerClient: IWebWorkerClient<unknown>, obj: EditorWorkerHost): void;
+    abstract $fhr(method: string, args: unknown[]): Promise<unknown>;
 }

package/vscode/src/vs/editor/common/services/markerDecorations.service.d.ts

@@ -7,7 +7,7 @@ import { ITextModel, IModelDecoration } from "../model.js";
 export declare const IMarkerDecorationsService: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IMarkerDecorationsService>;
 export interface IMarkerDecorationsService {
     readonly _serviceBrand: undefined;
-    onDidChangeMarker: Event<ITextModel>;
+    readonly onDidChangeMarker: Event<ITextModel>;
     getMarker(uri: URI, decoration: IModelDecoration): IMarker | null;
     getLiveMarkers(uri: URI): [
         Range,

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

@@ -1,15 +1,15 @@
 import { Event } from "../../../base/common/event.js";
 import { Disposable } from "../../../base/common/lifecycle.js";
 import { URI } from "../../../base/common/uri.js";
+import { IConfigurationService } from "../../../platform/configuration/common/configuration.service.js";
+import { IInstantiationService } from "../../../platform/instantiation/common/instantiation.js";
+import { IUndoRedoService } from "../../../platform/undoRedo/common/undoRedo.service.js";
 import { ISingleEditOperation } from "../core/editOperation.js";
-import { ITextBuffer, ITextBufferFactory, ITextModel, ITextModelCreationOptions } from "../model.js";
 import { ILanguageSelection } from "../languages/language.js";
+import { ITextBuffer, ITextBufferFactory, ITextModel, ITextModelCreationOptions } from "../model.js";
+import { TextModelEditSource } from "../textModelEditSource.js";
 import { IModelService } from "./model.service.js";
 import { ITextResourcePropertiesService } from "./textResourceConfiguration.service.js";
-import { IConfigurationService } from "../../../platform/configuration/common/configuration.service.js";
-import { IUndoRedoService } from "../../../platform/undoRedo/common/undoRedo.service.js";
-import { IInstantiationService } from "../../../platform/instantiation/common/instantiation.js";
-import { TextModelEditSource } from "../textModelEditSource.js";
 export declare class ModelService extends Disposable implements IModelService {
     private readonly _configurationService;
     private readonly _resourcePropertiesService;

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

@@ -1,23 +1,24 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from '../../../base/common/event.js';
+import { StringSHA1 } from '../../../base/common/hash.js';
 import { DisposableStore, Disposable } from '../../../base/common/lifecycle.js';
+import { Schemas } from '../../../base/common/network.js';
+import { equals } from '../../../base/common/objects.js';
 import { isLinux, isMacintosh, OS, OperatingSystem } from '../../../base/common/platform.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.service.js';
+import { clampedInt } from '../config/editorOptions.js';
 import { EditOperation } from '../core/editOperation.js';
-import { Range } from '../core/range.js';
-import { DefaultEndOfLine, EndOfLineSequence, EndOfLinePreference } from '../model.js';
-import { TextModel, createTextBuffer } from '../model/textModel.js';
 import { EDITOR_MODEL_DEFAULTS } from '../core/misc/textModelDefaults.js';
+import { Range } from '../core/range.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
-import { ITextResourcePropertiesService } from './textResourceConfiguration.service.js';
-import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
-import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.service.js';
-import { StringSHA1 } from '../../../base/common/hash.js';
+import { DefaultEndOfLine, EndOfLineSequence, EndOfLinePreference } from '../model.js';
 import { isEditStackElement } from '../model/editStack.js';
-import { Schemas } from '../../../base/common/network.js';
-import { equals } from '../../../base/common/objects.js';
-import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { TextModel, createTextBuffer } from '../model/textModel.js';
 import { EditSources } from '../textModelEditSource.js';
+import { ITextResourcePropertiesService } from './textResourceConfiguration.service.js';
 
 var ModelService_1;
 function MODEL_ID(resource) {
@@ -73,20 +74,11 @@ let ModelService = class ModelService extends Disposable {
     static _readModelOptions(config, isForSimpleWidget) {
         let tabSize = EDITOR_MODEL_DEFAULTS.tabSize;
         if (config.editor && typeof config.editor.tabSize !== 'undefined') {
-            const parsedTabSize = parseInt(config.editor.tabSize, 10);
-            if (!isNaN(parsedTabSize)) {
-                tabSize = parsedTabSize;
-            }
-            if (tabSize < 1) {
-                tabSize = 1;
-            }
+            tabSize = clampedInt(config.editor.tabSize, EDITOR_MODEL_DEFAULTS.tabSize, 1, 100);
         }
         let indentSize = 'tabSize';
         if (config.editor && typeof config.editor.indentSize !== 'undefined' && config.editor.indentSize !== 'tabSize') {
-            const parsedIndentSize = parseInt(config.editor.indentSize, 10);
-            if (!isNaN(parsedIndentSize)) {
-                indentSize = Math.max(parsedIndentSize, 1);
-            }
+            indentSize = clampedInt(config.editor.indentSize, 'tabSize', 1, 100);
         }
         let insertSpaces = EDITOR_MODEL_DEFAULTS.insertSpaces;
         if (config.editor && typeof config.editor.insertSpaces !== 'undefined') {
@@ -114,9 +106,10 @@ let ModelService = class ModelService extends Disposable {
         }
         let bracketPairColorizationOptions = EDITOR_MODEL_DEFAULTS.bracketPairColorizationOptions;
         if (config.editor?.bracketPairColorization && typeof config.editor.bracketPairColorization === 'object') {
+            const bpConfig = config.editor.bracketPairColorization;
             bracketPairColorizationOptions = {
-                enabled: !!config.editor.bracketPairColorization.enabled,
-                independentColorPoolPerBracketType: !!config.editor.bracketPairColorization.independentColorPoolPerBracketType
+                enabled: !!bpConfig.enabled,
+                independentColorPoolPerBracketType: !!bpConfig.independentColorPoolPerBracketType
             };
         }
         return {

package/vscode/src/vs/editor/common/services/textModelSync/textModelSync.impl.d.ts

@@ -16,7 +16,7 @@ import { IRawModelData, IWorkerTextModelSyncChannelServer } from "./textModelSyn
 export declare const STOP_SYNC_MODEL_DELTA_TIME_MS: number;
 export declare const WORKER_TEXT_MODEL_SYNC_CHANNEL = "workerTextModelSync";
 export declare class WorkerTextModelSyncClient extends Disposable {
-    static create(workerClient: IWebWorkerClient<any>, modelService: IModelService): WorkerTextModelSyncClient;
+    static create(workerClient: IWebWorkerClient<unknown>, modelService: IModelService): WorkerTextModelSyncClient;
     private readonly _proxy;
     private readonly _modelService;
     private _syncedModels;

package/vscode/src/vs/editor/common/services/textResourceConfiguration.service.d.ts

@@ -9,7 +9,7 @@ export interface ITextResourceConfigurationService {
     /**
     * Event that fires when the configuration changes.
     */
-    onDidChangeConfiguration: Event<ITextResourceConfigurationChangeEvent>;
+    readonly onDidChangeConfiguration: Event<ITextResourceConfigurationChangeEvent>;
     /**
     * Fetches the value of the section for the given resource by applying language overrides.
     * Value can be of native type or an object keyed off the section name.

package/vscode/src/vs/editor/common/services/treeSitter/treeSitterLibraryService.service.d.ts

@@ -3,19 +3,50 @@ import { IReader } from "../../../../base/common/observable.js";
 export declare const ITreeSitterLibraryService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITreeSitterLibraryService>;
 export interface ITreeSitterLibraryService {
     readonly _serviceBrand: undefined;
+    /**
+    * Gets the tree sitter Parser constructor.
+    */
     getParserClass(): Promise<typeof Parser>;
+    /**
+    * Checks whether a language is supported and available based setting enablement.
+    * @param languageId The language identifier to check.
+    * @param reader Optional observable reader.
+    */
     supportsLanguage(languageId: string, reader: IReader | undefined): boolean;
-    getLanguage(languageId: string, reader: IReader | undefined): Language | undefined;
     /**
-    * Return value of null indicates that there are no injection queries for this language.
-    * @param languageId
-    * @param reader
+    * Gets the tree sitter Language object synchronously.
+    * @param languageId The language identifier to retrieve.
+    * @param ignoreSupportsCheck Whether to ignore the supportsLanguage check.
+    * @param reader Optional observable reader.
+    */
+    getLanguage(languageId: string, ignoreSupportsCheck: boolean, reader: IReader | undefined): Language | undefined;
+    /**
+    * Gets the language as a promise, as opposed to via observables. This ignores the automatic
+    * supportsLanguage check.
+    *
+    * Warning: This approach is generally not recommended as it's not reactive, but it's the only
+    * way to catch and handle import errors when the grammar fails to load.
+    * @param languageId The language identifier to retrieve.
+    */
+    getLanguagePromise(languageId: string): Promise<Language | undefined>;
+    /**
+    * Gets the injection queries for a language. A return value of `null`
+    * indicates that there are no highlights queries for this language.
+    * @param languageId The language identifier to retrieve queries for.
+    * @param reader Optional observable reader.
     */
     getInjectionQueries(languageId: string, reader: IReader | undefined): Query | null | undefined;
     /**
-    * Return value of null indicates that there are no highlights queries for this language.
-    * @param languageId
-    * @param reader
+    * Gets the highlighting queries for a language. A return value of `null`
+    * indicates that there are no highlights queries for this language.
+    * @param languageId The language identifier to retrieve queries for.
+    * @param reader Optional observable reader.
     */
     getHighlightingQueries(languageId: string, reader: IReader | undefined): Query | null | undefined;
+    /**
+    * Creates a one-off custom query for a language.
+    * @param language The Language to create the query for.
+    * @param querySource The query source string to compile.
+    */
+    createQuery(language: Language, querySource: string): Promise<Query>;
 }

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

@@ -410,15 +410,15 @@ export declare enum InlayHintKind {
     Type = 1,
     Parameter = 2
 }
-export declare enum InlineCompletionDisplayLocationKind {
-    Code = 1,
-    Label = 2
-}
 export declare enum InlineCompletionEndOfLifeReasonKind {
     Accepted = 0,
     Rejected = 1,
     Ignored = 2
 }
+export declare enum InlineCompletionHintStyle {
+    Code = 1,
+    Label = 2
+}
 /**
  * How an {@link InlineCompletionsProvider inline completion provider} was triggered.
  */

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

@@ -311,17 +311,17 @@ var InlayHintKind;
     InlayHintKind[InlayHintKind["Type"] = 1] = "Type";
     InlayHintKind[InlayHintKind["Parameter"] = 2] = "Parameter";
 })(InlayHintKind || (InlayHintKind = {}));
-var InlineCompletionDisplayLocationKind;
-(function (InlineCompletionDisplayLocationKind) {
-    InlineCompletionDisplayLocationKind[InlineCompletionDisplayLocationKind["Code"] = 1] = "Code";
-    InlineCompletionDisplayLocationKind[InlineCompletionDisplayLocationKind["Label"] = 2] = "Label";
-})(InlineCompletionDisplayLocationKind || (InlineCompletionDisplayLocationKind = {}));
 var InlineCompletionEndOfLifeReasonKind;
 (function (InlineCompletionEndOfLifeReasonKind) {
     InlineCompletionEndOfLifeReasonKind[InlineCompletionEndOfLifeReasonKind["Accepted"] = 0] = "Accepted";
     InlineCompletionEndOfLifeReasonKind[InlineCompletionEndOfLifeReasonKind["Rejected"] = 1] = "Rejected";
     InlineCompletionEndOfLifeReasonKind[InlineCompletionEndOfLifeReasonKind["Ignored"] = 2] = "Ignored";
 })(InlineCompletionEndOfLifeReasonKind || (InlineCompletionEndOfLifeReasonKind = {}));
+var InlineCompletionHintStyle;
+(function (InlineCompletionHintStyle) {
+    InlineCompletionHintStyle[InlineCompletionHintStyle["Code"] = 1] = "Code";
+    InlineCompletionHintStyle[InlineCompletionHintStyle["Label"] = 2] = "Label";
+})(InlineCompletionHintStyle || (InlineCompletionHintStyle = {}));
 var InlineCompletionTriggerKind;
 (function (InlineCompletionTriggerKind) {
     InlineCompletionTriggerKind[InlineCompletionTriggerKind["Automatic"] = 0] = "Automatic";
@@ -652,4 +652,4 @@ var WrappingIndent;
     WrappingIndent[WrappingIndent["DeepIndent"] = 3] = "DeepIndent";
 })(WrappingIndent || (WrappingIndent = {}));
 
-export { AccessibilitySupport, CodeActionTriggerType, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, ContentWidgetPositionPreference, CursorChangeReason, DefaultEndOfLine, DocumentHighlightKind, EditorAutoIndentStrategy, EditorOption, EndOfLinePreference, EndOfLineSequence, GlyphMarginLane, HoverVerbosityAction, IndentAction, InjectedTextCursorStops, InlayHintKind, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, KeyCode, MarkerSeverity, MarkerTag, MinimapPosition, MinimapSectionHeaderStyle, MouseTargetType, NewSymbolNameTag, NewSymbolNameTriggerKind, OverlayWidgetPositionPreference, OverviewRulerLane, PartialAcceptTriggerKind, PositionAffinity, RenderLineNumbersType, RenderMinimap, ScrollType, ScrollbarVisibility, SelectionDirection, ShowLightbulbIconMode, SignatureHelpTriggerKind, SymbolKind, SymbolTag, TextDirection, TextEditorCursorBlinkingStyle, TextEditorCursorStyle, TrackedRangeStickiness, WrappingIndent };
+export { AccessibilitySupport, CodeActionTriggerType, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, ContentWidgetPositionPreference, CursorChangeReason, DefaultEndOfLine, DocumentHighlightKind, EditorAutoIndentStrategy, EditorOption, EndOfLinePreference, EndOfLineSequence, GlyphMarginLane, HoverVerbosityAction, IndentAction, InjectedTextCursorStops, InlayHintKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionHintStyle, InlineCompletionTriggerKind, KeyCode, MarkerSeverity, MarkerTag, MinimapPosition, MinimapSectionHeaderStyle, MouseTargetType, NewSymbolNameTag, NewSymbolNameTriggerKind, OverlayWidgetPositionPreference, OverviewRulerLane, PartialAcceptTriggerKind, PositionAffinity, RenderLineNumbersType, RenderMinimap, ScrollType, ScrollbarVisibility, SelectionDirection, ShowLightbulbIconMode, SignatureHelpTriggerKind, SymbolKind, SymbolTag, TextDirection, TextEditorCursorBlinkingStyle, TextEditorCursorStyle, TrackedRangeStickiness, WrappingIndent };