Update for TypeScript grammar changes

src/Language/TypeScript.hs

@@ -161,6 +161,6 @@ categoryForTypeScriptName category = case category of
   "type_annotation" -> Ty
   "template_chars" -> TemplateString
   "module" -> Module
-  "ambient_namespace" -> Namespace
+  "internal_module" -> Namespace
   "interface_declaration" -> Interface
   name -> Other name

test/fixtures/javascript/assignment-pattern.diff+A.txt

@@ -1,9 +1,8 @@
 {+(Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))+}

test/fixtures/javascript/assignment-pattern.diff+B.txt

@@ -1,9 +1,8 @@
 {+(Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))+}

test/fixtures/javascript/assignment-pattern.diff-A.txt

@@ -1,9 +1,8 @@
 {-(Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))-}

test/fixtures/javascript/assignment-pattern.diff-B.txt

@@ -1,9 +1,8 @@
 {-(Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))-}

test/fixtures/javascript/assignment-pattern.diffA-B.txt

@@ -1,11 +1,10 @@
 (Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+        { (Identifier)
-          { (Identifier)
+        ->(Identifier) }
-          ->(Identifier) }
+        { (NumberLiteral)
-          { (NumberLiteral)
+        ->(NumberLiteral) }))
-          ->(NumberLiteral) })))
       (Identifier))))

test/fixtures/javascript/assignment-pattern.diffB-A.txt

@@ -1,11 +1,10 @@
 (Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+        { (Identifier)
-          { (Identifier)
+        ->(Identifier) }
-          ->(Identifier) }
+        { (NumberLiteral)
-          { (NumberLiteral)
+        ->(NumberLiteral) }))
-          ->(NumberLiteral) })))
       (Identifier))))

test/fixtures/javascript/assignment-pattern.parseA.txt

@@ -1,9 +1,8 @@
 (Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))

test/fixtures/javascript/assignment-pattern.parseB.txt

@@ -1,9 +1,8 @@
 (Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))

test/fixtures/javascript/constructor-call.diff+A.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))+}

test/fixtures/javascript/constructor-call.diff+B.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))+}

test/fixtures/javascript/constructor-call.diff-A.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))-}

test/fixtures/javascript/constructor-call.diff-B.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))-}

test/fixtures/javascript/constructor-call.diffA-B.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
       { (StringLiteral)

test/fixtures/javascript/constructor-call.diffB-A.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
       { (StringLiteral)

test/fixtures/javascript/constructor-call.parseA.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))

test/fixtures/javascript/constructor-call.parseB.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))

test/fixtures/javascript/template-string.diff+A.txt

@@ -1,4 +1,3 @@
 {+(Program
   (ExpressionStatements
-    (TemplateString
+    (TemplateString)))+}
-      (TemplateString))))+}

test/fixtures/javascript/template-string.diff+B.txt

@@ -1,4 +1,3 @@
 {+(Program
   (ExpressionStatements
-    (TemplateString
+    (TemplateString)))+}
-      (TemplateString))))+}

test/fixtures/javascript/template-string.diff-A.txt

@@ -1,4 +1,3 @@
 {-(Program
   (ExpressionStatements
-    (TemplateString
+    (TemplateString)))-}
-      (TemplateString))))-}

test/fixtures/javascript/template-string.diff-B.txt

@@ -1,4 +1,3 @@
 {-(Program
   (ExpressionStatements
-    (TemplateString
+    (TemplateString)))-}
-      (TemplateString))))-}

test/fixtures/javascript/template-string.diffA-B.txt

@@ -1,5 +1,4 @@
 (Program
   (ExpressionStatements
-    (TemplateString
+  { (TemplateString)
-    { (TemplateString)
+  ->(TemplateString) }))
-    ->(TemplateString) })))

test/fixtures/javascript/template-string.diffB-A.txt

@@ -1,5 +1,4 @@
 (Program
   (ExpressionStatements
-    (TemplateString
+  { (TemplateString)
-    { (TemplateString)
+  ->(TemplateString) }))
-    ->(TemplateString) })))

test/fixtures/javascript/template-string.parseA.txt

@@ -1,4 +1,3 @@
 (Program
   (ExpressionStatements
-    (TemplateString
+    (TemplateString)))
-      (TemplateString))))

test/fixtures/javascript/template-string.parseB.txt

@@ -1,4 +1,3 @@
 (Program
   (ExpressionStatements
-    (TemplateString
+    (TemplateString)))
-      (TemplateString))))

