From 9f41276e3baecb61188ca13333a75b925faff3e7 Mon Sep 17 00:00:00 2001 From: Timothy Clem Date: Thu, 3 Aug 2017 08:49:20 -0700 Subject: [PATCH] Update for TypeScript grammar changes --- src/Language/TypeScript.hs | 2 +- .../javascript/assignment-pattern.diff+A.txt | 9 +++--- .../javascript/assignment-pattern.diff+B.txt | 9 +++--- .../javascript/assignment-pattern.diff-A.txt | 9 +++--- .../javascript/assignment-pattern.diff-B.txt | 9 +++--- .../javascript/assignment-pattern.diffA-B.txt | 13 ++++---- .../javascript/assignment-pattern.diffB-A.txt | 13 ++++---- .../javascript/assignment-pattern.parseA.txt | 9 +++--- .../javascript/assignment-pattern.parseB.txt | 9 +++--- .../javascript/constructor-call.diff+A.txt | 2 +- .../javascript/constructor-call.diff+B.txt | 2 +- .../javascript/constructor-call.diff-A.txt | 2 +- .../javascript/constructor-call.diff-B.txt | 2 +- .../javascript/constructor-call.diffA-B.txt | 2 +- .../javascript/constructor-call.diffB-A.txt | 2 +- .../javascript/constructor-call.parseA.txt | 2 +- .../javascript/constructor-call.parseB.txt | 2 +- .../javascript/template-string.diff+A.txt | 3 +- .../javascript/template-string.diff+B.txt | 3 +- .../javascript/template-string.diff-A.txt | 3 +- .../javascript/template-string.diff-B.txt | 3 +- .../javascript/template-string.diffA-B.txt | 5 ++-- .../javascript/template-string.diffB-A.txt | 5 ++-- .../javascript/template-string.parseA.txt | 3 +- .../javascript/template-string.parseB.txt | 3 +- .../ambient-declarations.diff+A.txt | 7 ++--- .../ambient-declarations.diff+B.txt | 3 +- .../ambient-declarations.diff-A.txt | 7 ++--- .../ambient-declarations.diff-B.txt | 3 +- .../ambient-declarations.diffA-B.txt | 19 +++++------- .../ambient-declarations.diffB-A.txt | 10 +++---- .../ambient-declarations.parseA.txt | 7 ++--- .../ambient-declarations.parseB.txt | 3 +- .../ambient-type-declarations.diff+A.txt | 8 ++--- .../ambient-type-declarations.diff+B.txt | 8 ++--- .../ambient-type-declarations.diff-A.txt | 8 ++--- .../ambient-type-declarations.diff-B.txt | 8 ++--- .../ambient-type-declarations.diffA-B.txt | 16 ++++------ .../ambient-type-declarations.diffB-A.txt | 16 ++++------ .../ambient-type-declarations.parseA.txt | 8 ++--- .../ambient-type-declarations.parseB.txt | 8 ++--- .../fixtures/typescript/array-type.diff+A.txt | 3 +- .../fixtures/typescript/array-type.diff+B.txt | 6 ++-- .../fixtures/typescript/array-type.diff-A.txt | 3 +- .../fixtures/typescript/array-type.diff-B.txt | 6 ++-- .../typescript/array-type.diffA-B.txt | 6 ++-- .../typescript/array-type.diffB-A.txt | 6 ++-- .../fixtures/typescript/array-type.parseA.txt | 3 +- .../fixtures/typescript/array-type.parseB.txt | 6 ++-- .../typescript/assignment-pattern.diff+A.txt | 9 +++--- .../typescript/assignment-pattern.diff+B.txt | 9 +++--- .../typescript/assignment-pattern.diff-A.txt | 9 +++--- .../typescript/assignment-pattern.diff-B.txt | 9 +++--- .../typescript/assignment-pattern.diffA-B.txt | 13 ++++---- .../typescript/assignment-pattern.diffB-A.txt | 13 ++++---- .../typescript/assignment-pattern.parseA.txt | 9 +++--- .../typescript/assignment-pattern.parseB.txt | 9 +++--- test/fixtures/typescript/class.diff+A.txt | 3 +- test/fixtures/typescript/class.diff+B.txt | 3 +- test/fixtures/typescript/class.diff-A.txt | 3 +- test/fixtures/typescript/class.diff-B.txt | 3 +- test/fixtures/typescript/class.diffA-B.txt | 5 ++-- test/fixtures/typescript/class.diffB-A.txt | 5 ++-- test/fixtures/typescript/class.parseA.txt | 3 +- test/fixtures/typescript/class.parseB.txt | 3 +- .../typescript/constructor-call.diff+A.txt | 2 +- .../typescript/constructor-call.diff+B.txt | 2 +- .../typescript/constructor-call.diff-A.txt | 2 +- .../typescript/constructor-call.diff-B.txt | 2 +- .../typescript/constructor-call.diffA-B.txt | 2 +- .../typescript/constructor-call.diffB-A.txt | 2 +- .../typescript/constructor-call.parseA.txt | 2 +- .../typescript/constructor-call.parseB.txt | 2 +- .../typescript/function-call.diff+A.txt | 3 +- .../typescript/function-call.diff+B.txt | 3 +- .../typescript/function-call.diff-A.txt | 3 +- .../typescript/function-call.diff-B.txt | 3 +- .../typescript/function-call.diffA-B.txt | 5 ++-- .../typescript/function-call.diffB-A.txt | 5 ++-- .../typescript/function-call.parseA.txt | 3 +- .../typescript/function-call.parseB.txt | 3 +- .../typescript/function-type.diff+A.txt | 3 +- .../typescript/function-type.diff+B.txt | 3 +- .../typescript/function-type.diff-A.txt | 3 +- .../typescript/function-type.diff-B.txt | 3 +- .../typescript/function-type.diffA-B.txt | 3 +- .../typescript/function-type.diffB-A.txt | 3 +- .../typescript/function-type.parseA.txt | 3 +- .../typescript/function-type.parseB.txt | 3 +- test/fixtures/typescript/function.diff+B.txt | 3 +- test/fixtures/typescript/function.diff-B.txt | 3 +- test/fixtures/typescript/function.diffA-B.txt | 3 +- test/fixtures/typescript/function.diffB-A.txt | 3 +- test/fixtures/typescript/function.parseB.txt | 3 +- test/fixtures/typescript/interface.diff+A.txt | 5 ++-- test/fixtures/typescript/interface.diff+B.txt | 5 ++-- test/fixtures/typescript/interface.diff-A.txt | 5 ++-- test/fixtures/typescript/interface.diff-B.txt | 5 ++-- .../fixtures/typescript/interface.diffA-B.txt | 7 ++--- .../fixtures/typescript/interface.diffB-A.txt | 7 ++--- test/fixtures/typescript/interface.parseA.txt | 5 ++-- test/fixtures/typescript/interface.parseB.txt | 5 ++-- .../typescript/intersection-type.diff+A.txt | 6 ++-- .../typescript/intersection-type.diff+B.txt | 6 ++-- .../typescript/intersection-type.diff-A.txt | 6 ++-- .../typescript/intersection-type.diff-B.txt | 6 ++-- .../typescript/intersection-type.diffA-B.txt | 10 +++---- .../typescript/intersection-type.diffB-A.txt | 10 +++---- .../typescript/intersection-type.parseA.txt | 6 ++-- .../typescript/intersection-type.parseB.txt | 6 ++-- .../typescript/method-definition.diff+A.txt | 3 +- .../typescript/method-definition.diff+B.txt | 1 - .../typescript/method-definition.diff-A.txt | 3 +- .../typescript/method-definition.diff-B.txt | 1 - .../typescript/method-definition.diffA-B.txt | 4 +-- .../typescript/method-definition.diffB-A.txt | 4 +-- .../typescript/method-definition.parseA.txt | 3 +- .../typescript/method-definition.parseB.txt | 1 - .../public-field-definition.diff+A.txt | 18 ++++------- .../public-field-definition.diff+B.txt | 21 +++++-------- .../public-field-definition.diff-A.txt | 18 ++++------- .../public-field-definition.diff-B.txt | 21 +++++-------- .../public-field-definition.diffA-B.txt | 30 +++++++------------ .../public-field-definition.diffB-A.txt | 27 ++++++----------- .../public-field-definition.parseA.txt | 18 ++++------- .../public-field-definition.parseB.txt | 21 +++++-------- .../typescript/template-string.diff+A.txt | 3 +- .../typescript/template-string.diff+B.txt | 3 +- .../typescript/template-string.diff-A.txt | 3 +- .../typescript/template-string.diff-B.txt | 3 +- .../typescript/template-string.diffA-B.txt | 5 ++-- .../typescript/template-string.diffB-A.txt | 5 ++-- .../typescript/template-string.parseA.txt | 3 +- .../typescript/template-string.parseB.txt | 3 +- .../fixtures/typescript/tuple-type.diff+A.txt | 6 ++-- .../fixtures/typescript/tuple-type.diff+B.txt | 6 ++-- .../fixtures/typescript/tuple-type.diff-A.txt | 6 ++-- .../fixtures/typescript/tuple-type.diff-B.txt | 6 ++-- .../typescript/tuple-type.diffA-B.txt | 6 ++-- .../typescript/tuple-type.diffB-A.txt | 6 ++-- .../fixtures/typescript/tuple-type.parseA.txt | 6 ++-- .../fixtures/typescript/tuple-type.parseB.txt | 6 ++-- .../typescript/typeof-types.diff+A.txt | 3 +- .../typescript/typeof-types.diff+B.txt | 3 +- .../typescript/typeof-types.diff-A.txt | 3 +- .../typescript/typeof-types.diff-B.txt | 3 +- .../typescript/typeof-types.diffA-B.txt | 12 ++++---- .../typescript/typeof-types.diffB-A.txt | 12 ++++---- .../typescript/typeof-types.parseA.txt | 3 +- .../typescript/typeof-types.parseB.txt | 3 +- .../fixtures/typescript/union-type.diff+A.txt | 6 ++-- .../fixtures/typescript/union-type.diff-A.txt | 6 ++-- .../typescript/union-type.diffA-B.txt | 7 ++--- .../typescript/union-type.diffB-A.txt | 7 ++--- .../fixtures/typescript/union-type.parseA.txt | 6 ++-- 155 files changed, 354 insertions(+), 585 deletions(-) diff --git a/src/Language/TypeScript.hs b/src/Language/TypeScript.hs index 26de7b01f..f5d3060fe 100644 --- a/src/Language/TypeScript.hs +++ b/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 diff --git a/test/fixtures/javascript/assignment-pattern.diff+A.txt b/test/fixtures/javascript/assignment-pattern.diff+A.txt index 2615fc2d9..ea330ea24 100644 --- a/test/fixtures/javascript/assignment-pattern.diff+A.txt +++ b/test/fixtures/javascript/assignment-pattern.diff+A.txt @@ -1,9 +1,8 @@ {+(Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier))))+} diff --git a/test/fixtures/javascript/assignment-pattern.diff+B.txt b/test/fixtures/javascript/assignment-pattern.diff+B.txt index 2615fc2d9..ea330ea24 100644 --- a/test/fixtures/javascript/assignment-pattern.diff+B.txt +++ b/test/fixtures/javascript/assignment-pattern.diff+B.txt @@ -1,9 +1,8 @@ {+(Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier))))+} diff --git a/test/fixtures/javascript/assignment-pattern.diff-A.txt b/test/fixtures/javascript/assignment-pattern.diff-A.txt index ce07f56c9..4ddb214b7 100644 --- a/test/fixtures/javascript/assignment-pattern.diff-A.txt +++ b/test/fixtures/javascript/assignment-pattern.diff-A.txt @@ -1,9 +1,8 @@ {-(Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier))))-} diff --git a/test/fixtures/javascript/assignment-pattern.diff-B.txt b/test/fixtures/javascript/assignment-pattern.diff-B.txt index ce07f56c9..4ddb214b7 100644 --- a/test/fixtures/javascript/assignment-pattern.diff-B.txt +++ b/test/fixtures/javascript/assignment-pattern.diff-B.txt @@ -1,9 +1,8 @@ {-(Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier))))-} diff --git a/test/fixtures/javascript/assignment-pattern.diffA-B.txt b/test/fixtures/javascript/assignment-pattern.diffA-B.txt index aab06139e..fedace830 100644 --- a/test/fixtures/javascript/assignment-pattern.diffA-B.txt +++ b/test/fixtures/javascript/assignment-pattern.diffA-B.txt @@ -1,11 +1,10 @@ (Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - { (Identifier) - ->(Identifier) } - { (NumberLiteral) - ->(NumberLiteral) }))) + (Other "object_pattern" + (Other "assignment_pattern" + { (Identifier) + ->(Identifier) } + { (NumberLiteral) + ->(NumberLiteral) })) (Identifier)))) diff --git a/test/fixtures/javascript/assignment-pattern.diffB-A.txt b/test/fixtures/javascript/assignment-pattern.diffB-A.txt index aab06139e..fedace830 100644 --- a/test/fixtures/javascript/assignment-pattern.diffB-A.txt +++ b/test/fixtures/javascript/assignment-pattern.diffB-A.txt @@ -1,11 +1,10 @@ (Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - { (Identifier) - ->(Identifier) } - { (NumberLiteral) - ->(NumberLiteral) }))) + (Other "object_pattern" + (Other "assignment_pattern" + { (Identifier) + ->(Identifier) } + { (NumberLiteral) + ->(NumberLiteral) })) (Identifier)))) diff --git a/test/fixtures/javascript/assignment-pattern.parseA.txt b/test/fixtures/javascript/assignment-pattern.parseA.txt index 7586c6680..0678b8e66 100644 --- a/test/fixtures/javascript/assignment-pattern.parseA.txt +++ b/test/fixtures/javascript/assignment-pattern.parseA.txt @@ -1,9 +1,8 @@ (Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier)))) diff --git a/test/fixtures/javascript/assignment-pattern.parseB.txt b/test/fixtures/javascript/assignment-pattern.parseB.txt index 7586c6680..0678b8e66 100644 --- a/test/fixtures/javascript/assignment-pattern.parseB.txt +++ b/test/fixtures/javascript/assignment-pattern.parseB.txt @@ -1,9 +1,8 @@ (Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier)))) diff --git a/test/fixtures/javascript/constructor-call.diff+A.txt b/test/fixtures/javascript/constructor-call.diff+A.txt index 4c12295af..d92216c44 100644 --- a/test/fixtures/javascript/constructor-call.diff+A.txt +++ b/test/fixtures/javascript/constructor-call.diff+A.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral)))))+} diff --git a/test/fixtures/javascript/constructor-call.diff+B.txt b/test/fixtures/javascript/constructor-call.diff+B.txt index 4c12295af..d92216c44 100644 --- a/test/fixtures/javascript/constructor-call.diff+B.txt +++ b/test/fixtures/javascript/constructor-call.diff+B.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral)))))+} diff --git a/test/fixtures/javascript/constructor-call.diff-A.txt b/test/fixtures/javascript/constructor-call.diff-A.txt index e5ed42b57..5e2573b4c 100644 --- a/test/fixtures/javascript/constructor-call.diff-A.txt +++ b/test/fixtures/javascript/constructor-call.diff-A.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral)))))-} diff --git a/test/fixtures/javascript/constructor-call.diff-B.txt b/test/fixtures/javascript/constructor-call.diff-B.txt index e5ed42b57..5e2573b4c 100644 --- a/test/fixtures/javascript/constructor-call.diff-B.txt +++ b/test/fixtures/javascript/constructor-call.diff-B.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral)))))-} diff --git a/test/fixtures/javascript/constructor-call.diffA-B.txt b/test/fixtures/javascript/constructor-call.diffA-B.txt index e815f5b3a..653e57bb7 100644 --- a/test/fixtures/javascript/constructor-call.diffA-B.txt +++ b/test/fixtures/javascript/constructor-call.diffA-B.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) { (StringLiteral) diff --git a/test/fixtures/javascript/constructor-call.diffB-A.txt b/test/fixtures/javascript/constructor-call.diffB-A.txt index e815f5b3a..653e57bb7 100644 --- a/test/fixtures/javascript/constructor-call.diffB-A.txt +++ b/test/fixtures/javascript/constructor-call.diffB-A.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) { (StringLiteral) diff --git a/test/fixtures/javascript/constructor-call.parseA.txt b/test/fixtures/javascript/constructor-call.parseA.txt index e66a2b711..d09bd1e9e 100644 --- a/test/fixtures/javascript/constructor-call.parseA.txt +++ b/test/fixtures/javascript/constructor-call.parseA.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral))))) diff --git a/test/fixtures/javascript/constructor-call.parseB.txt b/test/fixtures/javascript/constructor-call.parseB.txt index e66a2b711..d09bd1e9e 100644 --- a/test/fixtures/javascript/constructor-call.parseB.txt +++ b/test/fixtures/javascript/constructor-call.parseB.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral))))) diff --git a/test/fixtures/javascript/template-string.diff+A.txt b/test/fixtures/javascript/template-string.diff+A.txt index 0e97d63e2..7a7bda735 100644 --- a/test/fixtures/javascript/template-string.diff+A.txt +++ b/test/fixtures/javascript/template-string.diff+A.txt @@ -1,4 +1,3 @@ {+(Program (ExpressionStatements - (TemplateString - (TemplateString))))+} + (TemplateString)))+} diff --git a/test/fixtures/javascript/template-string.diff+B.txt b/test/fixtures/javascript/template-string.diff+B.txt index 0e97d63e2..7a7bda735 100644 --- a/test/fixtures/javascript/template-string.diff+B.txt +++ b/test/fixtures/javascript/template-string.diff+B.txt @@ -1,4 +1,3 @@ {+(Program (ExpressionStatements - (TemplateString - (TemplateString))))+} + (TemplateString)))+} diff --git a/test/fixtures/javascript/template-string.diff-A.txt b/test/fixtures/javascript/template-string.diff-A.txt index 8c8cd3296..2376a4fc5 100644 --- a/test/fixtures/javascript/template-string.diff-A.txt +++ b/test/fixtures/javascript/template-string.diff-A.txt @@ -1,4 +1,3 @@ {-(Program (ExpressionStatements - (TemplateString - (TemplateString))))-} + (TemplateString)))-} diff --git a/test/fixtures/javascript/template-string.diff-B.txt b/test/fixtures/javascript/template-string.diff-B.txt index 8c8cd3296..2376a4fc5 100644 --- a/test/fixtures/javascript/template-string.diff-B.txt +++ b/test/fixtures/javascript/template-string.diff-B.txt @@ -1,4 +1,3 @@ {-(Program (ExpressionStatements - (TemplateString - (TemplateString))))-} + (TemplateString)))-} diff --git a/test/fixtures/javascript/template-string.diffA-B.txt b/test/fixtures/javascript/template-string.diffA-B.txt index 665643187..2ba8a38b1 100644 --- a/test/fixtures/javascript/template-string.diffA-B.txt +++ b/test/fixtures/javascript/template-string.diffA-B.txt @@ -1,5 +1,4 @@ (Program (ExpressionStatements - (TemplateString - { (TemplateString) - ->(TemplateString) }))) + { (TemplateString) + ->(TemplateString) })) diff --git a/test/fixtures/javascript/template-string.diffB-A.txt b/test/fixtures/javascript/template-string.diffB-A.txt index 665643187..2ba8a38b1 100644 --- a/test/fixtures/javascript/template-string.diffB-A.txt +++ b/test/fixtures/javascript/template-string.diffB-A.txt @@ -1,5 +1,4 @@ (Program (ExpressionStatements - (TemplateString - { (TemplateString) - ->(TemplateString) }))) + { (TemplateString) + ->(TemplateString) })) diff --git a/test/fixtures/javascript/template-string.parseA.txt b/test/fixtures/javascript/template-string.parseA.txt index f0023b624..b54e6832d 100644 --- a/test/fixtures/javascript/template-string.parseA.txt +++ b/test/fixtures/javascript/template-string.parseA.txt @@ -1,4 +1,3 @@ (Program (ExpressionStatements - (TemplateString - (TemplateString)))) + (TemplateString))) diff --git a/test/fixtures/javascript/template-string.parseB.txt b/test/fixtures/javascript/template-string.parseB.txt index f0023b624..b54e6832d 100644 --- a/test/fixtures/javascript/template-string.parseB.txt +++ b/test/fixtures/javascript/template-string.parseB.txt @@ -1,4 +1,3 @@ (Program (ExpressionStatements - (TemplateString - (TemplateString)))) + (TemplateString))) diff --git a/test/fixtures/typescript/ambient-declarations.diff+A.txt b/test/fixtures/typescript/ambient-declarations.diff+A.txt index d20ef2266..9e6891163 100644 --- a/test/fixtures/typescript/ambient-declarations.diff+A.txt +++ b/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 "ambient_binding" + (Other "variable_declaration" + (VarAssignment (Identifier) (Ty (Other "predefined_type"))))) diff --git a/test/fixtures/typescript/ambient-declarations.diff+B.txt b/test/fixtures/typescript/ambient-declarations.diff+B.txt index ce4696918..d4858e557 100644 --- a/test/fixtures/typescript/ambient-declarations.diff+B.txt +++ b/test/fixtures/typescript/ambient-declarations.diff+B.txt @@ -35,5 +35,4 @@ (Other "call_signature" (Params) (Ty - (Other "type_reference" - (Identifier)))))))+} + (Identifier))))))+} diff --git a/test/fixtures/typescript/ambient-declarations.diff-A.txt b/test/fixtures/typescript/ambient-declarations.diff-A.txt index 3da629909..9f0b6599f 100644 --- a/test/fixtures/typescript/ambient-declarations.diff-A.txt +++ b/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 "ambient_binding" + (Other "variable_declaration" + (VarAssignment (Identifier) (Ty (Other "predefined_type"))))) diff --git a/test/fixtures/typescript/ambient-declarations.diff-B.txt b/test/fixtures/typescript/ambient-declarations.diff-B.txt index fa9e710f6..daf038aed 100644 --- a/test/fixtures/typescript/ambient-declarations.diff-B.txt +++ b/test/fixtures/typescript/ambient-declarations.diff-B.txt @@ -35,5 +35,4 @@ (Other "call_signature" (Params) (Ty - (Other "type_reference" - (Identifier)))))))-} + (Identifier))))))-} diff --git a/test/fixtures/typescript/ambient-declarations.diffA-B.txt b/test/fixtures/typescript/ambient-declarations.diffA-B.txt index 59b600a05..0b474497d 100644 --- a/test/fixtures/typescript/ambient-declarations.diffA-B.txt +++ b/test/fixtures/typescript/ambient-declarations.diffA-B.txt @@ -9,17 +9,15 @@ {-(FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))))-})) -{+(Other "ambient_declaration" - (Interface - (Identifier)))+} -{-(Other "ambient_declaration" - (Other "ambient_variable" - (Other "ambient_binding" + (Identifier)))-})) + (Other "ambient_declaration" + {+(Interface + (Identifier))+} + {-(Other "variable_declaration" + (VarAssignment (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)))))+}) diff --git a/test/fixtures/typescript/ambient-declarations.diffB-A.txt b/test/fixtures/typescript/ambient-declarations.diffB-A.txt index cb306c9d3..eecfbc25b 100644 --- a/test/fixtures/typescript/ambient-declarations.diffB-A.txt +++ b/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 "ambient_binding" + (Other "variable_declaration" + (VarAssignment (Identifier) (Ty (Other "predefined_type")))))+} @@ -98,5 +97,4 @@ (Other "call_signature" (Params) (Ty - (Other "type_reference" - (Identifier))))))-}) + (Identifier)))))-}) diff --git a/test/fixtures/typescript/ambient-declarations.parseA.txt b/test/fixtures/typescript/ambient-declarations.parseA.txt index c247a7e53..3b0cf8802 100644 --- a/test/fixtures/typescript/ambient-declarations.parseA.txt +++ b/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 "ambient_binding" + (Other "variable_declaration" + (VarAssignment (Identifier) (Ty (Other "predefined_type"))))) diff --git a/test/fixtures/typescript/ambient-declarations.parseB.txt b/test/fixtures/typescript/ambient-declarations.parseB.txt index ae6650ac6..e8d79455f 100644 --- a/test/fixtures/typescript/ambient-declarations.parseB.txt +++ b/test/fixtures/typescript/ambient-declarations.parseB.txt @@ -35,5 +35,4 @@ (Other "call_signature" (Params) (Ty - (Other "type_reference" - (Identifier))))))) + (Identifier)))))) diff --git a/test/fixtures/typescript/ambient-type-declarations.diff+A.txt b/test/fixtures/typescript/ambient-type-declarations.diff+A.txt index 3af07cc95..7fda550f1 100644 --- a/test/fixtures/typescript/ambient-type-declarations.diff+A.txt +++ b/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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (Identifier) (Other "type_arguments" (Other "union_type" (Other "union_type" (Other "predefined_type") (Other "predefined_type")) - (Other "type_reference" - (Identifier)))))))))+} + (Identifier))))))))+} diff --git a/test/fixtures/typescript/ambient-type-declarations.diff+B.txt b/test/fixtures/typescript/ambient-type-declarations.diff+B.txt index a64fc26a7..d05eb2a85 100644 --- a/test/fixtures/typescript/ambient-type-declarations.diff+B.txt +++ b/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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (Identifier) (Other "type_arguments" (Other "union_type" (Other "union_type" (Other "predefined_type") (Other "predefined_type")) - (Other "type_reference" - (Identifier))))))))+} + (Identifier)))))))+} diff --git a/test/fixtures/typescript/ambient-type-declarations.diff-A.txt b/test/fixtures/typescript/ambient-type-declarations.diff-A.txt index e8e51c44a..39234ef5d 100644 --- a/test/fixtures/typescript/ambient-type-declarations.diff-A.txt +++ b/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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (Identifier) (Other "type_arguments" (Other "union_type" (Other "union_type" (Other "predefined_type") (Other "predefined_type")) - (Other "type_reference" - (Identifier)))))))))-} + (Identifier))))))))-} diff --git a/test/fixtures/typescript/ambient-type-declarations.diff-B.txt b/test/fixtures/typescript/ambient-type-declarations.diff-B.txt index ee78fd596..9c32c23c5 100644 --- a/test/fixtures/typescript/ambient-type-declarations.diff-B.txt +++ b/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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (Identifier) (Other "type_arguments" (Other "union_type" (Other "union_type" (Other "predefined_type") (Other "predefined_type")) - (Other "type_reference" - (Identifier))))))))-} + (Identifier)))))))-} diff --git a/test/fixtures/typescript/ambient-type-declarations.diffA-B.txt b/test/fixtures/typescript/ambient-type-declarations.diffA-B.txt index fc13f6270..89e4550e0 100644 --- a/test/fixtures/typescript/ambient-type-declarations.diffA-B.txt +++ b/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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (Identifier) (Other "type_arguments" (Other "union_type" (Other "union_type" (Other "predefined_type") (Other "predefined_type")) - (Other "type_reference" - (Identifier))))))))-}) + (Identifier)))))))-}) diff --git a/test/fixtures/typescript/ambient-type-declarations.diffB-A.txt b/test/fixtures/typescript/ambient-type-declarations.diffB-A.txt index cd642c655..ce0cfb66c 100644 --- a/test/fixtures/typescript/ambient-type-declarations.diffB-A.txt +++ b/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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (Identifier) (Other "type_arguments" (Other "union_type" (Other "union_type" (Other "predefined_type") (Other "predefined_type")) - (Other "type_reference" - (Identifier)))))))-}) + (Identifier))))))-}) diff --git a/test/fixtures/typescript/ambient-type-declarations.parseA.txt b/test/fixtures/typescript/ambient-type-declarations.parseA.txt index 4aff95dc2..96dfc76e3 100644 --- a/test/fixtures/typescript/ambient-type-declarations.parseA.txt +++ b/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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (Identifier) (Other "type_arguments" (Other "union_type" (Other "union_type" (Other "predefined_type") (Other "predefined_type")) - (Other "type_reference" - (Identifier))))))))) + (Identifier)))))))) diff --git a/test/fixtures/typescript/ambient-type-declarations.parseB.txt b/test/fixtures/typescript/ambient-type-declarations.parseB.txt index 4479c30d8..0780d3dce 100644 --- a/test/fixtures/typescript/ambient-type-declarations.parseB.txt +++ b/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))) - (Other "type_reference" + (Identifier)) + (Other "generic_type" (Identifier) (Other "type_arguments" (Other "union_type" (Other "union_type" (Other "predefined_type") (Other "predefined_type")) - (Other "type_reference" - (Identifier)))))))) + (Identifier))))))) diff --git a/test/fixtures/typescript/array-type.diff+A.txt b/test/fixtures/typescript/array-type.diff+A.txt index c04b781b3..2d9298ea9 100644 --- a/test/fixtures/typescript/array-type.diff+A.txt +++ b/test/fixtures/typescript/array-type.diff+A.txt @@ -4,5 +4,4 @@ (Identifier) (Ty (Other "array_type" - (Other "type_reference" - (Identifier)))))))+} + (Identifier))))))+} diff --git a/test/fixtures/typescript/array-type.diff+B.txt b/test/fixtures/typescript/array-type.diff+B.txt index dc2b21ed7..d774e3e44 100644 --- a/test/fixtures/typescript/array-type.diff+B.txt +++ b/test/fixtures/typescript/array-type.diff+B.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "tuple_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))+} + (Identifier) + (Identifier))))))+} diff --git a/test/fixtures/typescript/array-type.diff-A.txt b/test/fixtures/typescript/array-type.diff-A.txt index dd9c3731f..99f163900 100644 --- a/test/fixtures/typescript/array-type.diff-A.txt +++ b/test/fixtures/typescript/array-type.diff-A.txt @@ -4,5 +4,4 @@ (Identifier) (Ty (Other "array_type" - (Other "type_reference" - (Identifier)))))))-} + (Identifier))))))-} diff --git a/test/fixtures/typescript/array-type.diff-B.txt b/test/fixtures/typescript/array-type.diff-B.txt index 9883bf31d..56296430c 100644 --- a/test/fixtures/typescript/array-type.diff-B.txt +++ b/test/fixtures/typescript/array-type.diff-B.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "tuple_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))-} + (Identifier) + (Identifier))))))-} diff --git a/test/fixtures/typescript/array-type.diffA-B.txt b/test/fixtures/typescript/array-type.diffA-B.txt index 12ae4b883..00c13b8ca 100644 --- a/test/fixtures/typescript/array-type.diffA-B.txt +++ b/test/fixtures/typescript/array-type.diffA-B.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "tuple_type" - (Other "type_reference" - (Identifier)) - {+(Other "type_reference" - (Identifier))+}))))) + (Identifier) + {+(Identifier)+}))))) diff --git a/test/fixtures/typescript/array-type.diffB-A.txt b/test/fixtures/typescript/array-type.diffB-A.txt index d9eab7744..40cab44f7 100644 --- a/test/fixtures/typescript/array-type.diffB-A.txt +++ b/test/fixtures/typescript/array-type.diffB-A.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "array_type" - (Other "type_reference" - (Identifier)) - {-(Other "type_reference" - (Identifier))-}))))) + (Identifier) + {-(Identifier)-}))))) diff --git a/test/fixtures/typescript/array-type.parseA.txt b/test/fixtures/typescript/array-type.parseA.txt index 5d5c3c807..65d2585df 100644 --- a/test/fixtures/typescript/array-type.parseA.txt +++ b/test/fixtures/typescript/array-type.parseA.txt @@ -4,5 +4,4 @@ (Identifier) (Ty (Other "array_type" - (Other "type_reference" - (Identifier))))))) + (Identifier)))))) diff --git a/test/fixtures/typescript/array-type.parseB.txt b/test/fixtures/typescript/array-type.parseB.txt index 291cb0055..ec40cb1bd 100644 --- a/test/fixtures/typescript/array-type.parseB.txt +++ b/test/fixtures/typescript/array-type.parseB.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "tuple_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier))))))) + (Identifier) + (Identifier)))))) diff --git a/test/fixtures/typescript/assignment-pattern.diff+A.txt b/test/fixtures/typescript/assignment-pattern.diff+A.txt index 2615fc2d9..ea330ea24 100644 --- a/test/fixtures/typescript/assignment-pattern.diff+A.txt +++ b/test/fixtures/typescript/assignment-pattern.diff+A.txt @@ -1,9 +1,8 @@ {+(Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier))))+} diff --git a/test/fixtures/typescript/assignment-pattern.diff+B.txt b/test/fixtures/typescript/assignment-pattern.diff+B.txt index 2615fc2d9..ea330ea24 100644 --- a/test/fixtures/typescript/assignment-pattern.diff+B.txt +++ b/test/fixtures/typescript/assignment-pattern.diff+B.txt @@ -1,9 +1,8 @@ {+(Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier))))+} diff --git a/test/fixtures/typescript/assignment-pattern.diff-A.txt b/test/fixtures/typescript/assignment-pattern.diff-A.txt index ce07f56c9..4ddb214b7 100644 --- a/test/fixtures/typescript/assignment-pattern.diff-A.txt +++ b/test/fixtures/typescript/assignment-pattern.diff-A.txt @@ -1,9 +1,8 @@ {-(Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier))))-} diff --git a/test/fixtures/typescript/assignment-pattern.diff-B.txt b/test/fixtures/typescript/assignment-pattern.diff-B.txt index ce07f56c9..4ddb214b7 100644 --- a/test/fixtures/typescript/assignment-pattern.diff-B.txt +++ b/test/fixtures/typescript/assignment-pattern.diff-B.txt @@ -1,9 +1,8 @@ {-(Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier))))-} diff --git a/test/fixtures/typescript/assignment-pattern.diffA-B.txt b/test/fixtures/typescript/assignment-pattern.diffA-B.txt index aab06139e..fedace830 100644 --- a/test/fixtures/typescript/assignment-pattern.diffA-B.txt +++ b/test/fixtures/typescript/assignment-pattern.diffA-B.txt @@ -1,11 +1,10 @@ (Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - { (Identifier) - ->(Identifier) } - { (NumberLiteral) - ->(NumberLiteral) }))) + (Other "object_pattern" + (Other "assignment_pattern" + { (Identifier) + ->(Identifier) } + { (NumberLiteral) + ->(NumberLiteral) })) (Identifier)))) diff --git a/test/fixtures/typescript/assignment-pattern.diffB-A.txt b/test/fixtures/typescript/assignment-pattern.diffB-A.txt index aab06139e..fedace830 100644 --- a/test/fixtures/typescript/assignment-pattern.diffB-A.txt +++ b/test/fixtures/typescript/assignment-pattern.diffB-A.txt @@ -1,11 +1,10 @@ (Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - { (Identifier) - ->(Identifier) } - { (NumberLiteral) - ->(NumberLiteral) }))) + (Other "object_pattern" + (Other "assignment_pattern" + { (Identifier) + ->(Identifier) } + { (NumberLiteral) + ->(NumberLiteral) })) (Identifier)))) diff --git a/test/fixtures/typescript/assignment-pattern.parseA.txt b/test/fixtures/typescript/assignment-pattern.parseA.txt index 7586c6680..0678b8e66 100644 --- a/test/fixtures/typescript/assignment-pattern.parseA.txt +++ b/test/fixtures/typescript/assignment-pattern.parseA.txt @@ -1,9 +1,8 @@ (Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier)))) diff --git a/test/fixtures/typescript/assignment-pattern.parseB.txt b/test/fixtures/typescript/assignment-pattern.parseB.txt index 7586c6680..0678b8e66 100644 --- a/test/fixtures/typescript/assignment-pattern.parseB.txt +++ b/test/fixtures/typescript/assignment-pattern.parseB.txt @@ -1,9 +1,8 @@ (Program (Other "variable_declaration" (VarAssignment - (Other "destructuring_pattern" - (Object - (Other "assignment_pattern" - (Identifier) - (NumberLiteral)))) + (Other "object_pattern" + (Other "assignment_pattern" + (Identifier) + (NumberLiteral))) (Identifier)))) diff --git a/test/fixtures/typescript/class.diff+A.txt b/test/fixtures/typescript/class.diff+A.txt index b63d43c6d..f7d5aa677 100644 --- a/test/fixtures/typescript/class.diff+A.txt +++ b/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)) diff --git a/test/fixtures/typescript/class.diff+B.txt b/test/fixtures/typescript/class.diff+B.txt index f30e94ecd..57f6f3145 100644 --- a/test/fixtures/typescript/class.diff+B.txt +++ b/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 diff --git a/test/fixtures/typescript/class.diff-A.txt b/test/fixtures/typescript/class.diff-A.txt index 219d585aa..2c96c0694 100644 --- a/test/fixtures/typescript/class.diff-A.txt +++ b/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)) diff --git a/test/fixtures/typescript/class.diff-B.txt b/test/fixtures/typescript/class.diff-B.txt index ec7b789c8..baa3b0829 100644 --- a/test/fixtures/typescript/class.diff-B.txt +++ b/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 diff --git a/test/fixtures/typescript/class.diffA-B.txt b/test/fixtures/typescript/class.diffA-B.txt index cf20d4323..ac51bf1ca 100644 --- a/test/fixtures/typescript/class.diffA-B.txt +++ b/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 diff --git a/test/fixtures/typescript/class.diffB-A.txt b/test/fixtures/typescript/class.diffB-A.txt index f903f79ef..387e5ccca 100644 --- a/test/fixtures/typescript/class.diffB-A.txt +++ b/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))+} diff --git a/test/fixtures/typescript/class.parseA.txt b/test/fixtures/typescript/class.parseA.txt index 9cea3a91b..3cd8e2959 100644 --- a/test/fixtures/typescript/class.parseA.txt +++ b/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)) diff --git a/test/fixtures/typescript/class.parseB.txt b/test/fixtures/typescript/class.parseB.txt index afd9a4390..48da75011 100644 --- a/test/fixtures/typescript/class.parseB.txt +++ b/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 diff --git a/test/fixtures/typescript/constructor-call.diff+A.txt b/test/fixtures/typescript/constructor-call.diff+A.txt index 4c12295af..d92216c44 100644 --- a/test/fixtures/typescript/constructor-call.diff+A.txt +++ b/test/fixtures/typescript/constructor-call.diff+A.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral)))))+} diff --git a/test/fixtures/typescript/constructor-call.diff+B.txt b/test/fixtures/typescript/constructor-call.diff+B.txt index 4c12295af..d92216c44 100644 --- a/test/fixtures/typescript/constructor-call.diff+B.txt +++ b/test/fixtures/typescript/constructor-call.diff+B.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral)))))+} diff --git a/test/fixtures/typescript/constructor-call.diff-A.txt b/test/fixtures/typescript/constructor-call.diff-A.txt index e5ed42b57..5e2573b4c 100644 --- a/test/fixtures/typescript/constructor-call.diff-A.txt +++ b/test/fixtures/typescript/constructor-call.diff-A.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral)))))-} diff --git a/test/fixtures/typescript/constructor-call.diff-B.txt b/test/fixtures/typescript/constructor-call.diff-B.txt index e5ed42b57..5e2573b4c 100644 --- a/test/fixtures/typescript/constructor-call.diff-B.txt +++ b/test/fixtures/typescript/constructor-call.diff-B.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral)))))-} diff --git a/test/fixtures/typescript/constructor-call.diffA-B.txt b/test/fixtures/typescript/constructor-call.diffA-B.txt index e815f5b3a..653e57bb7 100644 --- a/test/fixtures/typescript/constructor-call.diffA-B.txt +++ b/test/fixtures/typescript/constructor-call.diffA-B.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) { (StringLiteral) diff --git a/test/fixtures/typescript/constructor-call.diffB-A.txt b/test/fixtures/typescript/constructor-call.diffB-A.txt index e815f5b3a..653e57bb7 100644 --- a/test/fixtures/typescript/constructor-call.diffB-A.txt +++ b/test/fixtures/typescript/constructor-call.diffB-A.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) { (StringLiteral) diff --git a/test/fixtures/typescript/constructor-call.parseA.txt b/test/fixtures/typescript/constructor-call.parseA.txt index e66a2b711..d09bd1e9e 100644 --- a/test/fixtures/typescript/constructor-call.parseA.txt +++ b/test/fixtures/typescript/constructor-call.parseA.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral))))) diff --git a/test/fixtures/typescript/constructor-call.parseB.txt b/test/fixtures/typescript/constructor-call.parseB.txt index e66a2b711..d09bd1e9e 100644 --- a/test/fixtures/typescript/constructor-call.parseB.txt +++ b/test/fixtures/typescript/constructor-call.parseB.txt @@ -2,7 +2,7 @@ (ExpressionStatements (Constructor (FunctionCall - (Other "reserved_identifier") + (Identifier) (Identifier) (NumberLiteral) (StringLiteral))))) diff --git a/test/fixtures/typescript/function-call.diff+A.txt b/test/fixtures/typescript/function-call.diff+A.txt index c1bf6e34d..77c06d2c7 100644 --- a/test/fixtures/typescript/function-call.diff+A.txt +++ b/test/fixtures/typescript/function-call.diff+A.txt @@ -3,7 +3,6 @@ (FunctionCall (Identifier) (Other "type_arguments" - (Other "type_reference" - (Identifier))) + (Identifier)) (Identifier) (StringLiteral))))+} diff --git a/test/fixtures/typescript/function-call.diff+B.txt b/test/fixtures/typescript/function-call.diff+B.txt index c1bf6e34d..77c06d2c7 100644 --- a/test/fixtures/typescript/function-call.diff+B.txt +++ b/test/fixtures/typescript/function-call.diff+B.txt @@ -3,7 +3,6 @@ (FunctionCall (Identifier) (Other "type_arguments" - (Other "type_reference" - (Identifier))) + (Identifier)) (Identifier) (StringLiteral))))+} diff --git a/test/fixtures/typescript/function-call.diff-A.txt b/test/fixtures/typescript/function-call.diff-A.txt index 864446e7a..5a90323d1 100644 --- a/test/fixtures/typescript/function-call.diff-A.txt +++ b/test/fixtures/typescript/function-call.diff-A.txt @@ -3,7 +3,6 @@ (FunctionCall (Identifier) (Other "type_arguments" - (Other "type_reference" - (Identifier))) + (Identifier)) (Identifier) (StringLiteral))))-} diff --git a/test/fixtures/typescript/function-call.diff-B.txt b/test/fixtures/typescript/function-call.diff-B.txt index 864446e7a..5a90323d1 100644 --- a/test/fixtures/typescript/function-call.diff-B.txt +++ b/test/fixtures/typescript/function-call.diff-B.txt @@ -3,7 +3,6 @@ (FunctionCall (Identifier) (Other "type_arguments" - (Other "type_reference" - (Identifier))) + (Identifier)) (Identifier) (StringLiteral))))-} diff --git a/test/fixtures/typescript/function-call.diffA-B.txt b/test/fixtures/typescript/function-call.diffA-B.txt index c604b33fa..81766d94b 100644 --- a/test/fixtures/typescript/function-call.diffA-B.txt +++ b/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) }))) diff --git a/test/fixtures/typescript/function-call.diffB-A.txt b/test/fixtures/typescript/function-call.diffB-A.txt index c604b33fa..81766d94b 100644 --- a/test/fixtures/typescript/function-call.diffB-A.txt +++ b/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) }))) diff --git a/test/fixtures/typescript/function-call.parseA.txt b/test/fixtures/typescript/function-call.parseA.txt index b0f6bb1e3..47e48f6ea 100644 --- a/test/fixtures/typescript/function-call.parseA.txt +++ b/test/fixtures/typescript/function-call.parseA.txt @@ -3,7 +3,6 @@ (FunctionCall (Identifier) (Other "type_arguments" - (Other "type_reference" - (Identifier))) + (Identifier)) (Identifier) (StringLiteral)))) diff --git a/test/fixtures/typescript/function-call.parseB.txt b/test/fixtures/typescript/function-call.parseB.txt index b0f6bb1e3..47e48f6ea 100644 --- a/test/fixtures/typescript/function-call.parseB.txt +++ b/test/fixtures/typescript/function-call.parseB.txt @@ -3,7 +3,6 @@ (FunctionCall (Identifier) (Other "type_arguments" - (Other "type_reference" - (Identifier))) + (Identifier)) (Identifier) (StringLiteral)))) diff --git a/test/fixtures/typescript/function-type.diff+A.txt b/test/fixtures/typescript/function-type.diff+A.txt index 39f6ed74a..98bdcc287 100644 --- a/test/fixtures/typescript/function-type.diff+A.txt +++ b/test/fixtures/typescript/function-type.diff+A.txt @@ -5,5 +5,4 @@ (Ty (Other "function_type" (Params) - (Other "type_reference" - (Identifier)))))))+} + (Identifier))))))+} diff --git a/test/fixtures/typescript/function-type.diff+B.txt b/test/fixtures/typescript/function-type.diff+B.txt index c04b781b3..2d9298ea9 100644 --- a/test/fixtures/typescript/function-type.diff+B.txt +++ b/test/fixtures/typescript/function-type.diff+B.txt @@ -4,5 +4,4 @@ (Identifier) (Ty (Other "array_type" - (Other "type_reference" - (Identifier)))))))+} + (Identifier))))))+} diff --git a/test/fixtures/typescript/function-type.diff-A.txt b/test/fixtures/typescript/function-type.diff-A.txt index eab2bd94a..0ceb637cc 100644 --- a/test/fixtures/typescript/function-type.diff-A.txt +++ b/test/fixtures/typescript/function-type.diff-A.txt @@ -5,5 +5,4 @@ (Ty (Other "function_type" (Params) - (Other "type_reference" - (Identifier)))))))-} + (Identifier))))))-} diff --git a/test/fixtures/typescript/function-type.diff-B.txt b/test/fixtures/typescript/function-type.diff-B.txt index dd9c3731f..99f163900 100644 --- a/test/fixtures/typescript/function-type.diff-B.txt +++ b/test/fixtures/typescript/function-type.diff-B.txt @@ -4,5 +4,4 @@ (Identifier) (Ty (Other "array_type" - (Other "type_reference" - (Identifier)))))))-} + (Identifier))))))-} diff --git a/test/fixtures/typescript/function-type.diffA-B.txt b/test/fixtures/typescript/function-type.diffA-B.txt index 8539486c3..f24c09421 100644 --- a/test/fixtures/typescript/function-type.diffA-B.txt +++ b/test/fixtures/typescript/function-type.diffA-B.txt @@ -5,5 +5,4 @@ (Ty (Other "array_type" {-(Params)-} - (Other "type_reference" - (Identifier))))))) + (Identifier)))))) diff --git a/test/fixtures/typescript/function-type.diffB-A.txt b/test/fixtures/typescript/function-type.diffB-A.txt index e3963547c..be4b477cf 100644 --- a/test/fixtures/typescript/function-type.diffB-A.txt +++ b/test/fixtures/typescript/function-type.diffB-A.txt @@ -5,5 +5,4 @@ (Ty (Other "function_type" {+(Params)+} - (Other "type_reference" - (Identifier))))))) + (Identifier)))))) diff --git a/test/fixtures/typescript/function-type.parseA.txt b/test/fixtures/typescript/function-type.parseA.txt index 6917e9688..578051b93 100644 --- a/test/fixtures/typescript/function-type.parseA.txt +++ b/test/fixtures/typescript/function-type.parseA.txt @@ -5,5 +5,4 @@ (Ty (Other "function_type" (Params) - (Other "type_reference" - (Identifier))))))) + (Identifier)))))) diff --git a/test/fixtures/typescript/function-type.parseB.txt b/test/fixtures/typescript/function-type.parseB.txt index 5d5c3c807..65d2585df 100644 --- a/test/fixtures/typescript/function-type.parseB.txt +++ b/test/fixtures/typescript/function-type.parseB.txt @@ -4,5 +4,4 @@ (Identifier) (Ty (Other "array_type" - (Other "type_reference" - (Identifier))))))) + (Identifier)))))) diff --git a/test/fixtures/typescript/function.diff+B.txt b/test/fixtures/typescript/function.diff+B.txt index a6ddab43b..771e89ea7 100644 --- a/test/fixtures/typescript/function.diff+B.txt +++ b/test/fixtures/typescript/function.diff+B.txt @@ -6,7 +6,6 @@ (Other "required_parameter" (Identifier))) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (ExpressionStatements (Identifier))))+} diff --git a/test/fixtures/typescript/function.diff-B.txt b/test/fixtures/typescript/function.diff-B.txt index f8bc57be9..d5e31b75e 100644 --- a/test/fixtures/typescript/function.diff-B.txt +++ b/test/fixtures/typescript/function.diff-B.txt @@ -6,7 +6,6 @@ (Other "required_parameter" (Identifier))) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (ExpressionStatements (Identifier))))-} diff --git a/test/fixtures/typescript/function.diffA-B.txt b/test/fixtures/typescript/function.diffA-B.txt index 001a62373..dcb94055b 100644 --- a/test/fixtures/typescript/function.diffA-B.txt +++ b/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 diff --git a/test/fixtures/typescript/function.diffB-A.txt b/test/fixtures/typescript/function.diffB-A.txt index 753116a6b..7d4e71816 100644 --- a/test/fixtures/typescript/function.diffB-A.txt +++ b/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)) diff --git a/test/fixtures/typescript/function.parseB.txt b/test/fixtures/typescript/function.parseB.txt index 7d2ae43a7..36fa981df 100644 --- a/test/fixtures/typescript/function.parseB.txt +++ b/test/fixtures/typescript/function.parseB.txt @@ -6,7 +6,6 @@ (Other "required_parameter" (Identifier))) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (ExpressionStatements (Identifier)))) diff --git a/test/fixtures/typescript/interface.diff+A.txt b/test/fixtures/typescript/interface.diff+A.txt index 11daa681d..e52939d51 100644 --- a/test/fixtures/typescript/interface.diff+A.txt +++ b/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)))))+} diff --git a/test/fixtures/typescript/interface.diff+B.txt b/test/fixtures/typescript/interface.diff+B.txt index 78a9928f0..f2df3fae0 100644 --- a/test/fixtures/typescript/interface.diff+B.txt +++ b/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)))))+} diff --git a/test/fixtures/typescript/interface.diff-A.txt b/test/fixtures/typescript/interface.diff-A.txt index 7be7c366a..6b7016949 100644 --- a/test/fixtures/typescript/interface.diff-A.txt +++ b/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)))))-} diff --git a/test/fixtures/typescript/interface.diff-B.txt b/test/fixtures/typescript/interface.diff-B.txt index a18d2b864..aa693534f 100644 --- a/test/fixtures/typescript/interface.diff-B.txt +++ b/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)))))-} diff --git a/test/fixtures/typescript/interface.diffA-B.txt b/test/fixtures/typescript/interface.diffA-B.txt index bbcc65206..e03d1e1f3 100644 --- a/test/fixtures/typescript/interface.diffA-B.txt +++ b/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) })))) diff --git a/test/fixtures/typescript/interface.diffB-A.txt b/test/fixtures/typescript/interface.diffB-A.txt index 321f14cdd..7f114c88e 100644 --- a/test/fixtures/typescript/interface.diffB-A.txt +++ b/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) })))) diff --git a/test/fixtures/typescript/interface.parseA.txt b/test/fixtures/typescript/interface.parseA.txt index 45aa609f7..ef4f9c95a 100644 --- a/test/fixtures/typescript/interface.parseA.txt +++ b/test/fixtures/typescript/interface.parseA.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))))) diff --git a/test/fixtures/typescript/interface.parseB.txt b/test/fixtures/typescript/interface.parseB.txt index 00c7ca26b..22a1ecf4c 100644 --- a/test/fixtures/typescript/interface.parseB.txt +++ b/test/fixtures/typescript/interface.parseB.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))))) diff --git a/test/fixtures/typescript/intersection-type.diff+A.txt b/test/fixtures/typescript/intersection-type.diff+A.txt index a821e2c4f..c5a3110fb 100644 --- a/test/fixtures/typescript/intersection-type.diff+A.txt +++ b/test/fixtures/typescript/intersection-type.diff+A.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "union_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))+} + (Identifier) + (Identifier))))))+} diff --git a/test/fixtures/typescript/intersection-type.diff+B.txt b/test/fixtures/typescript/intersection-type.diff+B.txt index 80583e0c4..4689c4609 100644 --- a/test/fixtures/typescript/intersection-type.diff+B.txt +++ b/test/fixtures/typescript/intersection-type.diff+B.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))+} + (Identifier) + (Identifier))))))+} diff --git a/test/fixtures/typescript/intersection-type.diff-A.txt b/test/fixtures/typescript/intersection-type.diff-A.txt index 4d4c7a4d7..50d17aac2 100644 --- a/test/fixtures/typescript/intersection-type.diff-A.txt +++ b/test/fixtures/typescript/intersection-type.diff-A.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "union_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))-} + (Identifier) + (Identifier))))))-} diff --git a/test/fixtures/typescript/intersection-type.diff-B.txt b/test/fixtures/typescript/intersection-type.diff-B.txt index a2428e129..c76e600b5 100644 --- a/test/fixtures/typescript/intersection-type.diff-B.txt +++ b/test/fixtures/typescript/intersection-type.diff-B.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))-} + (Identifier) + (Identifier))))))-} diff --git a/test/fixtures/typescript/intersection-type.diffA-B.txt b/test/fixtures/typescript/intersection-type.diffA-B.txt index 4629efba6..e40404c95 100644 --- a/test/fixtures/typescript/intersection-type.diffA-B.txt +++ b/test/fixtures/typescript/intersection-type.diffA-B.txt @@ -4,9 +4,7 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - { (Identifier) - ->(Identifier) }) - (Other "type_reference" - { (Identifier) - ->(Identifier) })))))) + { (Identifier) + ->(Identifier) } + { (Identifier) + ->(Identifier) }))))) diff --git a/test/fixtures/typescript/intersection-type.diffB-A.txt b/test/fixtures/typescript/intersection-type.diffB-A.txt index 39c268a76..61b95a1f9 100644 --- a/test/fixtures/typescript/intersection-type.diffB-A.txt +++ b/test/fixtures/typescript/intersection-type.diffB-A.txt @@ -4,9 +4,7 @@ (Identifier) (Ty (Other "union_type" - (Other "type_reference" - { (Identifier) - ->(Identifier) }) - (Other "type_reference" - { (Identifier) - ->(Identifier) })))))) + { (Identifier) + ->(Identifier) } + { (Identifier) + ->(Identifier) }))))) diff --git a/test/fixtures/typescript/intersection-type.parseA.txt b/test/fixtures/typescript/intersection-type.parseA.txt index 28a2da044..46b20ff13 100644 --- a/test/fixtures/typescript/intersection-type.parseA.txt +++ b/test/fixtures/typescript/intersection-type.parseA.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "union_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier))))))) + (Identifier) + (Identifier)))))) diff --git a/test/fixtures/typescript/intersection-type.parseB.txt b/test/fixtures/typescript/intersection-type.parseB.txt index 8653db7f8..c3ce32a3f 100644 --- a/test/fixtures/typescript/intersection-type.parseB.txt +++ b/test/fixtures/typescript/intersection-type.parseB.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier))))))) + (Identifier) + (Identifier)))))) diff --git a/test/fixtures/typescript/method-definition.diff+A.txt b/test/fixtures/typescript/method-definition.diff+A.txt index 7bb447520..ebd620ee6 100644 --- a/test/fixtures/typescript/method-definition.diff+A.txt +++ b/test/fixtures/typescript/method-definition.diff+A.txt @@ -7,5 +7,4 @@ (Identifier) (Params) (Ty - (Other "type_reference" - (Identifier)))))))+} + (Identifier))))))+} diff --git a/test/fixtures/typescript/method-definition.diff+B.txt b/test/fixtures/typescript/method-definition.diff+B.txt index 9aff9da23..ac46acf1e 100644 --- a/test/fixtures/typescript/method-definition.diff+B.txt +++ b/test/fixtures/typescript/method-definition.diff+B.txt @@ -5,7 +5,6 @@ (Method (Other "accessibility_modifier") (Other "readonly") - (Other "reserved_identifier") (Identifier) (Params) (Ty diff --git a/test/fixtures/typescript/method-definition.diff-A.txt b/test/fixtures/typescript/method-definition.diff-A.txt index 77165c12d..fb856c191 100644 --- a/test/fixtures/typescript/method-definition.diff-A.txt +++ b/test/fixtures/typescript/method-definition.diff-A.txt @@ -7,5 +7,4 @@ (Identifier) (Params) (Ty - (Other "type_reference" - (Identifier)))))))-} + (Identifier))))))-} diff --git a/test/fixtures/typescript/method-definition.diff-B.txt b/test/fixtures/typescript/method-definition.diff-B.txt index cb29f6918..a758a4ca6 100644 --- a/test/fixtures/typescript/method-definition.diff-B.txt +++ b/test/fixtures/typescript/method-definition.diff-B.txt @@ -5,7 +5,6 @@ (Method (Other "accessibility_modifier") (Other "readonly") - (Other "reserved_identifier") (Identifier) (Params) (Ty diff --git a/test/fixtures/typescript/method-definition.diffA-B.txt b/test/fixtures/typescript/method-definition.diffA-B.txt index c5737a673..4c08f4260 100644 --- a/test/fixtures/typescript/method-definition.diffA-B.txt +++ b/test/fixtures/typescript/method-definition.diffA-B.txt @@ -5,10 +5,8 @@ (Method (Other "accessibility_modifier") {+(Other "readonly")+} - {+(Other "reserved_identifier")+} (Identifier) (Params) (Ty - { (Other "type_reference" - (Identifier)) + { (Identifier) ->(Other "predefined_type") }))))) diff --git a/test/fixtures/typescript/method-definition.diffB-A.txt b/test/fixtures/typescript/method-definition.diffB-A.txt index f58ee1425..f1707e551 100644 --- a/test/fixtures/typescript/method-definition.diffB-A.txt +++ b/test/fixtures/typescript/method-definition.diffB-A.txt @@ -5,10 +5,8 @@ (Method (Other "accessibility_modifier") {-(Other "readonly")-} - {-(Other "reserved_identifier")-} (Identifier) (Params) (Ty { (Other "predefined_type") - ->(Other "type_reference" - (Identifier)) }))))) + ->(Identifier) }))))) diff --git a/test/fixtures/typescript/method-definition.parseA.txt b/test/fixtures/typescript/method-definition.parseA.txt index 40fb06b44..5c59f5849 100644 --- a/test/fixtures/typescript/method-definition.parseA.txt +++ b/test/fixtures/typescript/method-definition.parseA.txt @@ -7,5 +7,4 @@ (Identifier) (Params) (Ty - (Other "type_reference" - (Identifier))))))) + (Identifier)))))) diff --git a/test/fixtures/typescript/method-definition.parseB.txt b/test/fixtures/typescript/method-definition.parseB.txt index 3eb0017f5..6cd4e1c6b 100644 --- a/test/fixtures/typescript/method-definition.parseB.txt +++ b/test/fixtures/typescript/method-definition.parseB.txt @@ -5,7 +5,6 @@ (Method (Other "accessibility_modifier") (Other "readonly") - (Other "reserved_identifier") (Identifier) (Params) (Ty diff --git a/test/fixtures/typescript/public-field-definition.diff+A.txt b/test/fixtures/typescript/public-field-definition.diff+A.txt index 1eadacdea..7956b0bc1 100644 --- a/test/fixtures/typescript/public-field-definition.diff+A.txt +++ b/test/fixtures/typescript/public-field-definition.diff+A.txt @@ -22,40 +22,34 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) diff --git a/test/fixtures/typescript/public-field-definition.diff+B.txt b/test/fixtures/typescript/public-field-definition.diff+B.txt index 1c00d7375..76196433b 100644 --- a/test/fixtures/typescript/public-field-definition.diff+B.txt +++ b/test/fixtures/typescript/public-field-definition.diff+B.txt @@ -17,48 +17,41 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "accessibility_modifier") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "accessibility_modifier") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "accessibility_modifier") (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (StringLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) diff --git a/test/fixtures/typescript/public-field-definition.diff-A.txt b/test/fixtures/typescript/public-field-definition.diff-A.txt index 8703ddc3c..c45fea298 100644 --- a/test/fixtures/typescript/public-field-definition.diff-A.txt +++ b/test/fixtures/typescript/public-field-definition.diff-A.txt @@ -22,40 +22,34 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) diff --git a/test/fixtures/typescript/public-field-definition.diff-B.txt b/test/fixtures/typescript/public-field-definition.diff-B.txt index c4012107a..936d6630e 100644 --- a/test/fixtures/typescript/public-field-definition.diff-B.txt +++ b/test/fixtures/typescript/public-field-definition.diff-B.txt @@ -17,48 +17,41 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "accessibility_modifier") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "accessibility_modifier") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "accessibility_modifier") (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (StringLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) diff --git a/test/fixtures/typescript/public-field-definition.diffA-B.txt b/test/fixtures/typescript/public-field-definition.diffA-B.txt index f33f82e47..1094f00d7 100644 --- a/test/fixtures/typescript/public-field-definition.diffA-B.txt +++ b/test/fixtures/typescript/public-field-definition.diffA-B.txt @@ -17,15 +17,13 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))+} {+(FieldDecl (Other "accessibility_modifier") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))+} {-(FieldDecl (Other "accessibility_modifier") @@ -37,42 +35,36 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))-} (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl { (Other "readonly") ->(Other "accessibility_modifier") } (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) {+(FieldDecl (Other "accessibility_modifier") (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (StringLiteral))+} {+(FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))+} {+(FieldDecl (Identifier) @@ -81,14 +73,12 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))-} {-(FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))-} {-(FieldDecl (Identifier) diff --git a/test/fixtures/typescript/public-field-definition.diffB-A.txt b/test/fixtures/typescript/public-field-definition.diffB-A.txt index 51659ed0d..7e69ac6fe 100644 --- a/test/fixtures/typescript/public-field-definition.diffB-A.txt +++ b/test/fixtures/typescript/public-field-definition.diffB-A.txt @@ -23,48 +23,41 @@ { (Identifier) ->(Identifier) } (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) {-(FieldDecl (Other "accessibility_modifier") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))-} (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl { (Other "accessibility_modifier") ->(Other "readonly") } (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) {+(FieldDecl (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))+} {+(FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))+} {+(FieldDecl (Identifier) @@ -74,14 +67,12 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (StringLiteral))-} {-(FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral))-} {-(FieldDecl (Identifier) diff --git a/test/fixtures/typescript/public-field-definition.parseA.txt b/test/fixtures/typescript/public-field-definition.parseA.txt index 1a2e503cb..b892debc5 100644 --- a/test/fixtures/typescript/public-field-definition.parseA.txt +++ b/test/fixtures/typescript/public-field-definition.parseA.txt @@ -22,40 +22,34 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) diff --git a/test/fixtures/typescript/public-field-definition.parseB.txt b/test/fixtures/typescript/public-field-definition.parseB.txt index 242065f3e..f2c67e96b 100644 --- a/test/fixtures/typescript/public-field-definition.parseB.txt +++ b/test/fixtures/typescript/public-field-definition.parseB.txt @@ -17,48 +17,41 @@ (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "accessibility_modifier") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "accessibility_modifier") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Other "accessibility_modifier") (Other "readonly") (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (StringLiteral)) (FieldDecl (Identifier) (Ty - (Other "type_reference" - (Identifier))) + (Identifier)) (NumberLiteral)) (FieldDecl (Identifier) diff --git a/test/fixtures/typescript/template-string.diff+A.txt b/test/fixtures/typescript/template-string.diff+A.txt index 0e97d63e2..7a7bda735 100644 --- a/test/fixtures/typescript/template-string.diff+A.txt +++ b/test/fixtures/typescript/template-string.diff+A.txt @@ -1,4 +1,3 @@ {+(Program (ExpressionStatements - (TemplateString - (TemplateString))))+} + (TemplateString)))+} diff --git a/test/fixtures/typescript/template-string.diff+B.txt b/test/fixtures/typescript/template-string.diff+B.txt index 0e97d63e2..7a7bda735 100644 --- a/test/fixtures/typescript/template-string.diff+B.txt +++ b/test/fixtures/typescript/template-string.diff+B.txt @@ -1,4 +1,3 @@ {+(Program (ExpressionStatements - (TemplateString - (TemplateString))))+} + (TemplateString)))+} diff --git a/test/fixtures/typescript/template-string.diff-A.txt b/test/fixtures/typescript/template-string.diff-A.txt index 8c8cd3296..2376a4fc5 100644 --- a/test/fixtures/typescript/template-string.diff-A.txt +++ b/test/fixtures/typescript/template-string.diff-A.txt @@ -1,4 +1,3 @@ {-(Program (ExpressionStatements - (TemplateString - (TemplateString))))-} + (TemplateString)))-} diff --git a/test/fixtures/typescript/template-string.diff-B.txt b/test/fixtures/typescript/template-string.diff-B.txt index 8c8cd3296..2376a4fc5 100644 --- a/test/fixtures/typescript/template-string.diff-B.txt +++ b/test/fixtures/typescript/template-string.diff-B.txt @@ -1,4 +1,3 @@ {-(Program (ExpressionStatements - (TemplateString - (TemplateString))))-} + (TemplateString)))-} diff --git a/test/fixtures/typescript/template-string.diffA-B.txt b/test/fixtures/typescript/template-string.diffA-B.txt index 665643187..2ba8a38b1 100644 --- a/test/fixtures/typescript/template-string.diffA-B.txt +++ b/test/fixtures/typescript/template-string.diffA-B.txt @@ -1,5 +1,4 @@ (Program (ExpressionStatements - (TemplateString - { (TemplateString) - ->(TemplateString) }))) + { (TemplateString) + ->(TemplateString) })) diff --git a/test/fixtures/typescript/template-string.diffB-A.txt b/test/fixtures/typescript/template-string.diffB-A.txt index 665643187..2ba8a38b1 100644 --- a/test/fixtures/typescript/template-string.diffB-A.txt +++ b/test/fixtures/typescript/template-string.diffB-A.txt @@ -1,5 +1,4 @@ (Program (ExpressionStatements - (TemplateString - { (TemplateString) - ->(TemplateString) }))) + { (TemplateString) + ->(TemplateString) })) diff --git a/test/fixtures/typescript/template-string.parseA.txt b/test/fixtures/typescript/template-string.parseA.txt index f0023b624..b54e6832d 100644 --- a/test/fixtures/typescript/template-string.parseA.txt +++ b/test/fixtures/typescript/template-string.parseA.txt @@ -1,4 +1,3 @@ (Program (ExpressionStatements - (TemplateString - (TemplateString)))) + (TemplateString))) diff --git a/test/fixtures/typescript/template-string.parseB.txt b/test/fixtures/typescript/template-string.parseB.txt index f0023b624..b54e6832d 100644 --- a/test/fixtures/typescript/template-string.parseB.txt +++ b/test/fixtures/typescript/template-string.parseB.txt @@ -1,4 +1,3 @@ (Program (ExpressionStatements - (TemplateString - (TemplateString)))) + (TemplateString))) diff --git a/test/fixtures/typescript/tuple-type.diff+A.txt b/test/fixtures/typescript/tuple-type.diff+A.txt index dc2b21ed7..d774e3e44 100644 --- a/test/fixtures/typescript/tuple-type.diff+A.txt +++ b/test/fixtures/typescript/tuple-type.diff+A.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "tuple_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))+} + (Identifier) + (Identifier))))))+} diff --git a/test/fixtures/typescript/tuple-type.diff+B.txt b/test/fixtures/typescript/tuple-type.diff+B.txt index 80583e0c4..4689c4609 100644 --- a/test/fixtures/typescript/tuple-type.diff+B.txt +++ b/test/fixtures/typescript/tuple-type.diff+B.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))+} + (Identifier) + (Identifier))))))+} diff --git a/test/fixtures/typescript/tuple-type.diff-A.txt b/test/fixtures/typescript/tuple-type.diff-A.txt index 9883bf31d..56296430c 100644 --- a/test/fixtures/typescript/tuple-type.diff-A.txt +++ b/test/fixtures/typescript/tuple-type.diff-A.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "tuple_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))-} + (Identifier) + (Identifier))))))-} diff --git a/test/fixtures/typescript/tuple-type.diff-B.txt b/test/fixtures/typescript/tuple-type.diff-B.txt index a2428e129..c76e600b5 100644 --- a/test/fixtures/typescript/tuple-type.diff-B.txt +++ b/test/fixtures/typescript/tuple-type.diff-B.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))-} + (Identifier) + (Identifier))))))-} diff --git a/test/fixtures/typescript/tuple-type.diffA-B.txt b/test/fixtures/typescript/tuple-type.diffA-B.txt index 8653db7f8..c3ce32a3f 100644 --- a/test/fixtures/typescript/tuple-type.diffA-B.txt +++ b/test/fixtures/typescript/tuple-type.diffA-B.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier))))))) + (Identifier) + (Identifier)))))) diff --git a/test/fixtures/typescript/tuple-type.diffB-A.txt b/test/fixtures/typescript/tuple-type.diffB-A.txt index 291cb0055..ec40cb1bd 100644 --- a/test/fixtures/typescript/tuple-type.diffB-A.txt +++ b/test/fixtures/typescript/tuple-type.diffB-A.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "tuple_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier))))))) + (Identifier) + (Identifier)))))) diff --git a/test/fixtures/typescript/tuple-type.parseA.txt b/test/fixtures/typescript/tuple-type.parseA.txt index 291cb0055..ec40cb1bd 100644 --- a/test/fixtures/typescript/tuple-type.parseA.txt +++ b/test/fixtures/typescript/tuple-type.parseA.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "tuple_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier))))))) + (Identifier) + (Identifier)))))) diff --git a/test/fixtures/typescript/tuple-type.parseB.txt b/test/fixtures/typescript/tuple-type.parseB.txt index 8653db7f8..c3ce32a3f 100644 --- a/test/fixtures/typescript/tuple-type.parseB.txt +++ b/test/fixtures/typescript/tuple-type.parseB.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier))))))) + (Identifier) + (Identifier)))))) diff --git a/test/fixtures/typescript/typeof-types.diff+A.txt b/test/fixtures/typescript/typeof-types.diff+A.txt index ef0bfc041..fefb46a4b 100644 --- a/test/fixtures/typescript/typeof-types.diff+A.txt +++ b/test/fixtures/typescript/typeof-types.diff+A.txt @@ -3,8 +3,7 @@ (VarAssignment (Identifier) (Ty - (Other "type_reference" - (Identifier))))) + (Identifier)))) (Other "lexical_declaration" (VarAssignment (Identifier) diff --git a/test/fixtures/typescript/typeof-types.diff+B.txt b/test/fixtures/typescript/typeof-types.diff+B.txt index ed0c12932..68f3a29d7 100644 --- a/test/fixtures/typescript/typeof-types.diff+B.txt +++ b/test/fixtures/typescript/typeof-types.diff+B.txt @@ -9,5 +9,4 @@ (VarAssignment (Identifier) (Ty - (Other "type_reference" - (Identifier))))))+} + (Identifier)))))+} diff --git a/test/fixtures/typescript/typeof-types.diff-A.txt b/test/fixtures/typescript/typeof-types.diff-A.txt index ecd5a9461..9505f6b77 100644 --- a/test/fixtures/typescript/typeof-types.diff-A.txt +++ b/test/fixtures/typescript/typeof-types.diff-A.txt @@ -3,8 +3,7 @@ (VarAssignment (Identifier) (Ty - (Other "type_reference" - (Identifier))))) + (Identifier)))) (Other "lexical_declaration" (VarAssignment (Identifier) diff --git a/test/fixtures/typescript/typeof-types.diff-B.txt b/test/fixtures/typescript/typeof-types.diff-B.txt index 0130f9e5d..5f6fd41bb 100644 --- a/test/fixtures/typescript/typeof-types.diff-B.txt +++ b/test/fixtures/typescript/typeof-types.diff-B.txt @@ -9,5 +9,4 @@ (VarAssignment (Identifier) (Ty - (Other "type_reference" - (Identifier))))))-} + (Identifier)))))-} diff --git a/test/fixtures/typescript/typeof-types.diffA-B.txt b/test/fixtures/typescript/typeof-types.diffA-B.txt index b9311ecb4..c8547ab55 100644 --- a/test/fixtures/typescript/typeof-types.diffA-B.txt +++ b/test/fixtures/typescript/typeof-types.diffA-B.txt @@ -3,13 +3,13 @@ (VarAssignment (Identifier) (Ty - (Other "type_query" - { (Identifier) - ->(Identifier) })))) + { (Identifier) + ->(Other "type_query" + (Identifier)) }))) (Other "lexical_declaration" (VarAssignment (Identifier) (Ty - (Other "type_reference" - { (Identifier) - ->(Identifier) }))))) + { (Other "type_query" + (Identifier)) + ->(Identifier) })))) diff --git a/test/fixtures/typescript/typeof-types.diffB-A.txt b/test/fixtures/typescript/typeof-types.diffB-A.txt index f3ab40d7a..0a77c184a 100644 --- a/test/fixtures/typescript/typeof-types.diffB-A.txt +++ b/test/fixtures/typescript/typeof-types.diffB-A.txt @@ -3,13 +3,13 @@ (VarAssignment (Identifier) (Ty - (Other "type_reference" - { (Identifier) - ->(Identifier) })))) + { (Other "type_query" + (Identifier)) + ->(Identifier) }))) (Other "lexical_declaration" (VarAssignment (Identifier) (Ty - (Other "type_query" - { (Identifier) - ->(Identifier) }))))) + { (Identifier) + ->(Other "type_query" + (Identifier)) })))) diff --git a/test/fixtures/typescript/typeof-types.parseA.txt b/test/fixtures/typescript/typeof-types.parseA.txt index 2cf2b794c..04ff89c17 100644 --- a/test/fixtures/typescript/typeof-types.parseA.txt +++ b/test/fixtures/typescript/typeof-types.parseA.txt @@ -3,8 +3,7 @@ (VarAssignment (Identifier) (Ty - (Other "type_reference" - (Identifier))))) + (Identifier)))) (Other "lexical_declaration" (VarAssignment (Identifier) diff --git a/test/fixtures/typescript/typeof-types.parseB.txt b/test/fixtures/typescript/typeof-types.parseB.txt index d09b1dd94..1d0243dfd 100644 --- a/test/fixtures/typescript/typeof-types.parseB.txt +++ b/test/fixtures/typescript/typeof-types.parseB.txt @@ -9,5 +9,4 @@ (VarAssignment (Identifier) (Ty - (Other "type_reference" - (Identifier)))))) + (Identifier))))) diff --git a/test/fixtures/typescript/union-type.diff+A.txt b/test/fixtures/typescript/union-type.diff+A.txt index 80583e0c4..4689c4609 100644 --- a/test/fixtures/typescript/union-type.diff+A.txt +++ b/test/fixtures/typescript/union-type.diff+A.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))+} + (Identifier) + (Identifier))))))+} diff --git a/test/fixtures/typescript/union-type.diff-A.txt b/test/fixtures/typescript/union-type.diff-A.txt index a2428e129..c76e600b5 100644 --- a/test/fixtures/typescript/union-type.diff-A.txt +++ b/test/fixtures/typescript/union-type.diff-A.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier)))))))-} + (Identifier) + (Identifier))))))-} diff --git a/test/fixtures/typescript/union-type.diffA-B.txt b/test/fixtures/typescript/union-type.diffA-B.txt index 3950ffb9a..60c10693a 100644 --- a/test/fixtures/typescript/union-type.diffA-B.txt +++ b/test/fixtures/typescript/union-type.diffA-B.txt @@ -4,8 +4,5 @@ (Identifier) (Ty (Other "type_query" - {+(Identifier)+} - {-(Other "type_reference" - (Identifier))-} - {-(Other "type_reference" - (Identifier))-}))))) + (Identifier) + {-(Identifier)-}))))) diff --git a/test/fixtures/typescript/union-type.diffB-A.txt b/test/fixtures/typescript/union-type.diffB-A.txt index 48e4866b9..25b9faeeb 100644 --- a/test/fixtures/typescript/union-type.diffB-A.txt +++ b/test/fixtures/typescript/union-type.diffB-A.txt @@ -4,8 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - {+(Other "type_reference" - (Identifier))+} - {+(Other "type_reference" - (Identifier))+} - {-(Identifier)-}))))) + (Identifier) + {+(Identifier)+}))))) diff --git a/test/fixtures/typescript/union-type.parseA.txt b/test/fixtures/typescript/union-type.parseA.txt index 8653db7f8..c3ce32a3f 100644 --- a/test/fixtures/typescript/union-type.parseA.txt +++ b/test/fixtures/typescript/union-type.parseA.txt @@ -4,7 +4,5 @@ (Identifier) (Ty (Other "intersection_type" - (Other "type_reference" - (Identifier)) - (Other "type_reference" - (Identifier))))))) + (Identifier) + (Identifier))))))