Merge pull request #124 from bkramer-relyance/bkramer/records_and_ins…

…tanceof_final Fix issues with records and support instanceof final
tree-sitter · Sep 19, 2022 · 09d650d · 09d650d
2 parents e74abfa + ee2d345
commit 09d650d
Show file tree

Hide file tree

Showing 7 changed files with 32,299 additions and 32,608 deletions.
diff --git a/grammar.js b/grammar.js
@@ -230,6 +230,7 @@ module.exports = grammar({
     instanceof_expression: $ => prec(PREC.REL, seq(
       field('left', $.expression),
       'instanceof',
+      optional('final'),
       field('right', $._type),
       field('name', optional(choice($.identifier, $._reserved_identifier)))
     )),
@@ -833,6 +834,7 @@ module.exports = grammar({
       $.field_declaration,
       $.record_declaration,
       $.method_declaration,
+      $.compact_constructor_declaration, // For records.
       $.class_declaration,
       $.interface_declaration,
       $.annotation_type_declaration,
@@ -910,6 +912,7 @@ module.exports = grammar({
       field('name', $.identifier),
       optional(field('type_parameters', $.type_parameters)),
       field('parameters', $.formal_parameters),
+      optional(field('interfaces', $.super_interfaces)),
       field('body', $.class_body)
     ),
 
@@ -970,6 +973,7 @@ module.exports = grammar({
         $.method_declaration,
         $.class_declaration,
         $.interface_declaration,
+        $.record_declaration,
         $.annotation_type_declaration,
         ';'
       )),
@@ -1137,6 +1141,12 @@ module.exports = grammar({
       choice(field('body', $.block), ';')
     ),
 
+    compact_constructor_declaration: $ => seq(
+      optional($.modifiers),
+      field('name', $.identifier),
+      field('body', $.block)
+    ),
+
     _reserved_identifier: $ => alias(choice(
       'open',
       'module',

diff --git a/src/grammar.json b/src/grammar.json
@@ -2006,6 +2006,18 @@
             "type": "STRING",
             "value": "instanceof"
           },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "final"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "FIELD",
             "name": "right",
@@ -5421,6 +5433,10 @@
           "type": "SYMBOL",
           "name": "method_declaration"
         },
+        {
+          "type": "SYMBOL",
+          "name": "compact_constructor_declaration"
+        },
         {
           "type": "SYMBOL",
           "name": "class_declaration"
@@ -5810,6 +5826,22 @@
             "name": "formal_parameters"
           }
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "interfaces",
+              "content": {
+                "type": "SYMBOL",
+                "name": "super_interfaces"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "FIELD",
           "name": "body",
@@ -6118,6 +6150,10 @@
                 "type": "SYMBOL",
                 "name": "interface_declaration"
               },
+              {
+                "type": "SYMBOL",
+                "name": "record_declaration"
+              },
               {
                 "type": "SYMBOL",
                 "name": "annotation_type_declaration"
@@ -6952,6 +6988,39 @@
         }
       ]
     },
+    "compact_constructor_declaration": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "modifiers"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
+        }
+      ]
+    },
     "_reserved_identifier": {
       "type": "ALIAS",
       "content": {

diff --git a/src/node-types.json b/src/node-types.json
@@ -1115,6 +1115,10 @@
           "type": "class_declaration",
           "named": true
         },
+        {
+          "type": "compact_constructor_declaration",
+          "named": true
+        },
         {
           "type": "constructor_declaration",
           "named": true
@@ -1237,6 +1241,42 @@
       ]
     }
   },
+  {
+    "type": "compact_constructor_declaration",
+    "named": true,
+    "fields": {
+      "body": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "block",
+            "named": true
+          }
+        ]
+      },
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "identifier",
+            "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "modifiers",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "constant_declaration",
     "named": true,
@@ -1605,6 +1645,10 @@
           "type": "class_declaration",
           "named": true
         },
+        {
+          "type": "compact_constructor_declaration",
+          "named": true
+        },
         {
           "type": "constructor_declaration",
           "named": true
@@ -2230,6 +2274,10 @@
         {
           "type": "method_declaration",
           "named": true
+        },
+        {
+          "type": "record_declaration",
+          "named": true
         }
       ]
     }
@@ -2909,6 +2957,16 @@
           }
         ]
       },
+      "interfaces": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "super_interfaces",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": true,