test/fixtures/typescript/ambient-declarations.diff+A.txt

@@ -5,11 +5,10 @@
       (FieldDecl
         (Identifier)
         (Ty
-          (Other "type_reference"
+          (Identifier)))))
-            (Identifier))))))
   (Other "ambient_declaration"
-    (Other "ambient_variable"
+    (Other "variable_declaration"
-      (Other "ambient_binding"
+      (VarAssignment
         (Identifier)
         (Ty
           (Other "predefined_type")))))

test/fixtures/typescript/ambient-declarations.diff+B.txt

@@ -35,5 +35,4 @@
       (Other "call_signature"
         (Params)
         (Ty
-          (Other "type_reference"
+          (Identifier))))))+}
-            (Identifier)))))))+}

test/fixtures/typescript/ambient-declarations.diff-A.txt

@@ -5,11 +5,10 @@
       (FieldDecl
         (Identifier)
         (Ty
-          (Other "type_reference"
+          (Identifier)))))
-            (Identifier))))))
   (Other "ambient_declaration"
-    (Other "ambient_variable"
+    (Other "variable_declaration"
-      (Other "ambient_binding"
+      (VarAssignment
         (Identifier)
         (Ty
           (Other "predefined_type")))))

test/fixtures/typescript/ambient-declarations.diff-B.txt

@@ -35,5 +35,4 @@
       (Other "call_signature"
         (Params)
         (Ty
-          (Other "type_reference"
+          (Identifier))))))-}
-            (Identifier)))))))-}

test/fixtures/typescript/ambient-declarations.diffA-B.txt

@@ -9,17 +9,15 @@
     {-(FieldDecl
         (Identifier)
         (Ty
-          (Other "type_reference"
+          (Identifier)))-}))
-            (Identifier))))-}))
+  (Other "ambient_declaration"
-{+(Other "ambient_declaration"
+  {+(Interface
-    (Interface
+      (Identifier))+}
-      (Identifier)))+}
+  {-(Other "variable_declaration"
-{-(Other "ambient_declaration"
+      (VarAssignment
-    (Other "ambient_variable"
-      (Other "ambient_binding"
         (Identifier)
         (Ty
-          (Other "predefined_type")))))-}
+          (Other "predefined_type"))))-})
 {-(Other "ambient_declaration"
     (Other "ambient_function"
       (Identifier)
@@ -96,5 +94,4 @@
       (Other "call_signature"
         (Params)
         (Ty
-          (Other "type_reference"
+          (Identifier)))))+})
-            (Identifier))))))+})

test/fixtures/typescript/ambient-declarations.diffB-A.txt

@@ -5,11 +5,10 @@
       (FieldDecl
         (Identifier)
         (Ty
-          (Other "type_reference"
+          (Identifier)))))+}
-            (Identifier))))))+}
 {+(Other "ambient_declaration"
-    (Other "ambient_variable"
+    (Other "variable_declaration"
-      (Other "ambient_binding"
+      (VarAssignment
         (Identifier)
         (Ty
           (Other "predefined_type")))))+}
@@ -98,5 +97,4 @@
       (Other "call_signature"
         (Params)
         (Ty
-          (Other "type_reference"
+          (Identifier)))))-})
-            (Identifier))))))-})

test/fixtures/typescript/ambient-declarations.parseA.txt

@@ -5,11 +5,10 @@
       (FieldDecl
         (Identifier)
         (Ty
-          (Other "type_reference"
+          (Identifier)))))
-            (Identifier))))))
   (Other "ambient_declaration"
-    (Other "ambient_variable"
+    (Other "variable_declaration"
-      (Other "ambient_binding"
+      (VarAssignment
         (Identifier)
         (Ty
           (Other "predefined_type")))))

test/fixtures/typescript/ambient-declarations.parseB.txt

@@ -35,5 +35,4 @@
       (Other "call_signature"
         (Params)
         (Ty
-          (Other "type_reference"
+          (Identifier))))))
-            (Identifier)))))))

test/fixtures/typescript/ambient-type-declarations.diff+A.txt

@@ -7,14 +7,12 @@
           (Other "union_type"
             (Other "predefined_type")
             (Other "predefined_type"))
