@codingame/monaco-vscode-treesitter-service-override 14.0.5 → 15.0.0

package/assets/typescript.scm

@@ -25,20 +25,6 @@
 (regex) @string.regexp
 (number) @constant.numeric
 
-; Template TODO: These don't seem to be working
-
-(template_substitution
-  "${" @punctuation.definition.template-expression.begin
-  "}" @punctuation.definition.template-expression.end)
-
-(template_type
-  "${" @punctuation.definition.template-expression.begin
-  "}" @punctuation.definition.template-expression.end)
-
-(type_arguments
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
 ; Properties
 
 (member_expression
@@ -86,6 +72,19 @@
   left: (identifier) @entity.name.function
   right: [(function_expression) (arrow_function)])
 
+(required_parameter
+  (identifier) @variable.parameter)
+
+(required_parameter
+  (rest_pattern
+    (identifier) @variable.parameter))
+
+(optional_parameter
+  (identifier) @variable.parameter)
+
+(catch_clause
+  parameter: (identifier) @variable.parameter)
+
 ; Function and method calls
 
 (call_expression
@@ -100,6 +99,8 @@
   function: (member_expression
     property: (property_identifier) @entity.name.function))
 
+(new_expression) @new.expr
+
 (new_expression
   constructor: (identifier) @entity.name.function)
 
@@ -107,8 +108,10 @@
 ; Special identifiers
 
 (predefined_type) @support.type
-(predefined_type (["string" "boolean" "number" "any"])) @support.type.primitive
+(predefined_type (["string" "boolean" "number" "any" "unknown"])) @support.type.primitive
 (type_identifier) @entity.name.type
+(internal_module
+  name: (identifier) @entity.name.type.ts)
 
 ([
   (identifier)
@@ -119,6 +122,9 @@
 (extends_clause
   value: (identifier) @entity.other.inherited-class)
 
+(implements_clause
+  (type_identifier) @entity.other.inherited-class)
+
 ; Tokens
 
 [
@@ -198,6 +204,36 @@
   "|"
 ] @keyword.operator
 
+(union_type
+  ("|") @keyword.operator.type)
+
+(intersection_type
+  ("&") @keyword.operator.type)
+
+(type_annotation
+  (":") @keyword.operator.type.annotation)
+
+[
+  "{"
+  "}"
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation
+
+(template_substitution
+  "${" @punctuation.definition.template-expression.begin
+  "}" @punctuation.definition.template-expression.end)
+
+(template_type
+  "${" @punctuation.definition.template-expression.begin
+  "}" @punctuation.definition.template-expression.end)
+
+(type_arguments
+  "<" @punctuation.definition.typeparameters
+  ">" @punctuation.definition.typeparameters)
+
 ; Keywords
 
 ("typeof") @keyword.operator.expression.typeof
@@ -270,6 +306,10 @@
   "var"
 ] @storage.type
 
+[
+  "module"
+] @storage.type.namespace.ts
+
 [
   "debugger"
   "target"
@@ -289,11 +329,14 @@
 (public_field_definition
   ("?") @keyword.operator.optional)
 
-(optional_parameter)
+(property_signature
+  ("?") @keyword.operator.optional)
+
+(optional_parameter
   ([
     "?"
     ":"
-  ]) @keyword.operator.optional
+  ]) @keyword.operator.optional)
 
 (ternary_expression
   ([
@@ -306,16 +349,40 @@
 
 (rest_pattern) @keyword.operator.rest
 
-(spread_element) @keyword.operator.spread
+(spread_element
+  ("...") @keyword.operator.spread)
 
 ; Language constants
 
 [
-  (true)
-  (false)
   (null)
+] @constant.language.null
+
+[
   (undefined)
-] @constant.language
+] @constant.language.undefined
+
+ ((identifier) @constant.language.nan
+   (#eq? @constant.language.nan "NaN"))
+
+ ((identifier) @constant.language.infinity
+   (#eq? @constant.language.infinity "Infinity"))
+
+[
+  (true)
+] @constant.language.boolean.true
+
+[
+  (false)
+] @constant.language.boolean.false
+
+(literal_type
+  [
+    (null)
+    (undefined)
+    (true)
+    (false)
+  ] @support.type.builtin)
 
 (namespace_import
   "*" @constant.language)

package/index.js

@@ -1,11 +1,13 @@
 
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import { ITreeSitterParserService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/treeSitterParserService';
+import { TreeSitterImporter } from './vscode/src/vs/editor/common/services/treeSitterParserService.js';
+import { ITreeSitterParserService, ITreeSitterImporter } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/treeSitterParserService.service';
 import { TreeSitterTextModelService } from './vscode/src/vs/editor/common/services/treeSitter/treeSitterParserService.js';
 import { ITreeSitterTokenizationFeature } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.service';
 import { TreeSitterTokenizationFeature } from './vscode/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.js';
 import { registerAssets } from '@codingame/monaco-vscode-api/assets';
-import { ITreeSitterTokenizationStoreService, TreeSitterTokenizationStoreService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/treeSitterTokenStoreService';
+import { ITreeSitterTokenizationStoreService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/treeSitterTokenStoreService.service';
+import { TreeSitterTokenizationStoreService } from './vscode/src/vs/editor/common/model/treeSitterTokenStoreService.js';
 import './vscode/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.contribution.js';
 
 registerAssets({
@@ -15,6 +17,7 @@ registerAssets({
 });
 function getServiceOverride() {
     return {
+        [ITreeSitterImporter.toString()]: new SyncDescriptor(TreeSitterImporter, [], false),
         [ITreeSitterParserService.toString()]: new SyncDescriptor(TreeSitterTextModelService, [], false),
         [ITreeSitterTokenizationFeature.toString()]: new SyncDescriptor(TreeSitterTokenizationFeature, [], false),
         [ITreeSitterTokenizationStoreService.toString()]: new SyncDescriptor(TreeSitterTokenizationStoreService, [], false)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-treesitter-service-override",
-  "version": "14.0.5",
+  "version": "15.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - treesitter service-override",
   "keywords": [],
@@ -15,10 +15,11 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common": "14.0.5",
-    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "14.0.5",
-    "@codingame/monaco-vscode-api": "14.0.5",
-    "@vscode/tree-sitter-wasm": "0.0.5"
+    "@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common": "15.0.0",
+    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "15.0.0",
+    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "15.0.0",
+    "@codingame/monaco-vscode-api": "15.0.0",
+    "@vscode/tree-sitter-wasm": "0.1.3"
   },
   "main": "index.js",
   "module": "index.js",
@@ -28,12 +29,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js",
-      "types": "./vscode/src/*.d.ts"
+      "types": "./vscode/src/*.d.ts",
+      "default": "./vscode/src/*.js"
     },
     "./*": {
-      "default": "./*.js",
-      "types": "./*.d.ts"
+      "types": "./*.d.ts",
+      "default": "./*.js"
     }
   },
   "typesVersions": {

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

@@ -0,0 +1,66 @@
+import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+declare class ListNode implements IDisposable {
+    readonly height: number;
+    parent?: ListNode;
+    private readonly _children;
+    get children(): ReadonlyArray<Node>;
+    private _length;
+    get length(): number;
+    constructor(height: number);
+    static create(node1: Node, node2: Node): ListNode;
+    canAppendChild(): boolean;
+    appendChild(node: Node): void;
+    private _updateParentLength;
+    unappendChild(): Node;
+    prependChild(node: Node): void;
+    unprependChild(): Node;
+    lastChild(): Node;
+    dispose(): void;
+}
+export declare enum TokenQuality {
+    None = 0,
+    ViewportGuess = 1,
+    EditGuess = 2,
+    Accurate = 3
+}
+type Node = ListNode | LeafNode;
+interface LeafNode {
+    readonly length: number;
+    parent?: ListNode;
+    token: number;
+    tokenQuality: TokenQuality;
+    height: 0;
+}
+export interface TokenUpdate {
+    readonly startOffsetInclusive: number;
+    readonly length: number;
+    readonly token: number;
+}
+export declare class TokenStore implements IDisposable {
+    private readonly _textModel;
+    private _root;
+    get root(): Node;
+    constructor(_textModel: ITextModel);
+    private createEmptyRoot;
+    buildStore(tokens: TokenUpdate[], tokenQuality: TokenQuality): void;
+    private createFromUpdates;
+    update(length: number, tokens: TokenUpdate[], tokenQuality: TokenQuality): void;
+    delete(length: number, startOffset: number): void;
+    private replace;
+    private traverseInOrderInRange;
+    getTokenAt(offset: number): TokenUpdate | undefined;
+    getTokensInRange(startOffsetInclusive: number, endOffsetExclusive: number): TokenUpdate[];
+    markForRefresh(startOffsetInclusive: number, endOffsetExclusive: number): void;
+    rangeHasTokens(startOffsetInclusive: number, endOffsetExclusive: number, minimumTokenQuality: TokenQuality): boolean;
+    rangeNeedsRefresh(startOffsetInclusive: number, endOffsetExclusive: number): boolean;
+    getNeedsRefresh(): {
+        startOffset: number;
+        endOffset: number;
+    }[];
+    deepCopy(): TokenStore;
+    private _copyNodeIterative;
+    printTree(root?: Node): string;
+    dispose(): void;
+}
+export {};