Update integration tests for javascript and typescript

test/fixtures/javascript/boolean-operator.diffA-B.txt

@@ -2,5 +2,6 @@
   (ExpressionStatements
     (BooleanOperator
       (Identifier)
-      { (Other "||") -> (Other "&&") }
+    { (Other "||")
+    ->(Other "&&") }
       (Identifier))))

test/fixtures/javascript/boolean-operator.diffB-A.txt

@@ -2,5 +2,6 @@
   (ExpressionStatements
     (BooleanOperator
       (Identifier)
-      { (Other "&&") -> (Other "||") }
+    { (Other "&&")
+    ->(Other "||") }
       (Identifier))))

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))+}

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))+}

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))-}

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))-}

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

@@ -2,8 +2,8 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
       { (StringLiteral)
       ->(StringLiteral) }))))

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

@@ -2,8 +2,8 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
       { (StringLiteral)
       ->(StringLiteral) }))))

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))

test/fixtures/javascript/delete-operator.diffA-B.txt

@@ -2,11 +2,9 @@
   (ExpressionStatements
     (Operator
       (Other "delete")
-      {
+    { (SubscriptAccess
-      (SubscriptAccess
         (Identifier)
         (StringLiteral))
-      ->
+    ->(MemberAccess
-      (MemberAccess
         (Identifier)
         (Identifier)) })))

test/fixtures/javascript/delete-operator.diffB-A.txt

@@ -2,11 +2,9 @@
   (ExpressionStatements
     (Operator
       (Other "delete")
-      {
+    { (MemberAccess
-      (MemberAccess
         (Identifier)
         (Identifier))
-      ->
+    ->(SubscriptAccess
-      (SubscriptAccess
         (Identifier)
         (StringLiteral)) })))

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

@@ -13,49 +13,49 @@
     { (Identifier)
     ->(Identifier) }))
   (Export
-      (Other "export_specifier"
+    (Other "export_specifier"
-        { (Identifier)
+    { (Identifier)
-        ->(Identifier)}
+    ->(Identifier) }
-        { (Identifier)
+    { (Identifier)
-        ->(Identifier)})
+    ->(Identifier) })
-      (Other "export_specifier"
+    (Other "export_specifier"
-      { (Identifier)
+    { (Identifier)
-      ->(Identifier)}
+    ->(Identifier) }
-      { (Identifier)
+    { (Identifier)
-      ->(Identifier)})
+    ->(Identifier) })
-      (Other "export_specifier"
+    (Other "export_specifier"
-      { (Identifier)
+    { (Identifier)
-      ->(Identifier)}))
+    ->(Identifier) }))
-(Export
+  (Export
     (VarDecl
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarDecl
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarDecl
     { (Identifier)
-    ->(Identifier)}))
+    ->(Identifier) }))
-(Export
+  (Export
     (VarAssignment
     { (Identifier)
-    ->(Identifier)}
+    ->(Identifier) }
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarAssignment
     { (Identifier)
-    ->(Identifier)}
+    ->(Identifier) }
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarDecl
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarDecl
     { (Identifier)
-    ->(Identifier)}))
+    ->(Identifier) }))
-(Export
+  (Export
-{ (Identifier)
+  { (Identifier)
-->(Identifier)})
+  ->(Identifier) })
 {+(Export
     (Function
       (Identifier)

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

@@ -64,16 +64,16 @@
     (Function
       (Params)))
   (Export
-      {+(Function
+  {+(Function
-        (Identifier)
+      (Identifier)
-        (Params))+}
+      (Params))+}
-      {-(Other "export_specifier"
+  {-(Other "export_specifier"
-        (Identifier)
+      (Identifier)
-        (Identifier))-})
+      (Identifier))-})
-  {+(Export
+{+(Export
     (Other "export_specifier"
-    (Identifier)
+      (Identifier)
-    (Identifier)))+}
+      (Identifier)))+}
   (Export
   { (StringLiteral)
   ->(StringLiteral) })

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

@@ -1,9 +1,14 @@
 (Program
   (If
-    { (Identifier) -> (MemberAccess (Identifier) (Identifier)) }
+  { (Identifier)
+  ->(MemberAccess
+      (Identifier)
+      (Identifier)) }
     (ExpressionStatements
       (ExpressionStatements
         (FunctionCall
           (Identifier)
-          { (Identifier) -> (Identifier) }))
+        { (Identifier)
-      { +(ExpressionStatements (Identifier))+ })))
+        ->(Identifier) }))
+    {+(ExpressionStatements
+        (Identifier))+})))

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