-          (Other "type_reference"
+          (Identifier))
-            (Identifier)))
+        (Other "generic_type"
-        (Other "type_reference"
           (Identifier)
           (Other "type_arguments"
             (Other "union_type"
               (Other "union_type"
                 (Other "predefined_type")
                 (Other "predefined_type"))
-              (Other "type_reference"
+              (Identifier))))))))+}
-                (Identifier)))))))))+}

test/fixtures/typescript/ambient-type-declarations.diff+B.txt

@@ -6,14 +6,12 @@
         (Other "union_type"
           (Other "predefined_type")
           (Other "predefined_type"))
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
+      (Other "generic_type"
-      (Other "type_reference"
         (Identifier)
         (Other "type_arguments"
           (Other "union_type"
             (Other "union_type"
               (Other "predefined_type")
               (Other "predefined_type"))
-            (Other "type_reference"
+            (Identifier)))))))+}
-              (Identifier))))))))+}

test/fixtures/typescript/ambient-type-declarations.diff-A.txt

@@ -7,14 +7,12 @@
           (Other "union_type"
             (Other "predefined_type")
             (Other "predefined_type"))
-          (Other "type_reference"
+          (Identifier))
-            (Identifier)))
+        (Other "generic_type"
-        (Other "type_reference"
           (Identifier)
           (Other "type_arguments"
             (Other "union_type"
               (Other "union_type"
                 (Other "predefined_type")
                 (Other "predefined_type"))
-              (Other "type_reference"
+              (Identifier))))))))-}
-                (Identifier)))))))))-}

test/fixtures/typescript/ambient-type-declarations.diff-B.txt

@@ -6,14 +6,12 @@
         (Other "union_type"
           (Other "predefined_type")
           (Other "predefined_type"))
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
+      (Other "generic_type"
-      (Other "type_reference"
         (Identifier)
         (Other "type_arguments"
           (Other "union_type"
             (Other "union_type"
               (Other "predefined_type")
               (Other "predefined_type"))
-            (Other "type_reference"
+            (Identifier)))))))-}
-              (Identifier))))))))-}

test/fixtures/typescript/ambient-type-declarations.diffA-B.txt

@@ -6,17 +6,15 @@
         (Other "union_type"
           (Other "predefined_type")
           (Other "predefined_type"))
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
+      (Other "generic_type"
-      (Other "type_reference"
         (Identifier)
         (Other "type_arguments"
           (Other "union_type"
             (Other "union_type"
               (Other "predefined_type")
               (Other "predefined_type"))
-            (Other "type_reference"
+            (Identifier))))))+}
-              (Identifier)))))))+}
 {-(Other "ambient_declaration"
     (Other "type_alias_declaration"
       (Identifier)
@@ -25,14 +23,12 @@
           (Other "union_type"
             (Other "predefined_type")
             (Other "predefined_type"))
-          (Other "type_reference"
+          (Identifier))
-            (Identifier)))
+        (Other "generic_type"
-        (Other "type_reference"
           (Identifier)
           (Other "type_arguments"
             (Other "union_type"
               (Other "union_type"
                 (Other "predefined_type")
                 (Other "predefined_type"))
-              (Other "type_reference"
+              (Identifier)))))))-})
-                (Identifier))))))))-})

test/fixtures/typescript/ambient-type-declarations.diffB-A.txt

@@ -7,17 +7,15 @@
           (Other "union_type"
             (Other "predefined_type")
             (Other "predefined_type"))
-          (Other "type_reference"
+          (Identifier))
-            (Identifier)))
+        (Other "generic_type"
-        (Other "type_reference"
           (Identifier)
           (Other "type_arguments"
             (Other "union_type"
               (Other "union_type"
                 (Other "predefined_type")
                 (Other "predefined_type"))
-              (Other "type_reference"
+              (Identifier)))))))+}
-                (Identifier))))))))+}
 {-(Other "type_alias_declaration"
     (Identifier)
     (Other "union_type"
@@ -25,14 +23,12 @@
         (Other "union_type"
           (Other "predefined_type")
           (Other "predefined_type"))
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
+      (Other "generic_type"
-      (Other "type_reference"
         (Identifier)
         (Other "type_arguments"
           (Other "union_type"
             (Other "union_type"
               (Other "predefined_type")
               (Other "predefined_type"))
-            (Other "type_reference"
+            (Identifier))))))-})
-              (Identifier)))))))-})

test/fixtures/typescript/ambient-type-declarations.parseA.txt

@@ -7,14 +7,12 @@
           (Other "union_type"
             (Other "predefined_type")
             (Other "predefined_type"))
