Update tests

src/Language/TypeScript.hs

@@ -29,6 +29,7 @@ termAssignment _ category children =
     (Ternary, condition : cases) -> Just $ S.Ternary condition cases
     (Other "variable_declaration", _) -> Just . S.Indexed $ toVarDeclOrAssignment <$> children
     (Other "trailing_variable_declaration", _) -> Just . S.Indexed $ toVarDeclOrAssignment <$> children
+    (Other "lexical_declaration", _) -> Just . S.Indexed $ toVarDeclOrAssignment <$> children
     (VarAssignment, [id, assignment]) -> Just $ S.VarAssignment [id] assignment
     (FieldDecl, _) -> Just $ S.FieldDecl children
     (Object, _) -> Just . S.Object Nothing $ foldMap toTuple children

test/fixtures/go/struct-field-declarations.diff+A.txt

@@ -8,5 +8,6 @@
         (Identifier)
         (StructTy
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)))))))+}

test/fixtures/go/struct-field-declarations.diff-A.txt

@@ -8,5 +8,6 @@
         (Identifier)
         (StructTy
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)))))))-}

test/fixtures/go/struct-field-declarations.diffA-B.txt

@@ -7,11 +7,9 @@
       (TypeDecl
         (Identifier)
         (StructTy
-        { (FieldDecl
+          (FieldDecl
-            (Identifier)
-            (Identifier))
-        ->(FieldDecl
             (Other "identifier_list"
-              (Identifier)
+            { (Identifier)
-              (Identifier))
+            ->(Identifier) }
-            (Identifier)) })))))
+            {+(Identifier)+})
+            (Identifier)))))))

test/fixtures/go/struct-field-declarations.diffB-A.txt

@@ -7,11 +7,9 @@
       (TypeDecl
         (Identifier)
         (StructTy
-        { (FieldDecl
+          (FieldDecl
             (Other "identifier_list"
-              (Identifier)
+            { (Identifier)
-              (Identifier))
+            ->(Identifier) }
-            (Identifier))
+            {-(Identifier)-})
-        ->(FieldDecl
+            (Identifier)))))))
-            (Identifier)
-            (Identifier)) })))))

test/fixtures/go/struct-field-declarations.parseA.txt

@@ -8,5 +8,6 @@
         (Identifier)
         (StructTy
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)))))))

test/fixtures/go/struct-literals.diff+A.txt

@@ -24,7 +24,8 @@
           (Other "composite_literal"
             (StructTy
               (FieldDecl
-                (Identifier)
+                (Other "identifier_list"
+                  (Identifier))
                 (Identifier)))
             (Pair
               (Identifier)

test/fixtures/go/struct-literals.diff+B.txt

@@ -24,7 +24,8 @@
           (Other "composite_literal"
             (StructTy
               (FieldDecl
-                (Identifier)
+                (Other "identifier_list"
+                  (Identifier))
                 (Identifier)))
             (Pair
               (Identifier)

test/fixtures/go/struct-literals.diff-A.txt

@@ -24,7 +24,8 @@
           (Other "composite_literal"
             (StructTy
               (FieldDecl
-                (Identifier)
+                (Other "identifier_list"
+                  (Identifier))
                 (Identifier)))
             (Pair
               (Identifier)

test/fixtures/go/struct-literals.diff-B.txt

@@ -24,7 +24,8 @@
           (Other "composite_literal"
             (StructTy
               (FieldDecl
-                (Identifier)
+                (Other "identifier_list"
+                  (Identifier))
                 (Identifier)))
             (Pair
               (Identifier)

test/fixtures/go/struct-literals.diffA-B.txt

@@ -25,7 +25,8 @@
           (Other "composite_literal"
             (StructTy
               (FieldDecl
-                (Identifier)
+                (Other "identifier_list"
+                  (Identifier))
               { (Identifier)
               ->(Identifier) }))
             (Pair

test/fixtures/go/struct-literals.diffB-A.txt

@@ -25,7 +25,8 @@
           (Other "composite_literal"
             (StructTy
               (FieldDecl
-                (Identifier)
+                (Other "identifier_list"
+                  (Identifier))
               { (Identifier)
               ->(Identifier) }))
             (Pair

test/fixtures/go/struct-literals.parseA.txt

@@ -24,7 +24,8 @@
           (Other "composite_literal"
             (StructTy
               (FieldDecl
-                (Identifier)
+                (Other "identifier_list"
+                  (Identifier))
                 (Identifier)))
             (Pair
               (Identifier)

test/fixtures/go/struct-literals.parseB.txt

@@ -24,7 +24,8 @@
           (Other "composite_literal"
             (StructTy
               (FieldDecl
-                (Identifier)
+                (Other "identifier_list"
+                  (Identifier))
                 (Identifier)))
             (Pair
               (Identifier)

test/fixtures/go/struct-types.diff+A.txt

@@ -29,6 +29,7 @@
           (FieldDecl
             (QualifiedIdentifier))
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)
             (StringLiteral)))))))+}

test/fixtures/go/struct-types.diff+B.txt

@@ -29,6 +29,7 @@
           (FieldDecl
             (QualifiedIdentifier))
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)
             (StringLiteral)))))))+}