@@ -1,9 +1,14 @@
 (Program
   (If
-    { (MemberAccess (Identifier) (Identifier)) -> (Identifier) }
+  { (MemberAccess
+      (Identifier)
+      (Identifier))
+  ->(Identifier) }
     (ExpressionStatements
       (ExpressionStatements
         (FunctionCall
           (Identifier)
-          { (Identifier) -> (Identifier) }))
+        { (Identifier)
-      { -(ExpressionStatements (Identifier))- })))
+        ->(Identifier) }))
+    {-(ExpressionStatements
+        (Identifier))-})))

test/fixtures/javascript/relational-operator.diffA-B.txt

@@ -2,5 +2,6 @@
   (ExpressionStatements
     (RelationalOperator
       (Identifier)
-      { (Other "<") -> (Other "<=") }
+    { (Other "<")
+    ->(Other "<=") }
       (Identifier))))

test/fixtures/javascript/relational-operator.diffB-A.txt

@@ -2,5 +2,6 @@
   (ExpressionStatements
     (RelationalOperator
       (Identifier)
-      { (Other "<=") -> (Other "<") }
+    { (Other "<=")
+    ->(Other "<") }
       (Identifier))))

test/fixtures/javascript/type-operator.diffA-B.txt

@@ -1,6 +1,8 @@
 (Program
   (ExpressionStatements
     (Operator
-      { (Other "typeof") -> (Identifier) }
+    { (Other "typeof")
-      { (Identifier) -> (Other "instanceof") }
+    ->(Identifier) }
-      { +(Identifier)+ })))
+    { (Identifier)
+    ->(Other "instanceof") }
+    {+(Identifier)+})))

test/fixtures/javascript/type-operator.diffB-A.txt

@@ -1,6 +1,8 @@
 (Program
   (ExpressionStatements
     (Operator
-      { (Identifier) -> (Other "typeof") }
+    { (Identifier)
-      { (Other "instanceof") -> (Identifier) }
+    ->(Other "typeof") }
-      { -(Identifier)- })))
+    { (Other "instanceof")
+    ->(Identifier) }
+    {-(Identifier)-})))

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

@@ -65,7 +65,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params
@@ -77,7 +77,7 @@
         (Identifier)
         (Ty
           (Other "predefined_type")))
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params)

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

@@ -11,7 +11,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params
@@ -23,7 +23,7 @@
         (Identifier)
         (Ty
           (Other "predefined_type")))
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params)

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

@@ -65,7 +65,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params
@@ -77,7 +77,7 @@
         (Identifier)
         (Ty
           (Other "predefined_type")))
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params)

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

@@ -11,7 +11,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params
@@ -23,7 +23,7 @@
         (Identifier)
         (Ty
           (Other "predefined_type")))
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params)

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

@@ -72,7 +72,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params
@@ -84,7 +84,7 @@
         (Identifier)
         (Ty
           (Other "predefined_type")))
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params)

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

@@ -74,7 +74,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params
@@ -86,7 +86,7 @@
         (Identifier)
         (Ty
           (Other "predefined_type")))
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params)

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

@@ -65,7 +65,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params
@@ -77,7 +77,7 @@
         (Identifier)
         (Ty
           (Other "predefined_type")))
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params)

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

@@ -11,7 +11,7 @@
   (Other "ambient_declaration"
     (Class
       (Identifier)
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params
@@ -23,7 +23,7 @@
         (Identifier)
         (Ty
           (Other "predefined_type")))
-      (Other "ambient_method_declaration"
+      (Method
         (Identifier)
         (Other "call_signature"
           (Params)

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))+}

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))+}

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))-}

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))-}

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

@@ -2,8 +2,8 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
       { (StringLiteral)
       ->(StringLiteral) }))))

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

@@ -2,8 +2,8 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
       { (StringLiteral)
       ->(StringLiteral) }))))

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))

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

@@ -2,7 +2,7 @@
   (ExpressionStatements
     (Constructor
       (FunctionCall
-        (Identifier)
+        (MemberAccess
-        (Identifier)
+          (Identifier))
         (NumberLiteral)
         (StringLiteral)))))

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