-          (Other "type_reference"
+          (Identifier))
-            (Identifier)))
+        (Other "generic_type"
-        (Other "type_reference"
           (Identifier)
           (Other "type_arguments"
             (Other "union_type"
               (Other "union_type"
                 (Other "predefined_type")
                 (Other "predefined_type"))
-              (Other "type_reference"
+              (Identifier))))))))
-                (Identifier)))))))))

test/fixtures/typescript/ambient-type-declarations.parseB.txt

@@ -6,14 +6,12 @@
         (Other "union_type"
           (Other "predefined_type")
           (Other "predefined_type"))
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
+      (Other "generic_type"
-      (Other "type_reference"
         (Identifier)
         (Other "type_arguments"
           (Other "union_type"
             (Other "union_type"
               (Other "predefined_type")
               (Other "predefined_type"))
-            (Other "type_reference"
+            (Identifier)))))))
-              (Identifier))))))))

test/fixtures/typescript/array-type.diff+A.txt

@@ -4,5 +4,4 @@
       (Identifier)
       (Ty
         (Other "array_type"
-          (Other "type_reference"
+          (Identifier))))))+}
-            (Identifier)))))))+}

test/fixtures/typescript/array-type.diff+B.txt

@@ -4,7 +4,5 @@
       (Identifier)
       (Ty
         (Other "tuple_type"
-          (Other "type_reference"
+          (Identifier)
-            (Identifier))
+          (Identifier))))))+}
-          (Other "type_reference"
-            (Identifier)))))))+}

test/fixtures/typescript/array-type.diff-A.txt

@@ -4,5 +4,4 @@
       (Identifier)
       (Ty
         (Other "array_type"
-          (Other "type_reference"
+          (Identifier))))))-}
-            (Identifier)))))))-}

test/fixtures/typescript/array-type.diff-B.txt

@@ -4,7 +4,5 @@
       (Identifier)
       (Ty
         (Other "tuple_type"
-          (Other "type_reference"
+          (Identifier)
-            (Identifier))
+          (Identifier))))))-}
-          (Other "type_reference"
-            (Identifier)))))))-}

test/fixtures/typescript/array-type.diffA-B.txt

@@ -4,7 +4,5 @@
       (Identifier)
       (Ty
         (Other "tuple_type"
-          (Other "type_reference"
+          (Identifier)
-            (Identifier))
+        {+(Identifier)+})))))
-        {+(Other "type_reference"
-            (Identifier))+})))))

test/fixtures/typescript/array-type.diffB-A.txt

@@ -4,7 +4,5 @@
       (Identifier)
       (Ty
         (Other "array_type"
-          (Other "type_reference"
+          (Identifier)
-            (Identifier))
+        {-(Identifier)-})))))
-        {-(Other "type_reference"
-            (Identifier))-})))))

test/fixtures/typescript/array-type.parseA.txt

@@ -4,5 +4,4 @@
       (Identifier)
       (Ty
         (Other "array_type"
-          (Other "type_reference"
+          (Identifier))))))
-            (Identifier)))))))

test/fixtures/typescript/array-type.parseB.txt

@@ -4,7 +4,5 @@
       (Identifier)
       (Ty
         (Other "tuple_type"
-          (Other "type_reference"
+          (Identifier)
-            (Identifier))
+          (Identifier))))))
-          (Other "type_reference"
-            (Identifier)))))))

test/fixtures/typescript/assignment-pattern.diff+A.txt

@@ -1,9 +1,8 @@
 {+(Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))+}

test/fixtures/typescript/assignment-pattern.diff+B.txt

@@ -1,9 +1,8 @@
 {+(Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))+}

test/fixtures/typescript/assignment-pattern.diff-A.txt

@@ -1,9 +1,8 @@
 {-(Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))-}

test/fixtures/typescript/assignment-pattern.diff-B.txt

@@ -1,9 +1,8 @@
 {-(Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))-}

test/fixtures/typescript/assignment-pattern.diffA-B.txt

@@ -1,11 +1,10 @@
 (Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+        { (Identifier)
-          { (Identifier)
+        ->(Identifier) }
-          ->(Identifier) }
+        { (NumberLiteral)
-          { (NumberLiteral)
+        ->(NumberLiteral) }))
-          ->(NumberLiteral) })))
       (Identifier))))

test/fixtures/typescript/assignment-pattern.diffB-A.txt