test/fixtures/go/struct-types.diff-A.txt

@@ -29,6 +29,7 @@
           (FieldDecl
             (QualifiedIdentifier))
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)
             (StringLiteral)))))))-}

test/fixtures/go/struct-types.diff-B.txt

@@ -29,6 +29,7 @@
           (FieldDecl
             (QualifiedIdentifier))
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)
             (StringLiteral)))))))-}

test/fixtures/go/struct-types.diffA-B.txt

@@ -33,6 +33,7 @@
           (FieldDecl
             (QualifiedIdentifier))
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)
             (StringLiteral)))))))

test/fixtures/go/struct-types.diffB-A.txt

@@ -33,6 +33,7 @@
           (FieldDecl
             (QualifiedIdentifier))
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)
             (StringLiteral)))))))

test/fixtures/go/struct-types.parseA.txt

@@ -29,6 +29,7 @@
           (FieldDecl
             (QualifiedIdentifier))
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)
             (StringLiteral)))))))

test/fixtures/go/struct-types.parseB.txt

@@ -29,6 +29,7 @@
           (FieldDecl
             (QualifiedIdentifier))
           (FieldDecl
-            (Identifier)
+            (Other "identifier_list"
+              (Identifier))
             (Identifier)
             (StringLiteral)))))))

test/fixtures/javascript/export.diff+A.txt

