Merge branch 'master' into update_elasticsearch

Author: bmahe

grammar.js

@@ -227,7 +227,8 @@ module.exports = grammar({
     instanceof_expression: $ => prec(PREC.REL, seq(
       field('left', $.expression),
       'instanceof',
-      field('right', $._type)
+      field('right', $._type),
+      field('name', optional(choice($.identifier, $._reserved_identifier)))
     )),
 
     lambda_expression: $ => seq(
@@ -636,6 +637,7 @@ module.exports = grammar({
       $.package_declaration,
       $.import_declaration,
       $.class_declaration,
+      $.record_declaration,
       $.interface_declaration,
       $.annotation_type_declaration,
       $.enum_declaration,
@@ -903,6 +905,7 @@ module.exports = grammar({
       optional($.modifiers),
       'record',
       field('name', $.identifier),
+      optional(field('type_parameters', $.type_parameters)),
       field('parameters', $.formal_parameters),
       field('body', $.class_body)
     ),
@@ -1133,7 +1136,8 @@ module.exports = grammar({
 
     _reserved_identifier: $ => alias(choice(
       'open',
-      'module'
+      'module',
+      'record'
     ), $.identifier),
 
     this: $ => 'this',

script/run-javaparser/target/classes/RunJavaParser.class

@@ -2013,6 +2013,31 @@
               "type": "SYMBOL",
               "name": "_type"
             }
+          },
+          {
+            "type": "FIELD",
+            "name": "name",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "identifier"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "_reserved_identifier"
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
           }
         ]
       }
@@ -4373,6 +4398,10 @@
             "type": "SYMBOL",
             "name": "class_declaration"
           },
+          {
+            "type": "SYMBOL",
+            "name": "record_declaration"
+          },
           {
             "type": "SYMBOL",
             "name": "interface_declaration"
@@ -5731,6 +5760,22 @@
             "name": "identifier"
           }
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "type_parameters",
+              "content": {
+                "type": "SYMBOL",
+                "name": "type_parameters"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "FIELD",
           "name": "parameters",
@@ -6893,6 +6938,10 @@
           {
             "type": "STRING",
             "value": "module"
+          },
+          {
+            "type": "STRING",
+            "value": "record"
           }
         ]
       },

src/grammar.json

@@ -160,6 +160,10 @@
       {
         "type": "package_declaration",
         "named": true
+      },
+      {
+        "type": "record_declaration",
+        "named": true
       }
     ]
   },
@@ -2168,6 +2172,16 @@
           }
         ]
       },
+      "name": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "identifier",
+            "named": true
+          }
+        ]
+      },
       "right": {
         "multiple": false,
         "required": true,
@@ -2914,6 +2928,16 @@
             "named": true
           }
         ]
+      },
+      "type_parameters": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "type_parameters",
+            "named": true
+          }
+        ]
       }
     },
     "children": {