@@ -1,11 +1,10 @@
 (Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+        { (Identifier)
-          { (Identifier)
+        ->(Identifier) }
-          ->(Identifier) }
+        { (NumberLiteral)
-          { (NumberLiteral)
+        ->(NumberLiteral) }))
-          ->(NumberLiteral) })))
       (Identifier))))

test/fixtures/typescript/assignment-pattern.parseA.txt

@@ -1,9 +1,8 @@
 (Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))

test/fixtures/typescript/assignment-pattern.parseB.txt

@@ -1,9 +1,8 @@
 (Program
   (Other "variable_declaration"
     (VarAssignment
-      (Other "destructuring_pattern"
+      (Other "object_pattern"
-        (Object
+        (Other "assignment_pattern"
-          (Other "assignment_pattern"
+          (Identifier)
-            (Identifier)
+          (NumberLiteral)))
-            (NumberLiteral))))
       (Identifier))))

test/fixtures/typescript/class.diff+A.txt

@@ -7,8 +7,7 @@
           (Identifier)))
       (Other "class_heritage"
         (Other "extends_clause"
-          (Other "type_reference"
+          (Identifier)))
-            (Identifier))))
       (FieldDecl
         (Identifier)
         (NumberLiteral))

test/fixtures/typescript/class.diff+B.txt

@@ -7,8 +7,7 @@
           (Identifier)))
       (Other "class_heritage"
         (Other "extends_clause"
-          (Other "type_reference"
+          (Identifier)))
-            (Identifier))))
       (Method
         (Identifier)
         (Params

test/fixtures/typescript/class.diff-A.txt

@@ -7,8 +7,7 @@
           (Identifier)))
       (Other "class_heritage"
         (Other "extends_clause"
-          (Other "type_reference"
+          (Identifier)))
-            (Identifier))))
       (FieldDecl
         (Identifier)
         (NumberLiteral))

test/fixtures/typescript/class.diff-B.txt

@@ -7,8 +7,7 @@
           (Identifier)))
       (Other "class_heritage"
         (Other "extends_clause"
-          (Other "type_reference"
+          (Identifier)))
-            (Identifier))))
       (Method
         (Identifier)
         (Params

test/fixtures/typescript/class.diffA-B.txt

@@ -9,9 +9,8 @@
         ->(Identifier) }))
       (Other "class_heritage"
         (Other "extends_clause"
-          (Other "type_reference"
+        { (Identifier)
-          { (Identifier)
+        ->(Identifier) }))
-          ->(Identifier) })))
     {+(Method
         (Identifier)
         (Params

test/fixtures/typescript/class.diffB-A.txt

@@ -9,9 +9,8 @@
         ->(Identifier) }))
       (Other "class_heritage"
         (Other "extends_clause"
-          (Other "type_reference"
+        { (Identifier)
-          { (Identifier)
+        ->(Identifier) }))
-          ->(Identifier) })))
     {+(FieldDecl
         (Identifier)
         (NumberLiteral))+}

test/fixtures/typescript/class.parseA.txt

@@ -7,8 +7,7 @@
           (Identifier)))
       (Other "class_heritage"
         (Other "extends_clause"
-          (Other "type_reference"
+          (Identifier)))
-            (Identifier))))
       (FieldDecl
         (Identifier)
         (NumberLiteral))

test/fixtures/typescript/class.parseB.txt

@@ -7,8 +7,7 @@
           (Identifier)))
       (Other "class_heritage"
         (Other "extends_clause"
-          (Other "type_reference"
+          (Identifier)))
-            (Identifier))))
       (Method
         (Identifier)
         (Params

test/fixtures/typescript/constructor-call.diff+A.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))+}

test/fixtures/typescript/constructor-call.diff+B.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))+}

test/fixtures/typescript/constructor-call.diff-A.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))-}

test/fixtures/typescript/constructor-call.diff-B.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))-}

test/fixtures/typescript/constructor-call.diffA-B.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
       { (StringLiteral)

test/fixtures/typescript/constructor-call.diffB-A.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
       { (StringLiteral)

test/fixtures/typescript/constructor-call.parseA.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))

test/fixtures/typescript/constructor-call.parseB.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Other "reserved_identifier")
+        (Identifier)
         (Identifier)
         (NumberLiteral)
         (StringLiteral)))))

test/fixtures/typescript/function-call.diff+A.txt