@@ -19,14 +19,11 @@
       (Identifier)))
   (Export
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (VarAssignment
       (Identifier)
@@ -35,11 +32,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (Identifier))
   (Export

test/fixtures/javascript/export.diff+B.txt

@@ -19,14 +19,11 @@
       (Identifier)))
   (Export
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (VarAssignment
       (Identifier)
@@ -35,11 +32,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (Identifier))
   (Export

test/fixtures/javascript/export.diff-A.txt

@@ -19,14 +19,11 @@
       (Identifier)))
   (Export
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (VarAssignment
       (Identifier)
@@ -35,11 +32,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (Identifier))
   (Export

test/fixtures/javascript/export.diff-B.txt

@@ -19,14 +19,11 @@
       (Identifier)))
   (Export
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (VarAssignment
       (Identifier)
@@ -35,11 +32,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (Identifier))
   (Export

test/fixtures/javascript/export.diffA-B.txt

@@ -23,14 +23,11 @@
       (Identifier)))+}
 {+(Export
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))+}
-        (Identifier))))+}
 {+(Export
     (VarAssignment
       (Identifier)
@@ -39,11 +36,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))+}
-        (Identifier))))+}
 {+(Export
     (Identifier))+}
 {+(Export
@@ -72,28 +67,23 @@
     (Other "export_specifier"
     { (Identifier)
     ->(Identifier) }))
-  (Export
+{+(Export
-  { +(StringLiteral)+ }
+    (StringLiteral)
-  {(VarDecl
-    (Other "variable_declarator"
-      (Identifier)))
-  ->
     (Other "export_specifier"
       (Identifier)
-    (Identifier))}
+      (Identifier))
-  {(VarDecl
-    (Other "variable_declarator"
-      (Identifier)))
-  ->
     (Other "export_specifier"
       (Identifier)
-    (Identifier))}
+      (Identifier))
-  {(VarDecl
-    (Other "variable_declarator"
-      (Identifier)))
-  ->
     (Other "export_specifier"
-    (Identifier))}  )
+      (Identifier)))+}
+{-(Export
+    (VarDecl
+      (Identifier))
+    (VarDecl
+      (Identifier))
+    (VarDecl
+      (Identifier)))-}
 {-(Export
     (VarAssignment
       (Identifier)
@@ -102,11 +92,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))-}
-        (Identifier))))-}
 {-(Export
     (Identifier))-}
 {-(Export

test/fixtures/javascript/export.diffB-A.txt

@@ -23,14 +23,11 @@
       (Identifier)))+}
 {+(Export
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))+}
-        (Identifier))))+}
 {+(Export
     (VarAssignment
       (Identifier)
@@ -39,11 +36,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))+}
-        (Identifier))))+}
 {+(Export
     (Identifier))+}
 {+(Export
@@ -84,14 +79,11 @@
       (Identifier)))+}
 {-(Export
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))-}
-        (Identifier))))-}
 {-(Export
     (VarAssignment
       (Identifier)
@@ -100,11 +92,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))-}
-        (Identifier))))-}
 {-(Export
     (Identifier))-}
 {-(Export

test/fixtures/javascript/export.parseA.txt

@@ -19,14 +19,11 @@
       (Identifier)))
   (Export
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (VarAssignment
       (Identifier)
@@ -35,11 +32,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (Identifier))
   (Export

test/fixtures/javascript/export.parseB.txt

@@ -19,14 +19,11 @@
       (Identifier)))
   (Export
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (VarAssignment
       (Identifier)
@@ -35,11 +32,9 @@
       (Identifier)
       (Identifier))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier)))
-        (Identifier))))
   (Export
     (Identifier))
   (Export

test/fixtures/javascript/var-declaration.diff+B.txt

@@ -1,11 +1,9 @@
 {+(Program
   (VarDecl
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarAssignment
       (Identifier)
       (Object))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))))+}
-        (Identifier)))))+}

test/fixtures/javascript/var-declaration.diff-B.txt

@@ -1,11 +1,9 @@
 {-(Program
   (VarDecl
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarAssignment
       (Identifier)
       (Object))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))))-}
-        (Identifier)))))-}

test/fixtures/javascript/var-declaration.diffA-B.txt

@@ -1,14 +1,12 @@
 (Program
   (VarDecl
   {+(VarDecl
-      (Other "variable_declarator"
+      (Identifier))+}
-        (Identifier)))+}
   {+(VarAssignment
       (Identifier)
       (Object))+}
   {+(VarDecl
-      (Other "variable_declarator"
+      (Identifier))+}
-        (Identifier)))+}
   {-(VarAssignment
       (Identifier)
       (NumberLiteral))-}))

test/fixtures/javascript/var-declaration.diffB-A.txt

@@ -4,11 +4,9 @@
       (Identifier)
       (NumberLiteral))+}
   {-(VarDecl
-      (Other "variable_declarator"
+      (Identifier))-}
-        (Identifier)))-}
   {-(VarAssignment
       (Identifier)
       (Object))-}
   {-(VarDecl
-      (Other "variable_declarator"
+      (Identifier))-}))
-        (Identifier)))-}))

test/fixtures/javascript/var-declaration.parseB.txt

