Various fixes (#226)

* Remove label_name not in official grammar"

* Add some missing fields

* Fix lambda modifiers

Author: damieng

corpus/expressions.txt

@@ -568,15 +568,17 @@ void a()
       (block
         (expression_statement (invocation_expression (identifier)
         (argument_list
-          (argument (lambda_expression (parameter_list) (initializer_expression))))))))))
+          (argument (lambda_expression (modifier) (parameter_list) (initializer_expression))))))))))
 
 ============================
-Lambda expression with qualifiers
+Lambda expression with modifiers
 ============================
 
 void a() {
   var lam = static x => x + 1;
   var bda = async x => x + 1;
+  var syn = async static x => x + 1;
+  var txt = static async x => x + 1;
 }
 
 ---
@@ -591,8 +593,7 @@ void a() {
             (variable_declarator
               (identifier)
               (equals_value_clause
-                (lambda_expression
-                  (identifier)
+                (lambda_expression (modifier) (identifier)
                   (binary_expression
                     (identifier)
                     (integer_literal)))))))
@@ -602,8 +603,27 @@ void a() {
             (variable_declarator
               (identifier)
               (equals_value_clause
-                (lambda_expression
-                  (identifier)
+                (lambda_expression (modifier) (identifier)
+                  (binary_expression
+                    (identifier)
+                    (integer_literal)))))))
+        (local_declaration_statement
+          (variable_declaration
+            (implicit_type)
+            (variable_declarator
+              (identifier)
+              (equals_value_clause
+                (lambda_expression (modifier) (modifier) (identifier)
+                  (binary_expression
+                    (identifier)
+                    (integer_literal)))))))
+        (local_declaration_statement
+          (variable_declaration
+            (implicit_type)
+            (variable_declarator
+              (identifier)
+              (equals_value_clause
+                (lambda_expression (modifier) (modifier) (identifier)
                   (binary_expression
                     (identifier)
                     (integer_literal)))))))))))

corpus/statements.txt

@@ -181,9 +181,9 @@ class A {
       (identifier)
       (parameter_list)
       (block
-        (goto_statement (label_name))
+        (goto_statement (identifier))
         (labeled_statement
-          (label_name) (return_statement)))))))
+          (identifier) (return_statement)))))))
 
 =====================================
 If statement

grammar.js

@@ -343,7 +343,7 @@ module.exports = grammar({
       repeat($.attribute_list),
       'params',
       choice($.array_type, $.nullable_type),
-      $.identifier
+      field('name', $.identifier),
     ),
 
     constructor_initializer: $ => seq(
@@ -381,8 +381,8 @@ module.exports = grammar({
       repeat($.attribute_list),
       optional('extern'),
       '~',
-      $.identifier,
-      $.parameter_list,
+      field('name', $.identifier),
+      field('parameters', $.parameter_list),
       $._function_body
     ),
 
@@ -405,7 +405,7 @@ module.exports = grammar({
     type_parameter: $ => seq(
       repeat($.attribute_list),
       optional(choice('in', 'out')),
-      $.identifier
+      field('name', $.identifier),
     ),
 
     type_parameter_constraints_clause: $ => seq(
@@ -830,14 +830,10 @@ module.exports = grammar({
       field('body', $._statement)
     ),
 
-    // grammar.txt one doesn't seem to make sense so we do this instead
     goto_statement: $ => seq(
       'goto',
-      choice(
-        alias($.identifier, $.label_name),
-        seq('case', $._expression),
-        'default'
-      ),
+      optional(choice('case', 'default')),
+      optional($._expression),
       ';'
     ),
 
@@ -854,7 +850,7 @@ module.exports = grammar({
     )),
 
     labeled_statement: $ => seq(
-      alias($.identifier, $.label_name),
+      $.identifier,
       ':',
       $._statement
     ),
@@ -983,7 +979,7 @@ module.exports = grammar({
     _variable_designation: $ => prec(1, choice(
       $.discard,
       $.parenthesized_variable_designation,
-      $.identifier
+      field('name', $.identifier),
     )),
 
     discard: $ => '_',
@@ -1053,7 +1049,7 @@ module.exports = grammar({
     catch_declaration: $ => seq(
       '(',
       field('type', $._type),
-      field('name', optional($.identifier)),
+      optional(field('name', $.identifier)),
       ')'
     ),
 
@@ -1086,14 +1082,13 @@ module.exports = grammar({
     anonymous_method_expression: $ => seq(
       optional('async'),
       'delegate',
-      optional($.parameter_list),
+      optional(field('parameters', $.parameter_list)),
       $.block
     ),
 
     lambda_expression: $ => prec(-1, seq(
-      optional('async'),
-      optional('static'),
-      choice($.parameter_list, $.identifier),
+      optional(alias(choice('async', 'static', seq('async', 'static'), seq('static', 'async')), $.modifier)),
+      choice(field('parameters', $.parameter_list), $.identifier),
       '=>',
       field('body', choice($.block, $._expression))
     )),

index.js

@@ -10,6 +10,7 @@
 (namespace_declaration name: (identifier) @type)
 
 (constructor_declaration name: (identifier) @type)
+(destructor_declaration name: (identifier) @type)
 
 [
   (implicit_type)