@@ -3,7 +3,6 @@
     (FunctionCall
       (Identifier)
       (Other "type_arguments"
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
       (Identifier)
       (StringLiteral))))+}

test/fixtures/typescript/function-call.diff+B.txt

@@ -3,7 +3,6 @@
     (FunctionCall
       (Identifier)
       (Other "type_arguments"
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
       (Identifier)
       (StringLiteral))))+}

test/fixtures/typescript/function-call.diff-A.txt

@@ -3,7 +3,6 @@
     (FunctionCall
       (Identifier)
       (Other "type_arguments"
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
       (Identifier)
       (StringLiteral))))-}

test/fixtures/typescript/function-call.diff-B.txt

@@ -3,7 +3,6 @@
     (FunctionCall
       (Identifier)
       (Other "type_arguments"
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
       (Identifier)
       (StringLiteral))))-}

test/fixtures/typescript/function-call.diffA-B.txt

@@ -3,9 +3,8 @@
     (FunctionCall
       (Identifier)
       (Other "type_arguments"
-        (Other "type_reference"
+      { (Identifier)
-        { (Identifier)
+      ->(Identifier) })
-        ->(Identifier) }))
       (Identifier)
     { (StringLiteral)
     ->(StringLiteral) })))

test/fixtures/typescript/function-call.diffB-A.txt

@@ -3,9 +3,8 @@
     (FunctionCall
       (Identifier)
       (Other "type_arguments"
-        (Other "type_reference"
+      { (Identifier)
-        { (Identifier)
+      ->(Identifier) })
-        ->(Identifier) }))
       (Identifier)
     { (StringLiteral)
     ->(StringLiteral) })))

test/fixtures/typescript/function-call.parseA.txt

@@ -3,7 +3,6 @@
     (FunctionCall
       (Identifier)
       (Other "type_arguments"
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
       (Identifier)
       (StringLiteral))))

test/fixtures/typescript/function-call.parseB.txt

@@ -3,7 +3,6 @@
     (FunctionCall
       (Identifier)
       (Other "type_arguments"
-        (Other "type_reference"
+        (Identifier))
-          (Identifier)))
       (Identifier)
       (StringLiteral))))

test/fixtures/typescript/function-type.diff+A.txt

@@ -5,5 +5,4 @@
       (Ty
         (Other "function_type"
           (Params)
-          (Other "type_reference"
+          (Identifier))))))+}
-            (Identifier)))))))+}

test/fixtures/typescript/function-type.diff+B.txt

@@ -4,5 +4,4 @@
       (Identifier)
       (Ty
         (Other "array_type"
-          (Other "type_reference"
+          (Identifier))))))+}
-            (Identifier)))))))+}

test/fixtures/typescript/function-type.diff-A.txt

@@ -5,5 +5,4 @@
       (Ty
         (Other "function_type"
           (Params)
-          (Other "type_reference"
+          (Identifier))))))-}
-            (Identifier)))))))-}

test/fixtures/typescript/function-type.diff-B.txt

@@ -4,5 +4,4 @@
       (Identifier)
       (Ty
         (Other "array_type"
-          (Other "type_reference"
+          (Identifier))))))-}
-            (Identifier)))))))-}

test/fixtures/typescript/function-type.diffA-B.txt

@@ -5,5 +5,4 @@
       (Ty
         (Other "array_type"
         {-(Params)-}
-          (Other "type_reference"
+          (Identifier))))))
-            (Identifier)))))))

test/fixtures/typescript/function-type.diffB-A.txt

@@ -5,5 +5,4 @@
       (Ty
         (Other "function_type"
         {+(Params)+}
-          (Other "type_reference"
+          (Identifier))))))
-            (Identifier)))))))

test/fixtures/typescript/function-type.parseA.txt

@@ -5,5 +5,4 @@
       (Ty
         (Other "function_type"
           (Params)
-          (Other "type_reference"
+          (Identifier))))))
-            (Identifier)))))))

test/fixtures/typescript/function-type.parseB.txt

@@ -4,5 +4,4 @@
       (Identifier)
       (Ty
         (Other "array_type"
-          (Other "type_reference"
+          (Identifier))))))
-            (Identifier)))))))

test/fixtures/typescript/function.diff+B.txt

@@ -6,7 +6,6 @@
       (Other "required_parameter"
         (Identifier)))
     (Ty
-      (Other "type_reference"
+      (Identifier))
-        (Identifier)))
     (ExpressionStatements
       (Identifier))))+}