@@ -1,11 +1,9 @@
 (Program
   (VarDecl
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))
-        (Identifier)))
     (VarAssignment
       (Identifier)
       (Object))
     (VarDecl
-      (Other "variable_declarator"
+      (Identifier))))
-        (Identifier)))))

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

@@ -2,7 +2,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "type_reference"
@@ -39,7 +39,7 @@
             (Ty
               (Other "predefined_type"))))
         (Other "lexical_declaration"
-          (Other "variable_declarator"
+          (VarAssignment
             (Identifier)
             (Ty
               (Other "predefined_type"))))
@@ -76,7 +76,7 @@
               (Identifier)
               (Ty
                 (Other "predefined_type"))))))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "predefined_type")))

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

@@ -20,7 +20,7 @@
               (Identifier)
               (Ty
                 (Other "predefined_type"))))))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "predefined_type")))

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

@@ -2,7 +2,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "type_reference"
@@ -39,7 +39,7 @@
             (Ty
               (Other "predefined_type"))))
         (Other "lexical_declaration"
-          (Other "variable_declarator"
+          (VarAssignment
             (Identifier)
             (Ty
               (Other "predefined_type"))))
@@ -76,7 +76,7 @@
               (Identifier)
               (Ty
                 (Other "predefined_type"))))))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "predefined_type")))

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

@@ -20,7 +20,7 @@
               (Identifier)
               (Ty
                 (Other "predefined_type"))))))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "predefined_type")))

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

@@ -11,7 +11,7 @@
       (Other "object_type"))+}
   {-(Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "type_reference"
@@ -48,7 +48,7 @@
             (Ty
               (Other "predefined_type"))))
         (Other "lexical_declaration"
-          (Other "variable_declarator"
+          (VarAssignment
             (Identifier)
             (Ty
               (Other "predefined_type"))))
@@ -85,7 +85,7 @@
               (Identifier)
               (Ty
                 (Other "predefined_type"))))))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "predefined_type")))

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

@@ -2,7 +2,7 @@
 {+(Other "ambient_declaration"
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "type_reference"
@@ -39,7 +39,7 @@
             (Ty
               (Other "predefined_type"))))
         (Other "lexical_declaration"
-          (Other "variable_declarator"
+          (VarAssignment
             (Identifier)
             (Ty
               (Other "predefined_type"))))
@@ -86,7 +86,7 @@
               (Identifier)
               (Ty
                 (Other "predefined_type"))))))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "predefined_type")))

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

@@ -2,7 +2,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "type_reference"
@@ -39,7 +39,7 @@
             (Ty
               (Other "predefined_type"))))
         (Other "lexical_declaration"
-          (Other "variable_declarator"
+          (VarAssignment
             (Identifier)
             (Ty
               (Other "predefined_type"))))
@@ -76,7 +76,7 @@
               (Identifier)
               (Ty
                 (Other "predefined_type"))))))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "predefined_type")))

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

@@ -20,7 +20,7 @@
               (Identifier)
               (Ty
                 (Other "predefined_type"))))))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (Ty
           (Other "predefined_type")))

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

