@codingame/monaco-vscode-treesitter-service-override 10.1.4 → 11.0.0

package/assets/typescript.scm

@@ -61,9 +61,10 @@
 (function_declaration
   name: (identifier) @entity.name.function)
 (method_definition
-  name: (property_identifier) @meta.definition.method @entity.name.function)
+  name: (property_identifier) @meta.definition.method @entity.name.function
+  (#not-eq? @entity.name.function "constructor"))
 (method_definition
-  name: (property_identifier) @storage.type
+  name: (property_identifier) @meta.definition.method @storage.type
   (#eq? @storage.type "constructor"))
 (method_signature
   name: (property_identifier) @meta.definition.method @entity.name.function)
@@ -109,10 +110,6 @@
 (predefined_type (["string" "boolean" "number" "any"])) @support.type.primitive
 (type_identifier) @entity.name.type
 
-(("const")
-  (variable_declarator
-  	name: (identifier) @variable.other.constant))
-
 ([
   (identifier)
   (shorthand_property_identifier)
@@ -192,7 +189,6 @@
   "<<="
   "=="
   "!="
-  "=>"
   ">>"
   ">>="
   ">>>"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-treesitter-service-override",
-  "version": "10.1.4",
+  "version": "11.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.4",
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.0",
     "@vscode/tree-sitter-wasm": "^0.0.4"
   }
 }

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

@@ -8,6 +8,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { setTimeout0 } from 'vscode/vscode/vs/base/common/platform';
+import 'vscode/vscode/vs/amdX';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { cancelOnDispose } from 'vscode/vscode/vs/base/common/cancellation';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';

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

@@ -167,7 +167,7 @@ let TreeSitterTokenizationSupport = class TreeSitterTokenizationSupport extends
                 const previousTokenStartOffset = ((tokenIndex >= 2) ? endOffsetsAndScopes[tokenIndex - 2].endOffset : 0);
                 const originalPreviousTokenEndOffset = endOffsetsAndScopes[tokenIndex - 1].endOffset;
                 if ((previousTokenStartOffset + currentTokenLength) === originalPreviousTokenEndOffset) {
-                    endOffsetsAndScopes[tokenIndex - 1].scopes.push(capture.name);
+                    endOffsetsAndScopes[tokenIndex - 1].scopes[endOffsetsAndScopes[tokenIndex - 1].scopes.length - 1] = capture.name;
                 }
                 else {
                     endOffsetsAndScopes[tokenIndex - 1].endOffset = intermediateTokenOffset;