test/fixtures/typescript/function.diff-B.txt

@@ -6,7 +6,6 @@
       (Other "required_parameter"
         (Identifier)))
     (Ty
-      (Other "type_reference"
+      (Identifier))
-        (Identifier)))
     (ExpressionStatements
       (Identifier))))-}

test/fixtures/typescript/function.diffA-B.txt

@@ -13,8 +13,7 @@
       (Other "required_parameter"
         (Identifier)))
   ->(Ty
-      (Other "type_reference"
+      (Identifier)) }
-        (Identifier))) }
   {-(Ty
       (Other "predefined_type"))-}
     (ExpressionStatements

test/fixtures/typescript/function.diffB-A.txt

@@ -8,8 +8,7 @@
     {-(Other "required_parameter"
         (Identifier))-})
   { (Ty
-      (Other "type_reference"
+      (Identifier))
-        (Identifier)))
   ->(Params
       (Other "required_parameter"
         (Identifier))

test/fixtures/typescript/function.parseB.txt

@@ -6,7 +6,6 @@
       (Other "required_parameter"
         (Identifier)))
     (Ty
-      (Other "type_reference"
+      (Identifier))
-        (Identifier)))
     (ExpressionStatements
       (Identifier))))

test/fixtures/typescript/interface.diff+A.txt

@@ -5,7 +5,7 @@
       (Other "type_parameter"
         (Identifier)))
     (Other "property_signature"
-      (Other "reserved_identifier")
+      (Identifier)
       (Ty
         (Other "literal_type"
           (StringLiteral))))
@@ -13,5 +13,4 @@
       (Other "readonly")
       (Identifier)
       (Ty
-        (Other "type_reference"
+        (Identifier)))))+}
-          (Identifier))))))+}

test/fixtures/typescript/interface.diff+B.txt

@@ -2,7 +2,7 @@
   (Interface
     (Identifier)
     (Other "property_signature"
-      (Other "reserved_identifier")
+      (Identifier)
       (Ty
         (Other "literal_type"
           (StringLiteral))))
@@ -10,5 +10,4 @@
       (Other "readonly")
       (Identifier)
       (Ty
-        (Other "type_reference"
+        (Identifier)))))+}
-          (Identifier))))))+}

test/fixtures/typescript/interface.diff-A.txt

@@ -5,7 +5,7 @@
       (Other "type_parameter"
         (Identifier)))
     (Other "property_signature"
-      (Other "reserved_identifier")
+      (Identifier)
       (Ty
         (Other "literal_type"
           (StringLiteral))))
@@ -13,5 +13,4 @@
       (Other "readonly")
       (Identifier)
       (Ty
-        (Other "type_reference"
+        (Identifier)))))-}
-          (Identifier))))))-}

test/fixtures/typescript/interface.diff-B.txt

@@ -2,7 +2,7 @@
   (Interface
     (Identifier)
     (Other "property_signature"
-      (Other "reserved_identifier")
+      (Identifier)
       (Ty
         (Other "literal_type"
           (StringLiteral))))
@@ -10,5 +10,4 @@
       (Other "readonly")
       (Identifier)
       (Ty
-        (Other "type_reference"
+        (Identifier)))))-}
-          (Identifier))))))-}

test/fixtures/typescript/interface.diffA-B.txt

@@ -6,7 +6,7 @@
       (Other "type_parameter"
         (Identifier)))-}
     (Other "property_signature"
-      (Other "reserved_identifier")
+      (Identifier)
       (Ty
         (Other "literal_type"
         { (StringLiteral)
@@ -16,6 +16,5 @@
     { (Identifier)
     ->(Identifier) }
       (Ty
-        (Other "type_reference"
+      { (Identifier)
-        { (Identifier)
+      ->(Identifier) }))))
-        ->(Identifier) })))))

test/fixtures/typescript/interface.diffB-A.txt

@@ -6,7 +6,7 @@
       (Other "type_parameter"
         (Identifier)))+}
     (Other "property_signature"
-      (Other "reserved_identifier")
+      (Identifier)
       (Ty
         (Other "literal_type"
         { (StringLiteral)
@@ -16,6 +16,5 @@
     { (Identifier)
     ->(Identifier) }
       (Ty
-        (Other "type_reference"
+      { (Identifier)
-        { (Identifier)
+      ->(Identifier) }))))
-        ->(Identifier) })))))