@codingame/monaco-vscode-treesitter-service-override 15.0.2 → 16.0.0

package/vscode/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.js

@@ -3,7 +3,6 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
-import { PLAINTEXT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/modesRegistry';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { ITreeSitterParserService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/treeSitterParserService.service';
 
@@ -13,15 +12,20 @@ let TreeSitterCodeEditors = class TreeSitterCodeEditors extends Disposable {
         this._languageId = _languageId;
         this._codeEditorService = _codeEditorService;
         this._treeSitterParserService = _treeSitterParserService;
-        this._editors = this._register(( new DisposableMap()));
+        this._textModels = ( new Set());
+        this._languageEditors = this._register(( new DisposableMap()));
+        this._allEditors = this._register(( new DisposableMap()));
         this._onDidChangeViewport = this._register(( new Emitter()));
         this.onDidChangeViewport = this._onDidChangeViewport.event;
         this._register(this._codeEditorService.onCodeEditorAdd(this._onCodeEditorAdd, this));
         this._register(this._codeEditorService.onCodeEditorRemove(this._onCodeEditorRemove, this));
         this._codeEditorService.listCodeEditors().forEach(this._onCodeEditorAdd, this);
     }
-    get editors() {
-        return Array.from(( this._editors.keys()));
+    get textModels() {
+        return Array.from(( this._textModels.keys()));
+    }
+    getEditorForModel(model) {
+        return this._codeEditorService.listCodeEditors().find(editor => editor.getModel() === model);
     }
     async getInitialViewPorts() {
         await this._treeSitterParserService.getLanguage(this._languageId);
@@ -29,7 +33,7 @@ let TreeSitterCodeEditors = class TreeSitterCodeEditors extends Disposable {
         const viewports = [];
         for (const editor of editors) {
             const model = await this.getEditorModel(editor);
-            if (model) {
+            if (model && model.getLanguageId() === this._languageId) {
                 viewports.push({
                     model,
                     ranges: this._nonIntersectingViewPortRanges(editor)
@@ -39,7 +43,7 @@ let TreeSitterCodeEditors = class TreeSitterCodeEditors extends Disposable {
         return viewports;
     }
     _onCodeEditorRemove(editor) {
-        this._editors.deleteAndDispose(editor);
+        this._allEditors.deleteAndDispose(editor);
     }
     async getEditorModel(editor) {
         let model = editor.getModel() ?? undefined;
@@ -48,30 +52,47 @@ let TreeSitterCodeEditors = class TreeSitterCodeEditors extends Disposable {
             await Event.toPromise(Event.once(editor.onDidChangeModel), disposableStore);
             model = editor.getModel() ?? undefined;
         }
-        if (!model) {
-            return;
-        }
-        let language = model.getLanguageId();
-        if (language === PLAINTEXT_LANGUAGE_ID) {
-            const disposableStore = this._register(( new DisposableStore()));
-            await Event.toPromise(Event.once(model.onDidChangeLanguage), disposableStore);
-            language = model.getLanguageId();
-        }
-        if (language !== this._languageId) {
-            return;
-        }
         return model;
     }
     async _onCodeEditorAdd(editor) {
-        const model = await this.getEditorModel(editor);
+        const otherEditorDisposables = ( new DisposableStore());
+        otherEditorDisposables.add(editor.onDidChangeModel(() => this._onDidChangeModel(editor, editor.getModel()), this));
+        this._allEditors.set(editor, otherEditorDisposables);
+        const model = editor.getModel();
         if (model) {
-            this._editors.set(editor, editor.onDidScrollChange(() => this._onViewportChange(editor), this));
-            this._onViewportChange(editor);
+            this._tryAddEditor(editor, model);
+        }
+    }
+    _tryAddEditor(editor, model) {
+        const language = model.getLanguageId();
+        if ((language === this._languageId)) {
+            if (!( this._textModels.has(model))) {
+                this._textModels.add(model);
+            }
+            if (!( this._languageEditors.has(editor))) {
+                const langaugeEditorDisposables = ( new DisposableStore());
+                langaugeEditorDisposables.add(editor.onDidScrollChange(() => this._onViewportChange(editor), this));
+                this._languageEditors.set(editor, langaugeEditorDisposables);
+                this._onViewportChange(editor);
+            }
+        }
+    }
+    async _onDidChangeModel(editor, model) {
+        if (model) {
+            this._tryAddEditor(editor, model);
+        }
+        else {
+            this._languageEditors.deleteAndDispose(editor);
         }
     }
     async _onViewportChange(editor) {
         const ranges = this._nonIntersectingViewPortRanges(editor);
-        this._onDidChangeViewport.fire({ model: editor.getModel(), ranges });
+        const model = editor.getModel();
+        if (!model) {
+            this._languageEditors.deleteAndDispose(editor);
+            return;
+        }
+        this._onDidChangeViewport.fire({ model: model, ranges });
     }
     _nonIntersectingViewPortRanges(editor) {
         const viewportRanges = editor.getVisibleRangesPlusViewportAboveBelow();

package/vscode/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.d.ts

@@ -3,7 +3,7 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ILanguageIdCodec, ITreeSitterTokenizationSupport, QueryCapture } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { ITreeSitterParseResult } from "../../../../editor/common/services/treeSitterParserService.js";
+import { ITextModelTreeSitter } from "../../../../editor/common/services/treeSitterParserService.js";
 import { ITreeSitterImporter } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/treeSitterParserService.service";
 import { ITreeSitterParserService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/treeSitterParserService.service";
 import { IModelTokensChangedEvent } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEvents";
@@ -14,10 +14,10 @@ import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/
 import { ITreeSitterTokenizationStoreService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model/treeSitterTokenStoreService.service";
 import { TokenUpdate } from "../../../../editor/common/model/tokenStore.js";
 import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
-import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
 import { IWorkbenchThemeService } from "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service";
 import { ITreeSitterTokenizationFeature } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.service";
 type TreeSitterQueries = string;
+export declare const TREESITTER_BASE_SCOPES: Record<string, string>;
 export declare class TreeSitterTokenizationFeature extends Disposable implements ITreeSitterTokenizationFeature {
     private readonly _treeSitterImporter;
     private readonly _languageService;
@@ -40,7 +40,6 @@ export declare class TreeSitterTokenizationSupport extends Disposable implements
     private readonly _treeSitterService;
     private readonly _themeService;
     private readonly _tokenizationStoreService;
-    private readonly _codeEditorService;
     private readonly _instantiationService;
     private _query;
     private readonly _onDidChangeTokens;
@@ -48,45 +47,46 @@ export declare class TreeSitterTokenizationSupport extends Disposable implements
         textModel: ITextModel;
         changes: IModelTokensChangedEvent;
     }>;
-    private readonly _onDidCompleteFirstTokenization;
-    readonly onDidCompleteFirstTokenization: Event<{
+    private readonly _onDidCompleteBackgroundTokenization;
+    readonly onDidChangeBackgroundTokenization: Event<{
         textModel: ITextModel;
     }>;
     private _colorThemeData;
     private _languageAddedListener;
     private _codeEditors;
-    constructor(_queries: TreeSitterQueries, Query: typeof Parser.Query, _languageId: string, _languageIdCodec: ILanguageIdCodec, _treeSitterService: ITreeSitterParserService, _themeService: IWorkbenchThemeService, _tokenizationStoreService: ITreeSitterTokenizationStoreService, _codeEditorService: ICodeEditorService, _instantiationService: IInstantiationService);
+    private _encodedLanguage;
+    constructor(_queries: TreeSitterQueries, Query: typeof Parser.Query, _languageId: string, _languageIdCodec: ILanguageIdCodec, _treeSitterService: ITreeSitterParserService, _themeService: IWorkbenchThemeService, _tokenizationStoreService: ITreeSitterTokenizationStoreService, _instantiationService: IInstantiationService);
+    private get _encodedLanguageId();
     private _setInitialTokens;
-    private _parseAndTokenizeViewPortRange;
+    private _forceParseAndTokenizeContent;
     private _parseAndTokenizeViewPort;
+    guessTokensForLinesContent(lineNumber: number, textModel: ITextModel, lines: string[]): Uint32Array[] | undefined;
     private _emptyTokensForOffsetAndLength;
     private _createEmptyTokens;
     private _firstTreeUpdate;
-    private _codeEditorForModel;
     private _setViewPortTokens;
     private _handleTreeUpdate;
     private _updateTreeForRanges;
     private _refreshNeedsRefresh;
     private _rangeTokensAsUpdates;
-    getTokensInRange(textModel: ITextModel, range: Range, rangeStartOffset: number, rangeEndOffset: number, captures?: {
-        tree: ITreeSitterParseResult | undefined;
-        captures: QueryCapture[];
-    }): TokenUpdate[] | undefined;
+    getTokensInRange(textModel: ITextModel, range: Range, rangeStartOffset: number, rangeEndOffset: number, tree?: Parser.Tree, captures?: QueryCapture[]): TokenUpdate[] | undefined;
     private _getTree;
     private _ensureQuery;
     private _updateTheme;
     captureAtPosition(lineNumber: number, column: number, textModel: ITextModel): QueryCapture[];
-    captureAtPositionTree(lineNumber: number, column: number, tree: Parser.Tree): QueryCapture[];
+    captureAtRangeTree(range: Range, tree: Parser.Tree, textModelTreeSitter: ITextModelTreeSitter | undefined): QueryCapture[];
     private _captureAtRange;
+    private _captureAtRangeWithInjections;
     tokenizeEncoded(lineNumber: number, textModel: ITextModel): undefined;
     tokenizeEncodedInstrumented(lineNumber: number, textModel: ITextModel): {
         result: Uint32Array;
         captureTime: number;
         metadataTime: number;
     } | undefined;
-    private _getTreeAndCaptures;
+    private _getCaptures;
     private _tokenize;
     private _createTokensFromCaptures;
+    private _getInjectionCaptures;
     private _tokenizeCapturesWithMetadata;
     private _emptyToken;
     private _tokenizeEncoded;