@@ -13,49 +13,49 @@
     { (Identifier)
     ->(Identifier) }))
   (Export
-      (Other "export_specifier"
+    (Other "export_specifier"
-        { (Identifier)
+    { (Identifier)
-        ->(Identifier)}
+    ->(Identifier) }
-        { (Identifier)
+    { (Identifier)
-        ->(Identifier)})
+    ->(Identifier) })
-      (Other "export_specifier"
+    (Other "export_specifier"
-      { (Identifier)
+    { (Identifier)
-      ->(Identifier)}
+    ->(Identifier) }
-      { (Identifier)
+    { (Identifier)
-      ->(Identifier)})
+    ->(Identifier) })
-      (Other "export_specifier"
+    (Other "export_specifier"
-      { (Identifier)
+    { (Identifier)
-      ->(Identifier)}))
+    ->(Identifier) }))
-(Export
+  (Export
     (VarDecl
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarDecl
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarDecl
     { (Identifier)
-    ->(Identifier)}))
+    ->(Identifier) }))
-(Export
+  (Export
     (VarAssignment
     { (Identifier)
-    ->(Identifier)}
+    ->(Identifier) }
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarAssignment
     { (Identifier)
-    ->(Identifier)}
+    ->(Identifier) }
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarDecl
     { (Identifier)
-    ->(Identifier)})
+    ->(Identifier) })
     (VarDecl
     { (Identifier)
-    ->(Identifier)}))
+    ->(Identifier) }))
-(Export
+  (Export
-{ (Identifier)
+  { (Identifier)
-->(Identifier)})
+  ->(Identifier) })
 {+(Export
     (Function
       (Identifier)

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

@@ -64,16 +64,16 @@
     (Function
       (Params)))
   (Export
-      {+(Function
+  {+(Function
-        (Identifier)
+      (Identifier)
-        (Params))+}
+      (Params))+}
-      {-(Other "export_specifier"
+  {-(Other "export_specifier"
-        (Identifier)
+      (Identifier)
-        (Identifier))-})
+      (Identifier))-})
-  {+(Export
+{+(Export
     (Other "export_specifier"
-    (Identifier)
+      (Identifier)
-    (Identifier)))+}
+      (Identifier)))+}
   (Export
   { (StringLiteral)
   ->(StringLiteral) })

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

@@ -5,7 +5,7 @@
       (Other "type_parameter"
         (Identifier)))
     (Other "property_signature"
-      (Identifier)
+      (Other "reserved_identifier")
       (Ty
         (Other "literal_type"
           (StringLiteral))))

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

@@ -2,7 +2,7 @@
   (Interface
     (Identifier)
     (Other "property_signature"
-      (Identifier)
+      (Other "reserved_identifier")
       (Ty
         (Other "literal_type"
           (StringLiteral))))

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

@@ -5,7 +5,7 @@
       (Other "type_parameter"
         (Identifier)))
     (Other "property_signature"
-      (Identifier)
+      (Other "reserved_identifier")
       (Ty
         (Other "literal_type"
           (StringLiteral))))

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

@@ -2,7 +2,7 @@
   (Interface
     (Identifier)
     (Other "property_signature"
-      (Identifier)
+      (Other "reserved_identifier")
       (Ty
         (Other "literal_type"
           (StringLiteral))))

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

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

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

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

test/fixtures/typescript/interface.parseA.txt

@@ -5,7 +5,7 @@
       (Other "type_parameter"
         (Identifier)))
     (Other "property_signature"
-      (Identifier)
+      (Other "reserved_identifier")
       (Ty
         (Other "literal_type"
           (StringLiteral))))

test/fixtures/typescript/interface.parseB.txt

@@ -2,7 +2,7 @@
   (Interface
     (Identifier)
     (Other "property_signature"
-      (Identifier)
+      (Other "reserved_identifier")
       (Ty
         (Other "literal_type"
           (StringLiteral))))

test/fixtures/typescript/method-definition.diff+B.txt

@@ -5,6 +5,7 @@
       (Method
         (Other "accessibility_modifier")
         (Other "readonly")
+        (Other "reserved_identifier")
         (Identifier)
         (Params)
         (Ty

test/fixtures/typescript/method-definition.diff-B.txt

@@ -5,6 +5,7 @@
       (Method
         (Other "accessibility_modifier")
         (Other "readonly")
+        (Other "reserved_identifier")
         (Identifier)
         (Params)
         (Ty

test/fixtures/typescript/method-definition.diffA-B.txt

@@ -5,6 +5,7 @@
       (Method
         (Other "accessibility_modifier")
       {+(Other "readonly")+}
+      {+(Other "reserved_identifier")+}
         (Identifier)
         (Params)
         (Ty

test/fixtures/typescript/method-definition.diffB-A.txt

@@ -5,6 +5,7 @@
       (Method
         (Other "accessibility_modifier")
       {-(Other "readonly")-}
+      {-(Other "reserved_identifier")-}
         (Identifier)
         (Params)
         (Ty

test/fixtures/typescript/method-definition.parseB.txt

@@ -5,6 +5,7 @@
       (Method
         (Other "accessibility_modifier")
         (Other "readonly")
+        (Other "reserved_identifier")
         (Identifier)
         (Params)
         (Ty