@codingame/monaco-vscode-treesitter-service-override 16.1.1 → 17.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-treesitter-service-override",
-  "version": "16.1.1",
+  "version": "17.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - treesitter service-override",
   "keywords": [],
@@ -15,10 +15,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "16.1.1",
-    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "16.1.1",
-    "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common": "16.1.1",
-    "@codingame/monaco-vscode-api": "16.1.1",
+    "@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common": "17.1.0",
+    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "17.1.0",
+    "@codingame/monaco-vscode-api": "17.1.0",
     "@vscode/tree-sitter-wasm": "0.1.4"
   },
   "main": "index.js",

package/vscode/src/vs/editor/common/languages/highlights/typescript.scm

@@ -28,6 +28,8 @@
   (template_literal_type)
 ] @string.template.ts)
 
+(template_substitution) @meta.template.expression.ts
+
 (string .
   ([
     "\""
@@ -130,6 +132,9 @@
 (arrow_function
   parameter: (identifier) @variable.parameter.ts)
 
+(type_predicate
+  name: (identifier) @variable.parameter.ts)
+
 ; Function and method calls
 
 (call_expression
@@ -238,6 +243,7 @@
 
 (unary_expression ([
   "-"
+  "+"
 ]) @keyword.operator.arithmetic.ts)
 
 [

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

@@ -25,7 +25,7 @@ export declare class TextModelTreeSitter extends Disposable implements ITextMode
     readonly onDidChangeParseResult: Event<ModelTreeUpdateEvent>;
     private _rootTreeSitterTree;
     private _query;
-    private _injectionTreeSitterTrees;
+    private readonly _injectionTreeSitterTrees;
     private _versionId;
     get parseResult(): ITreeSitterParseResult | undefined;
     constructor(textModel: ITextModel, _treeSitterLanguages: TreeSitterLanguages, parseImmediately: boolean | undefined, _treeSitterImporter: ITreeSitterImporter, _logService: ILogService, _telemetryService: ITelemetryService, _fileService: IFileService);

package/vscode/src/vs/editor/common/services/treeSitter/textModelTreeSitter.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { ITreeSitterImporter } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/treeSitterParserService.service';
-import { Disposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { setTimeout0 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
@@ -32,7 +32,7 @@ let TextModelTreeSitter = class TextModelTreeSitter extends Disposable {
         this._fileService = _fileService;
         this._onDidChangeParseResult = this._register(( new Emitter()));
         this.onDidChangeParseResult = this._onDidChangeParseResult.event;
-        this._injectionTreeSitterTrees = ( new Map());
+        this._injectionTreeSitterTrees = this._register(( new DisposableMap()));
         this._versionId = 0;
         this._parseSessionDisposables = this._register(( new DisposableStore()));
         if (parseImmediately) {
@@ -220,6 +220,11 @@ let TextModelTreeSitter = class TextModelTreeSitter extends Disposable {
         };
     }
     async _processInjections(injections, parentTree, parentLanguage, modelChanges) {
+        if (injections.size === 0) {
+            this._injectionTreeSitterTrees.clearAndDisposeAll();
+            return;
+        }
+        const unseenInjections = ( new Set(( this._injectionTreeSitterTrees.keys())));
         for (const [languageId, ranges] of injections) {
             const language = await this._treeSitterLanguages.getLanguage(languageId);
             if (!language) {
@@ -227,9 +232,13 @@ let TextModelTreeSitter = class TextModelTreeSitter extends Disposable {
             }
             const treeSitterTree = await this._getOrCreateInjectedTree(languageId, language, parentTree, parentLanguage);
             if (treeSitterTree) {
+                unseenInjections.delete(languageId);
                 this._onDidChangeContent(treeSitterTree, modelChanges, ranges);
             }
         }
+        for (const unseenInjection of unseenInjections) {
+            this._injectionTreeSitterTrees.deleteAndDispose(unseenInjection);
+        }
     }
     async _getOrCreateInjectedTree(languageId, language, parentTree, parentLanguage) {
         let treeSitterTree = this._injectionTreeSitterTrees.get(languageId);

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

@@ -5,6 +5,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { Emitter, Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare const MODULE_LOCATION_SUBPATH = "@vscode/tree-sitter-wasm/wasm";
 export declare function getModuleLocation(environmentService: IEnvironmentService): AppResourcePath;
 export declare class TreeSitterLanguages extends Disposable {
@@ -21,7 +22,7 @@ export declare class TreeSitterLanguages extends Disposable {
         id: string;
         language: Parser.Language;
     }>;
-    constructor(_treeSitterImporter: ITreeSitterImporter, _fileService: IFileService, _environmentService: IEnvironmentService, _registeredLanguages: Map<string, string>);
+    constructor(_treeSitterImporter: ITreeSitterImporter, _fileService: IFileService, _environmentService: IEnvironmentService, configurationService: IConfigurationService, _registeredLanguages: Map<string, string>);
     getOrInitLanguage(languageId: string): Parser.Language | undefined;
     getLanguage(languageId: string): Promise<Parser.Language | undefined>;
     private _addLanguage;

package/vscode/src/vs/editor/common/services/treeSitter/treeSitterLanguages.js

@@ -1,16 +1,17 @@
 
 import { nodeModulesPath, FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { EDITOR_EXPERIMENTAL_PREFER_TREESITTER } from '../treeSitterParserService.js';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { PromiseResult } from '@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/base/common/observableInternal/promise';
+import { PromiseResult } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/promise';
 
 const MODULE_LOCATION_SUBPATH = `@vscode/tree-sitter-wasm/wasm`;
 function getModuleLocation(environmentService) {
     return `${nodeModulesPath}/${MODULE_LOCATION_SUBPATH}`;
 }
 class TreeSitterLanguages extends Disposable {
-    constructor(_treeSitterImporter, _fileService, _environmentService, _registeredLanguages) {
+    constructor(_treeSitterImporter, _fileService, _environmentService, configurationService, _registeredLanguages) {
         super();
         this._treeSitterImporter = _treeSitterImporter;
         this._fileService = _fileService;
@@ -19,6 +20,17 @@ class TreeSitterLanguages extends Disposable {
         this._languages = ( new AsyncCache());
         this._onDidAddLanguage = this._register(( new Emitter()));
         this.onDidAddLanguage = this._onDidAddLanguage.event;
+        this._register(configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(EDITOR_EXPERIMENTAL_PREFER_TREESITTER)) {
+                for (const language of ( this._languages.keys())) {
+                    if (e.affectsConfiguration(`${EDITOR_EXPERIMENTAL_PREFER_TREESITTER}.${language}`)) {
+                        if (this._languages.getSyncIfCached(language) === undefined) {
+                            this._languages.delete(language);
+                        }
+                    }
+                }
+            }
+        }));
     }
     getOrInitLanguage(languageId) {
         if (this._languages.isCached(languageId)) {
@@ -84,6 +96,12 @@ class AsyncCache {
     isCached(key) {
         return this._values.get(key)?.result !== undefined;
     }
+    delete(key) {
+        return this._values.delete(key);
+    }
+    keys() {
+        return ( this._values.keys());
+    }
 }
 class PromiseWithSyncAccess {
     get result() {

package/vscode/src/vs/editor/common/services/treeSitter/treeSitterParserService.js

@@ -33,6 +33,7 @@ let TreeSitterTextModelService = class TreeSitterTextModelService extends Dispos
             this._treeSitterImporter,
             fileService,
             this._environmentService,
+            this._configurationService,
             this._registeredLanguages
         )));
         this.onDidAddLanguage = this._treeSitterLanguages.onDidAddLanguage;

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

@@ -14,7 +14,7 @@ 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 { IWorkbenchThemeService } from "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service";
+import { IWorkbenchThemeService } from "@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-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>;

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

@@ -19,7 +19,7 @@ import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core
 import { setTimeout0 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { findLikelyRelevantLines } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelTokens';
 import { TreeSitterCodeEditors } from './treeSitterCodeEditors.js';
-import { IWorkbenchThemeService } from '@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
+import { IWorkbenchThemeService } from '@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 
 const TREESITTER_BASE_SCOPES = {
@@ -648,7 +648,7 @@ let TreeSitterTokenizationSupport = class TreeSitterTokenizationSupport extends
         }
         for (let i = 0; i < endOffsetsAndScopes.length; i++) {
             const token = endOffsetsAndScopes[i];
-            if (token.endOffset === 0 && token.scopes.length === 0 && i !== 0) {
+            if (token.endOffset === 0 && i !== 0) {
                 endOffsetsAndScopes.splice(i, endOffsetsAndScopes.length - i);
                 break;
             }