@willbooster/tree-sitter-typescript 1.3.0 → 1.3.2

package/common/defineGrammar.js

@@ -3,6 +3,7 @@ const JavaScript = require('@willbooster/tree-sitter-javascript/grammar');
 
 // Words that are keywords only in some positions and identifiers elsewhere, besides the JavaScript grammar's.
 const TYPESCRIPT_CONTEXTUAL_KEYWORDS = [
+  'accessor',
   'declare',
   'global',
   'namespace',
@@ -215,9 +216,6 @@ module.exports = function defineGrammar(dialect) {
     ],
 
     rules: {
-      // A field named `get`, `set`, or `static` is told apart from a member that the word modifies by the line-break
-      // sentinels allowed right after the name, as in the JavaScript grammar's field_definition. They are not allowed
-      // after a type annotation, which may continue on the next line.
       public_field_definition: ($) =>
         seq(
           repeat(field('decorator', $.decorator)),
@@ -233,7 +231,8 @@ module.exports = function defineGrammar(dialect) {
                 seq(optional('static'), optional($.override_modifier), optional('readonly')),
                 seq(optional('abstract'), optional('readonly')),
                 seq(optional('readonly'), optional('abstract')),
-                optional('accessor')
+                seq(optional('static'), optional($.override_modifier), 'accessor'),
+                seq('abstract', optional($.override_modifier), optional('accessor'))
               ),
               choice(
                 seq(
@@ -269,7 +268,8 @@ module.exports = function defineGrammar(dialect) {
                 seq($.override_modifier, optional('readonly')),
                 seq('readonly', optional('abstract')),
                 seq('abstract', optional('readonly')),
-                'accessor'
+                seq(optional('static'), optional($.override_modifier), 'accessor'),
+                seq('abstract', optional($.override_modifier), optional('accessor'))
               ),
               field('name', alias('static', $.property_identifier)),
               choice(
@@ -939,16 +939,7 @@ module.exports = function defineGrammar(dialect) {
 
       asserts_annotation: ($) => seq(seq(':', $.asserts)),
 
-      type: ($) =>
-        choice(
-          $.primary_type,
-          $.function_type,
-          $.readonly_type,
-          $.constructor_type,
-          $.infer_type,
-          prec(-1, alias($._type_query_member_expression_in_type_annotation, $.member_expression)),
-          prec(-1, alias($._type_query_call_expression_in_type_annotation, $.call_expression))
-        ),
+      type: ($) => choice($.primary_type, $.function_type, $.readonly_type, $.constructor_type, $.infer_type),
 
       tuple_parameter: ($) =>
         seq(
@@ -1028,6 +1019,8 @@ module.exports = function defineGrammar(dialect) {
           $.flow_maybe_type,
           $.type_query,
           $.index_type_query,
+          prec(-1, alias($._type_query_member_expression_in_type_annotation, $.member_expression)),
+          prec(-1, alias($._type_query_call_expression_in_type_annotation, $.call_expression)),
           alias($.this, $.this_type),
           $.existential_type,
           $.literal_type,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "TypeScript and TSX grammars for tree-sitter",
   "keywords": [
     "incremental",

package/queries/highlights.scm

@@ -18,6 +18,7 @@
 ; Keywords
 
 [ "abstract"
+  "accessor"
   "declare"
   "enum"
   "export"

package/tree-sitter.json

@@ -83,7 +83,7 @@
     }
   ],
   "metadata": {
-    "version": "1.3.0",
+    "version": "1.3.2",
     "license": "MIT",
     "description": "TypeScript and TSX grammars for tree-sitter",
     "authors": [

package/tsx/src/node-types.json

@@ -283,6 +283,10 @@
         "type": "array_type",
         "named": true
       },
+      {
+        "type": "call_expression",
+        "named": true
+      },
       {
         "type": "conditional_type",
         "named": true
@@ -319,6 +323,10 @@
         "type": "lookup_type",
         "named": true
       },
+      {
+        "type": "member_expression",
+        "named": true
+      },
       {
         "type": "nested_type_identifier",
         "named": true
@@ -455,10 +463,6 @@
     "type": "type",
     "named": true,
     "subtypes": [
-      {
-        "type": "call_expression",
-        "named": true
-      },
       {
         "type": "constructor_type",
         "named": true
@@ -471,10 +475,6 @@
         "type": "infer_type",
         "named": true
       },
-      {
-        "type": "member_expression",
-        "named": true
-      },
       {
         "type": "primary_type",
         "named": true

package/typescript/src/node-types.json

@@ -279,6 +279,10 @@
         "type": "array_type",
         "named": true
       },
+      {
+        "type": "call_expression",
+        "named": true
+      },
       {
         "type": "conditional_type",
         "named": true
@@ -315,6 +319,10 @@
         "type": "lookup_type",
         "named": true
       },
+      {
+        "type": "member_expression",
+        "named": true
+      },
       {
         "type": "nested_type_identifier",
         "named": true
@@ -451,10 +459,6 @@
     "type": "type",
     "named": true,
     "subtypes": [
-      {
-        "type": "call_expression",
-        "named": true
-      },
       {
         "type": "constructor_type",
         "named": true
@@ -467,10 +471,6 @@
         "type": "infer_type",
         "named": true
       },
-      {
-        "type": "member_expression",
-        "named": true
-      },
       {
         "type": "primary_type",
         "named": true