@@ -1,5 +1,5 @@
 {+(Program
-  (VarDecl
+  (Other "variable_declaration"
     (VarAssignment
       (Other "destructuring_pattern"
         (Object

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

@@ -1,5 +1,5 @@
 {+(Program
-  (VarDecl
+  (Other "variable_declaration"
     (VarAssignment
       (Other "destructuring_pattern"
         (Object

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

@@ -1,5 +1,5 @@
 {-(Program
-  (VarDecl
+  (Other "variable_declaration"
     (VarAssignment
       (Other "destructuring_pattern"
         (Object

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

@@ -1,5 +1,5 @@
 {-(Program
-  (VarDecl
+  (Other "variable_declaration"
     (VarAssignment
       (Other "destructuring_pattern"
         (Object

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

@@ -1,5 +1,5 @@
 (Program
-  (VarDecl
+  (Other "variable_declaration"
     (VarAssignment
       (Other "destructuring_pattern"
         (Object

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

@@ -1,5 +1,5 @@
 (Program
-  (VarDecl
+  (Other "variable_declaration"
     (VarAssignment
       (Other "destructuring_pattern"
         (Object

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

@@ -1,5 +1,5 @@
 (Program
-  (VarDecl
+  (Other "variable_declaration"
     (VarAssignment
       (Other "destructuring_pattern"
         (Object

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

@@ -1,5 +1,5 @@
 (Program
-  (VarDecl
+  (Other "variable_declaration"
     (VarAssignment
       (Other "destructuring_pattern"
         (Object

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (NumberLiteral))
       (Method

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (NumberLiteral))
       (Method

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

@@ -23,7 +23,7 @@
             (Identifier)))
         (Return
           (Identifier)))+}
-    {-(VarAssignment
+    {-(FieldDecl
         (Identifier)
         (NumberLiteral))-}
     {-(Method

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Class
       (Identifier)
-    {+(VarAssignment
+    {+(FieldDecl
         (Identifier)
         (NumberLiteral))+}
       (Method

test/fixtures/typescript/class.parseA.txt

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (NumberLiteral))
       (Method

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

@@ -18,22 +18,22 @@
     (Other "export_specifier"
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
     (Identifier))

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

@@ -18,22 +18,22 @@
     (Other "export_specifier"
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
     (Identifier))

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

@@ -18,22 +18,22 @@
     (Other "export_specifier"
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
     (Identifier))

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

@@ -18,22 +18,22 @@
     (Other "export_specifier"
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
     (Identifier))

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

@@ -22,22 +22,22 @@
     (Other "export_specifier"
       (Identifier)))+}
 {+(Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))+}
 {+(Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))+}
 {+(Export
     (Identifier))+}
@@ -80,22 +80,22 @@
     (Other "export_specifier"
       (Identifier)))+}
 {-(Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))-}
 {-(Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))-}
 {-(Export
     (Identifier))-}

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

@@ -22,22 +22,22 @@
     (Other "export_specifier"
       (Identifier)))+}
 {+(Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))+}
 {+(Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))+}
 {+(Export
     (Identifier))+}
@@ -80,22 +80,22 @@
     (Other "export_specifier"
       (Identifier)))+}
 {-(Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))-}
 {-(Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))-}
 {-(Export
     (Identifier))-}

test/fixtures/typescript/export.parseA.txt

@@ -18,22 +18,22 @@
     (Other "export_specifier"
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
     (Identifier))

test/fixtures/typescript/export.parseB.txt

@@ -18,22 +18,22 @@
     (Other "export_specifier"
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier))
-    (Other "variable_declarator"
+    (VarDecl
       (Identifier)))
   (Export
     (Identifier))

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

@@ -1,6 +1,6 @@
 {+(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "union_type"

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

@@ -1,6 +1,6 @@
 {+(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "intersection_type"

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

@@ -1,6 +1,6 @@
 {-(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "union_type"

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

@@ -1,6 +1,6 @@
 {-(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "intersection_type"

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

@@ -1,6 +1,6 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "intersection_type"

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

@@ -1,6 +1,6 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "union_type"

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

@@ -1,6 +1,6 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "union_type"

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

@@ -1,6 +1,6 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "intersection_type"

test/fixtures/typescript/public-field-definition.diff+A.txt

@@ -2,61 +2,61 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (NumberLiteral)))))+}

test/fixtures/typescript/public-field-definition.diff+B.txt

@@ -2,64 +2,64 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
         (Identifier)
-        (Other "type_annotation"
-          (Other "type_reference"
-            (Identifier)))
-        (NumberLiteral))
-      (VarAssignment
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
+        (Identifier)
+        (Ty
+          (Other "type_reference"
+            (Identifier)))
+        (NumberLiteral))
+      (FieldDecl
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (StringLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (NumberLiteral)))))+}

test/fixtures/typescript/public-field-definition.diff-A.txt

@@ -2,61 +2,61 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (NumberLiteral)))))-}

test/fixtures/typescript/public-field-definition.diff-B.txt

@@ -2,64 +2,64 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
         (Identifier)
-        (Other "type_annotation"
-          (Other "type_reference"
-            (Identifier)))
-        (NumberLiteral))
-      (VarAssignment
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
+        (Identifier)
+        (Ty
+          (Other "type_reference"
+            (Identifier)))
+        (NumberLiteral))
+      (FieldDecl
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (StringLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (NumberLiteral)))))-}

test/fixtures/typescript/public-field-definition.diffA-B.txt

@@ -2,94 +2,86 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier))
-    {+(VarAssignment
+    {+(FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))+}
-    {+(VarAssignment
+    {+(FieldDecl
-        (Other "accessibility_modifier")
         (Identifier)
-        (Other "type_annotation"
+        (Identifier)
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))+}
-    {-(VarAssignment
+    {-(FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
         (NumberLiteral))-}
-    {-(VarAssignment
+    {-(FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))-}
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-      {+(Other "accessibility_modifier")+}
+      { (Other "readonly")
-      {-(Other "readonly")-}
+      ->(Identifier) }
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-    {+(VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+      { (Other "readonly")
-        (Other "readonly")
+      ->(Identifier) }
-        (Identifier)
+      { (Identifier)
-        (Other "type_annotation"
+      ->(Other "readonly") }
+      { (Ty
           (Other "type_reference"
             (Identifier)))
-        (StringLiteral))+}
+      ->(Identifier) }
-    {+(VarAssignment
+      { (NumberLiteral)
-        (Identifier)
+      ->(Ty
-        (Other "type_annotation"
+          (Other "type_reference"
+            (Identifier))) }
+      {+(StringLiteral)+})
+      (FieldDecl
+      { (Identifier)
+      ->(Identifier) }
+        (Ty
           (Other "type_reference"
             (Identifier)))
-        (NumberLiteral))+}
+        (NumberLiteral))
-    {+(VarAssignment
+      (FieldDecl
         (Identifier)
-        (NumberLiteral))+}
+      { (NumberLiteral)
-    {-(VarAssignment
+      ->(NumberLiteral) }))))
-        (Other "readonly")
-        (Identifier)
-        (Other "type_annotation"
-          (Other "type_reference"
-            (Identifier)))
-        (NumberLiteral))-}
-    {-(VarAssignment
-        (Identifier)
-        (Other "type_annotation"
-          (Other "type_reference"
-            (Identifier)))
-        (NumberLiteral))-}
-    {-(VarAssignment
-        (Identifier)
-        (NumberLiteral))-})))

test/fixtures/typescript/public-field-definition.diffB-A.txt

@@ -2,87 +2,79 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier))
-    {+(VarAssignment
+    {+(FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
         (NumberLiteral))+}
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
       { (Identifier)
       ->(Identifier) }
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-    {-(VarAssignment
+    {-(FieldDecl
-        (Other "accessibility_modifier")
         (Identifier)
-        (Other "type_annotation"
+        (Identifier)
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))-}
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-      {+(Other "readonly")+}
+      { (Identifier)
-      {-(Other "accessibility_modifier")-}
+      ->(Other "readonly") }
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-    {+(VarAssignment
+      (FieldDecl
-        (Other "readonly")
+      { (Identifier)
-        (Identifier)
+      ->(Other "readonly") }
-        (Other "type_annotation"
+      { (Other "readonly")
+      ->(Identifier) }
+      { (Identifier)
+      ->(Ty
+          (Other "type_reference"
+            (Identifier))) }
+      { (Ty
           (Other "type_reference"
             (Identifier)))
-        (NumberLiteral))+}
+      ->(NumberLiteral) }
-    {+(VarAssignment
+      {-(StringLiteral)-})
-        (Identifier)
+      (FieldDecl
-        (Other "type_annotation"
+      { (Identifier)
+      ->(Identifier) }
+        (Ty
           (Other "type_reference"
             (Identifier)))
-        (NumberLiteral))+}
+        (NumberLiteral))
-    {+(VarAssignment
+      (FieldDecl
         (Identifier)
-        (NumberLiteral))+}
+      { (NumberLiteral)
-    {-(VarAssignment
+      ->(NumberLiteral) }))))
-        (Other "accessibility_modifier")
-        (Other "readonly")
-        (Identifier)
-        (Other "type_annotation"
-          (Other "type_reference"
-            (Identifier)))
-        (StringLiteral))-}
-    {-(VarAssignment
-        (Identifier)
-        (Other "type_annotation"
-          (Other "type_reference"
-            (Identifier)))
-        (NumberLiteral))-}
-    {-(VarAssignment
-        (Identifier)
-        (NumberLiteral))-})))

test/fixtures/typescript/public-field-definition.parseA.txt

@@ -2,61 +2,61 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (NumberLiteral)))))

test/fixtures/typescript/public-field-definition.parseB.txt

@@ -2,64 +2,64 @@
   (ExpressionStatements
     (Class
       (Identifier)
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
         (Identifier)
-        (Other "type_annotation"
-          (Other "type_reference"
-            (Identifier)))
-        (NumberLiteral))
-      (VarAssignment
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
-        (Other "accessibility_modifier")
+        (Identifier)
+        (Identifier)
+        (Ty
+          (Other "type_reference"
+            (Identifier)))
+        (NumberLiteral))
+      (FieldDecl
+        (Identifier)
         (Other "readonly")
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (StringLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
-        (Other "type_annotation"
+        (Ty
           (Other "type_reference"
             (Identifier)))
         (NumberLiteral))
-      (VarAssignment
+      (FieldDecl
         (Identifier)
         (NumberLiteral)))))

test/fixtures/typescript/typeof-types.diff+A.txt

@@ -1,12 +1,12 @@
 {+(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_reference"
           (Identifier)))))
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"

test/fixtures/typescript/typeof-types.diff+B.txt

@@ -1,12 +1,12 @@
 {+(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"
           (Identifier)))))
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_reference"

test/fixtures/typescript/typeof-types.diff-A.txt

@@ -1,12 +1,12 @@
 {-(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_reference"
           (Identifier)))))
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"

test/fixtures/typescript/typeof-types.diff-B.txt

@@ -1,12 +1,12 @@
 {-(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"
           (Identifier)))))
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_reference"

test/fixtures/typescript/typeof-types.diffA-B.txt

@@ -1,13 +1,13 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"
         { (Identifier)
         ->(Identifier) }))))
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_reference"

test/fixtures/typescript/typeof-types.diffB-A.txt

@@ -1,13 +1,13 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_reference"
         { (Identifier)
         ->(Identifier) }))))
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"

test/fixtures/typescript/typeof-types.parseA.txt

@@ -1,12 +1,12 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_reference"
           (Identifier)))))
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"

test/fixtures/typescript/typeof-types.parseB.txt

@@ -1,12 +1,12 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"
           (Identifier)))))
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_reference"

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

@@ -1,6 +1,6 @@
 {+(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "intersection_type"

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

@@ -1,6 +1,6 @@
 {+(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"

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

@@ -1,6 +1,6 @@
 {-(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "intersection_type"

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

@@ -1,6 +1,6 @@
 {-(Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"

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

@@ -1,6 +1,6 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"

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

@@ -1,6 +1,6 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "intersection_type"

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

@@ -1,6 +1,6 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "intersection_type"

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

@@ -1,6 +1,6 @@
 (Program
   (Other "lexical_declaration"
-    (Other "variable_declarator"
+    (VarAssignment
       (Identifier)
       (Ty
         (Other "type_query"