Have special semicolon rules for method definitions (#182)

* use special semicolon rules for method definitions

* regenerate parser

Co-authored-by: resolritter <[email protected]>

Author: resolritter

common/corpus/declarations.txt

@@ -996,3 +996,25 @@ export class A extends B<C, D> implements C {}
         (implements_clause
           (type_identifier)))
       (class_body))))
+
+==========================================================================
+Semicolon is not automatically inserted for method definitions with a body
+==========================================================================
+
+class Foo {
+  public bar()
+  {
+  }
+}
+
+---
+
+(program
+  (class_declaration
+    (type_identifier)
+    (class_body
+      (method_definition
+        (accessibility_modifier)
+        (property_identifier)
+        (formal_parameters)
+        (statement_block))))) 

common/define-grammar.js

@@ -325,6 +325,15 @@ module.exports = function defineGrammar(dialect) {
         repeat(choice(
           $.decorator,
           seq($.method_definition, optional($._semicolon)),
+          // As it happens for functions, the semicolon insertion should not
+          // happen if a block follows the closing paren, because then it's a
+          // *definition*, not a declaration. Example:
+          //     public foo()
+          //     { <--- this brace made the method signature become a definition
+          //     }      
+          // The same rule applies for functions and that's why we use
+          // "_function_signature_automatic_semicolon".
+          seq($.method_signature, choice($._function_signature_automatic_semicolon, ',')),
           seq(
             choice(
               $.abstract_method_signature,

tsx/src/grammar.json

@@ -6263,6 +6263,28 @@
                   }
                 ]
               },
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "method_signature"
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_function_signature_automatic_semicolon"
+                      },
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      }
+                    ]
+                  }
+                ]
+              },
               {
                 "type": "SEQ",
                 "members": [