support more of the class syntax

Author: resolritter

common/corpus/declarations.txt

@@ -625,6 +625,60 @@ class Foo {
         (formal_parameters)
         (type_annotation (type_identifier))))))
 
+=======================================
+Regression for issue 131
+=======================================
+
+class A extends B<C>(D) implements C {}
+export class A extends B<C>(D) implements C {}
+
+class A extends B<C>(D)<E> implements C {}
+export class A extends B<C>(D)<E> implements C {}
+
+---
+
+(program
+  (class_declaration
+    (type_identifier)
+    (class_heritage
+      (extends_clause
+        (functional_extension
+          (identifier)
+          (call_type_arguments (type_identifier)) (arguments (identifier))))
+      (implements_clause (type_identifier)))
+    (class_body))
+  (export_statement (class_declaration
+    (type_identifier)
+    (class_heritage
+      (extends_clause (functional_extension
+        (identifier)
+        (call_type_arguments (type_identifier))
+        (arguments (identifier))))
+      (implements_clause (type_identifier)))
+    (class_body)))
+  (class_declaration
+    (type_identifier)
+    (class_heritage
+      (extends_clause
+        (functional_extension
+          (identifier)
+          (call_type_arguments (type_identifier))
+          (arguments (identifier)))
+        (type_arguments (type_identifier)))
+      (implements_clause (type_identifier)))
+    (class_body))
+  (export_statement (class_declaration
+    (type_identifier)
+    (class_heritage
+      (extends_clause
+        (functional_extension
+          (identifier)
+          (call_type_arguments (type_identifier))
+          (arguments (identifier)))
+        (type_arguments (type_identifier)))
+      (implements_clause (type_identifier)))
+    (class_body))))
+
 =======================================
 Classes with property names as strings or numbers
 =======================================

common/corpus/types.txt

@@ -462,7 +462,7 @@ interface Enum extends Bar, Baz, funThatEvalsToInterface() {
     (extends_clause
       (type_identifier)
       (type_identifier)
-      (call_expression (identifier) (arguments)))
+      (functional_extension (identifier) (arguments)))
       (object_type
         (method_signature
           (accessibility_modifier)

common/define-grammar.js

@@ -12,7 +12,6 @@ const PREC = {
   PLUS: 4,
   REL: 5,
   TIMES: 6,
-  EXTENDS: 7,
   NEG: 9,
   INC: 10,
   NON_NULL: 10,
@@ -24,7 +23,8 @@ const PREC = {
   TYPE_ASSERTION: 16,
   TYPE_REFERENCE: 16,
   CONSTRUCTOR_TYPE: 17,
-  TYPEOF: 18
+  TYPEOF: 18,
+  EXTENDS: 18
 };
 
 module.exports = function defineGrammar(dialect) {
@@ -404,13 +404,16 @@ module.exports = function defineGrammar(dialect) {
         field('body', $.object_type)
       ),
 
+      functional_extension: $ => prec(PREC.EXTENDS, callExpression($, "function_like")),
+
       extends_clause: $ => prec(PREC.EXTENDS, seq(
         'extends',
         commaSep1(choice(
           prec(PREC.TYPE_REFERENCE, choice(
             $._type_identifier,
             $.nested_type_identifier,
-            $.generic_type
+            $.generic_type,
+            seq($.functional_extension, optional($.type_arguments))
           )),
           $._expression
         ))