@codingame/monaco-vscode-treesitter-service-override 25.1.2 → 26.0.1

package/external/@vscode/tree-sitter-wasm/wasm/tree-sitter-all.wasm.js

@@ -0,0 +1,20 @@
+var treeSitterAssets = {
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-bash.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-bash.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-c-sharp.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-c-sharp.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-cpp.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-cpp.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-css.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-css.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-go.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-go.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-ini.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-ini.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-java.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-java.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-javascript.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-javascript.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-php.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-php.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-powershell.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-powershell.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-python.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-python.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-regex.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-regex.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-ruby.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-ruby.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-rust.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-rust.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-tsx.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-tsx.wasm', import.meta.url).href,
+  '@vscode/tree-sitter-wasm/wasm/tree-sitter-typescript.wasm': new URL('../../../../vscode/src/@vscode/tree-sitter-wasm/wasm/tree-sitter-typescript.wasm', import.meta.url).href
+};
+
+export { treeSitterAssets as default };

package/index.js

@@ -5,11 +5,18 @@ import { ITreeSitterThemeService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { TreeSitterThemeService } from './vscode/src/vs/workbench/services/treeSitter/browser/treeSitterThemeService.js';
 import { ITreeSitterLibraryService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/treeSitter/treeSitterLibraryService.service';
 import { TreeSitterLibraryService } from './vscode/src/vs/workbench/services/treeSitter/browser/treeSitterLibraryService.js';
+import treeSitterAssets from './external/@vscode/tree-sitter-wasm/wasm/tree-sitter-all.wasm.js';
+import treeSitterScmAssets from './vscode/src/vs/editor/common/languages/all_/_.scm.js';
+import { FileAccess, nodeModulesPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 
+FileAccess.registerAppResourceLoader((moduleId) => {
+    if (moduleId.startsWith('vs/editor/common/languages/') && moduleId.endsWith('.scm')) {
+        return treeSitterScmAssets[moduleId] ?? `not-found:///${moduleId}`;
+    }
+});
 registerAssets({
-    'vs/../../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter.wasm': new URL('@vscode/tree-sitter-wasm/wasm/tree-sitter.wasm', import.meta.url).href,
-    'vs/../../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-typescript.wasm': new URL('@vscode/tree-sitter-wasm/wasm/tree-sitter-typescript.wasm', import.meta.url).href,
-    'vs/editor/common/languages/highlights/typescript.scm': new URL('./vscode/src/vs/editor/common/languages/highlights/typescript.scm', import.meta.url).href
+    [`${nodeModulesPath}/@vscode/tree-sitter-wasm/wasm/tree-sitter.wasm`]: new URL('./external/@vscode/tree-sitter-wasm/wasm/tree-sitter.wasm', import.meta.url).href,
+    ...Object.fromEntries(Object.entries(treeSitterAssets).map(([key, value]) => [`${nodeModulesPath}/${key}`, value]))
 });
 function getServiceOverride() {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-treesitter-service-override",
-  "version": "25.1.2",
+  "version": "26.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - treesitter service-override",
   "keywords": [],
@@ -15,8 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.2",
-    "@vscode/tree-sitter-wasm": "0.3.0"
+    "@codingame/monaco-vscode-api": "26.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/editor/common/languages/all_/_.scm.js

@@ -0,0 +1,9 @@
+var treeSitterScmAssets = {
+  'vs/editor/common/languages/highlights/css.scm': new URL('../highlights/css.scm', import.meta.url).href,
+  'vs/editor/common/languages/highlights/ini.scm': new URL('../highlights/ini.scm', import.meta.url).href,
+  'vs/editor/common/languages/highlights/regex.scm': new URL('../highlights/regex.scm', import.meta.url).href,
+  'vs/editor/common/languages/highlights/typescript.scm': new URL('../highlights/typescript.scm', import.meta.url).href,
+  'vs/editor/common/languages/injections/typescript.scm': new URL('../injections/typescript.scm', import.meta.url).href
+};
+
+export { treeSitterScmAssets as default };

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

@@ -0,0 +1,114 @@
+; Order matters! Place lower precedence first.
+
+[
+  "{"
+  "}"
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.css
+
+[
+  "*="
+] @keyword.operator.css
+
+[
+  "+"
+  ">"
+] @keyword.operator.combinator.css
+
+(comment) @comment.block.css
+
+; Selectors
+
+(selectors) @meta.selector.css
+
+(class_selector) @entity.other.attribute-name.class.css
+
+(id_selector) @entity.other.attribute-name.id.css
+
+(tag_name) @entity.name.tag.css
+
+(universal_selector) @entity.name.tag.wildcard.css
+
+(pseudo_class_selector) @entity.other.attribute-name.pseudo-class.css
+
+(pseudo_element_selector
+  "::" @entity.other.attribute-name.pseudo-element.css
+  .
+  (tag_name) @entity.other.attribute-name.pseudo-element.css)
+
+(attribute_name) @entity.other.attribute-name.css
+
+; @ Rules
+
+[
+  ("@import")
+  ("@charset")
+  ("@namespace")
+  ("@media")
+  ("@supports")
+  ("@keyframes")
+  (at_keyword)
+] @keyword.control.at-rule.css
+
+(keyword_query) @support.constant.media.css
+
+(keyframes_name) @variable.parameter.keyframe-list.css
+
+; Functions
+
+(function_name) @support.function.css
+
+; Properties
+
+(property_name) @support.type.property-name.css
+
+; Other values
+
+(plain_value) @support.constant.property-value.css
+
+; Strings
+
+((string_value) @string.quoted.single.css
+  (#match? @string.quoted.single.css "^'.*'$"))
+
+((string_value) @string.quoted.double.css
+  (#match? @string.quoted.double.css "^\".*\"$"))
+
+; Numbers
+
+([
+  (integer_value)
+  (float_value)
+]) @constant.numeric.css
+
+(unit) @keyword.other.unit.css
+
+; Special values
+
+(declaration
+  ((property_name) @support.type.property-name.css
+    (#eq? @support.type.property-name.css "font"))
+  (plain_value) @support.constant.font-name.css)
+
+((color_value) @constant.other.color.rgb-value.hex.css
+  (#match? @constant.other.color.rgb-value.hex.css "^#.*"))
+
+(call_expression
+  (function_name) @meta.function.variable.css (#eq? @meta.function.variable.css "var")
+  (arguments
+    (plain_value) @variable.argument.css))
+
+; Special Functions
+
+(call_expression
+  ((function_name) @support.function.url.css
+    (#eq? @support.function.url.css "url"))
+  (arguments
+    (plain_value) @variable.parameter.url.css))
+
+; Keywords
+
+(important) @keyword.other.important.css

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

@@ -0,0 +1,12 @@
+; Order matters! Place lower precedence first.
+
+(section_name (text) @entity.name.section.group-title)
+
+(setting_name) @keyword.other.definition
+
+(setting ("=") @punctuation.separator.key-value)
+
+(comment) @comment.line.semicolon
+
+((setting_value) @string.quoted.double
+  (#match? @string.quoted.double "^\".*\""))

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

@@ -0,0 +1,126 @@
+; Order matters! Place lower precedence first.
+[
+  "?"
+  "="
+  "!"
+] @keyword.operator.regexp
+
+[
+  "("
+  ")"
+] @punctuation.definition.group.regexp
+
+[
+  ">"
+  "{"
+  "}"
+] @punctuation.regexp
+
+[
+  "["
+  "]"
+] @punctuation.definition.character-class.regexp
+
+(
+  ([
+    "(?<"
+  ] @punctuation.definition.group.assertion.regexp)
+  .
+  [
+    "="
+    "!"
+  ] @punctuation.definition.group.assertion.regexp
+) @meta.assertion.look-behind.regexp
+
+(
+  ([
+    "(?"
+  ] @punctuation.definition.group.assertion.regexp)
+  .
+  [
+    "="
+    "!"
+  ] @punctuation.definition.group.assertion.regexp
+) @meta.assertion.look-ahead.regexp
+
+"(?:" @punctuation.definition.group.regexp @punctuation.definition.group.no-capture.regexp
+
+(lookaround_assertion ("!") @punctuation.definition.group.assertion.regexp)
+
+(named_capturing_group) @punctuation.definition.group.regexp
+
+(group_name) @variable.other.regexp
+
+[
+  (control_letter_escape)
+  (non_boundary_assertion)
+] @string.escape.regexp
+
+[
+  (start_assertion)
+  (end_assertion)
+  (boundary_assertion)
+] @keyword.control.anchor.regexp
+
+(class_character) @constant.character-class.regexp
+
+(identity_escape) @constant.character.escape.regexp
+
+[
+  ((identity_escape) @internal.regexp (#match? @internal.regexp "\\[^ux]"))
+] @constant.character.escape.regexp
+
+(
+  ((identity_escape) @internal.regexp (#eq? @internal.regexp "\\u"))
+  .
+  (pattern_character) @constant.character.numeric.regexp
+  .
+  (pattern_character) @constant.character.numeric.regexp
+  .
+  (pattern_character) @constant.character.numeric.regexp
+  .
+  (pattern_character) @constant.character.numeric.regexp
+) @constant.character.numeric.regexp
+
+(
+  ((identity_escape) @internal.regexp (#eq? @internal.regexp "\\x"))
+  .
+  (pattern_character) @constant.character.numeric.regexp
+  .
+  (pattern_character) @constant.character.numeric.regexp
+) @constant.character.numeric.regexp
+
+(
+  ((identity_escape) @internal.regexp (#eq? @internal.regexp "\\x"))
+  .
+  (class_character) @constant.character.numeric.regexp
+  .
+  (class_character) @constant.character.numeric.regexp
+) @constant.character.numeric.regexp
+
+(control_escape) @constant.other.character-class.regexp
+
+(character_class_escape) @constant.character.escape.regexp
+
+(decimal_escape) @keyword.other.back-reference.regexp
+
+("|") @keyword.operator.or.regexp
+
+[
+  "*"
+  "+"
+] @keyword.operator.quantifier.regexp
+
+(count_quantifier) @keyword.operator.quantifier.regexp
+
+[
+  (lazy)
+] @keyword.operator.quantifier.regexp
+
+(optional ("?") @keyword.operator.quantifier.regexp)
+
+(character_class
+  [
+    "^" @keyword.operator.negation.regexp
+    (class_range "-" @constant.other.character-class.range.regexp)
+  ])

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

@@ -0,0 +1,2 @@
+((regex) @injection.content
+  (#set! injection.language "regex"))

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

@@ -1,4 +1,4 @@
-import type { Parser, Language, Query } from "@vscode/tree-sitter-wasm";
+import type { Parser, Language, Query } from "@codingame/monaco-vscode-api/external/@vscode/tree-sitter-wasm/wasm/tree-sitter";
 import { IReader } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { ITreeSitterLibraryService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/treeSitter/treeSitterLibraryService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";

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

@@ -12,7 +12,7 @@ import { nodeModulesPath, FileAccess } from '@codingame/monaco-vscode-api/vscode
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
 
-const EDITOR_EXPERIMENTAL_PREFER_TREESITTER = 'editor.experimental.preferTreeSitter';
+const EDITOR_EXPERIMENTAL_PREFER_TREESITTER = "editor.experimental.preferTreeSitter";
 const MODULE_LOCATION_SUBPATH = `@vscode/tree-sitter-wasm/wasm`;
 const FILENAME_TREESITTER_WASM = `tree-sitter.wasm`;
 function getModuleLocation(environmentService) {
@@ -26,39 +26,41 @@ let TreeSitterLibraryService = class TreeSitterLibraryService extends Disposable
         this._environmentService = _environmentService;
         this.isTest = false;
         this._treeSitterImport = ( new Lazy(async () => {
-            const TreeSitter = await import('@vscode/tree-sitter-wasm').then(module => ({ Parser: module.default ?? module }));
+            const TreeSitter = await import('@codingame/monaco-vscode-api/external/@vscode/tree-sitter-wasm/wasm/tree-sitter');
             const isTest = this.isTest;
             await TreeSitter.Parser.init({
                 locateFile(_file, _folder) {
                     const location = `${getModuleLocation()}/${FILENAME_TREESITTER_WASM}`;
                     if (isTest) {
                         return ( ( FileAccess.asFileUri(location)).toString(true));
-                    }
-                    else {
+                    } else {
                         return ( ( FileAccess.asBrowserUri(location)).toString(true));
                     }
                 }
             });
             return TreeSitter;
         }));
-        this._supportsLanguage = ( new CachedFunction((languageId) => {
-            return observableConfigValue(`${EDITOR_EXPERIMENTAL_PREFER_TREESITTER}.${languageId}`, false, this._configurationService);
+        this._supportsLanguage = ( new CachedFunction(languageId => {
+            return observableConfigValue(
+                `${EDITOR_EXPERIMENTAL_PREFER_TREESITTER}.${languageId}`,
+                false,
+                this._configurationService
+            );
         }));
-        this._languagesCache = ( new CachedFunction((languageId) => {
+        this._languagesCache = ( new CachedFunction(languageId => {
             return ObservablePromise.fromFn(async () => {
                 const languageLocation = getModuleLocation();
                 const grammarName = `tree-sitter-${languageId}`;
                 const wasmPath = `${languageLocation}/${grammarName}.wasm`;
-                const [treeSitter, languageFile] = await Promise.all([
-                    this._treeSitterImport.value,
-                    this._fileService.readFile(( FileAccess.asFileUri(wasmPath)))
-                ]);
+                const [treeSitter, languageFile] = await Promise.all([this._treeSitterImport.value, this._fileService.readFile(( FileAccess.asFileUri(wasmPath)))]);
                 const Language = treeSitter.Language;
                 const language = await Language.load(languageFile.value.buffer);
                 return language;
             });
         }));
-        this._injectionQueries = ( new CachedFunction({ getCacheKey: JSON.stringify }, (arg) => {
+        this._injectionQueries = ( new CachedFunction({
+            getCacheKey: JSON.stringify
+        }, arg => {
             const loadQuerySource = async () => {
                 const injectionsQueriesLocation = `vs/editor/common/languages/${arg.kind}/${arg.languageId}.scm`;
                 const uri = ( FileAccess.asFileUri(injectionsQueriesLocation));
@@ -75,7 +77,7 @@ let TreeSitterLibraryService = class TreeSitterLibraryService extends Disposable
                 const [querySource, language, treeSitter] = await Promise.all([
                     loadQuerySource(),
                     this._languagesCache.get(arg.languageId).promise,
-                    this._treeSitterImport.value,
+                    this._treeSitterImport.value
                 ]);
                 if (querySource === undefined) {
                     return null;
@@ -106,14 +108,20 @@ let TreeSitterLibraryService = class TreeSitterLibraryService extends Disposable
         if (!this.supportsLanguage(languageId, reader)) {
             return undefined;
         }
-        const query = this._injectionQueries.get({ languageId, kind: 'injections' }).read(reader);
+        const query = this._injectionQueries.get({
+            languageId,
+            kind: "injections"
+        }).read(reader);
         return query;
     }
     getHighlightingQueries(languageId, reader) {
         if (!this.supportsLanguage(languageId, reader)) {
             return undefined;
         }
-        const query = this._injectionQueries.get({ languageId, kind: 'highlights' }).read(reader);
+        const query = this._injectionQueries.get({
+            languageId,
+            kind: "highlights"
+        }).read(reader);
         return query;
     }
     async createQuery(language, querySource) {
@@ -121,17 +129,12 @@ let TreeSitterLibraryService = class TreeSitterLibraryService extends Disposable
         return new treeSitter.Query(language, querySource);
     }
 };
-TreeSitterLibraryService = ( __decorate([
-    ( __param(0, IConfigurationService)),
-    ( __param(1, IFileService)),
-    ( __param(2, IEnvironmentService))
-], TreeSitterLibraryService));
+TreeSitterLibraryService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IEnvironmentService))], TreeSitterLibraryService));
 async function tryReadFile(fileService, uri) {
     try {
         const result = await fileService.readFile(uri);
         return result;
-    }
-    catch (e) {
+    } catch (e) {
         if (toFileOperationResult(e) === FileOperationResult.FILE_NOT_FOUND) {
             return undefined;
         }

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

@@ -9,8 +9,11 @@ import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 let TreeSitterThemeService = class TreeSitterThemeService {
     constructor(_themeService) {
         this._themeService = _themeService;
-        this._colorTheme = observableFromEvent(this._themeService.onDidColorThemeChange, () => this._themeService.getColorTheme());
-        this.onChange = derived(this, (reader) => {
+        this._colorTheme = observableFromEvent(
+            this._themeService.onDidColorThemeChange,
+            () => this._themeService.getColorTheme()
+        );
+        this.onChange = derived(this, reader => {
             this._colorTheme.read(reader);
             reader.reportChange(void 0);
         });
@@ -19,8 +22,6 @@ let TreeSitterThemeService = class TreeSitterThemeService {
         return findMetadata(this._colorTheme.read(reader), captureNames, languageId, bracket);
     }
 };
-TreeSitterThemeService = ( __decorate([
-    ( __param(0, IWorkbenchThemeService))
-], TreeSitterThemeService));
+TreeSitterThemeService = ( __decorate([( __param(0, IWorkbenchThemeService))], TreeSitterThemeService));
 
 export { TreeSitterThemeService };