From 568adc1477f868da8cb9ae72f27b041ebf74f3ba Mon Sep 17 00:00:00 2001 From: Timothy Clem Date: Mon, 2 Apr 2018 15:11:45 -0700 Subject: [PATCH] TypeScript import syntax changed - update fixtures --- test/fixtures/typescript/export.diffA-B.txt | 12 +-- test/fixtures/typescript/export.diffB-A.txt | 12 +-- test/fixtures/typescript/export.parseA.txt | 6 +- test/fixtures/typescript/export.parseB.txt | 6 +- test/fixtures/typescript/import.diffA-B.txt | 83 ++++++--------------- test/fixtures/typescript/import.diffB-A.txt | 83 ++++++--------------- test/fixtures/typescript/import.parseA.txt | 41 +++------- test/fixtures/typescript/import.parseB.txt | 38 +++------- 8 files changed, 79 insertions(+), 202 deletions(-) diff --git a/test/fixtures/typescript/export.diffA-B.txt b/test/fixtures/typescript/export.diffA-B.txt index a046f61e7..4e6aea904 100644 --- a/test/fixtures/typescript/export.diffA-B.txt +++ b/test/fixtures/typescript/export.diffA-B.txt @@ -62,10 +62,8 @@ {+(QualifiedExport)+} {+(DefaultExport {+(TextElement)+})+} -{+(QualifiedExportFrom - {+(Identifier)+})+} -{+(QualifiedExportFrom - {+(Identifier)+})+} +{+(QualifiedExportFrom)+} +{+(QualifiedExportFrom)+} {-(DefaultExport {-(Function {-(Empty)-} @@ -75,7 +73,5 @@ {-(QualifiedExport)-} {-(DefaultExport {-(TextElement)-})-} -{-(QualifiedExportFrom - {-(Identifier)-})-} -{-(QualifiedExportFrom - {-(Identifier)-})-}) +{-(QualifiedExportFrom)-} +{-(QualifiedExportFrom)-}) diff --git a/test/fixtures/typescript/export.diffB-A.txt b/test/fixtures/typescript/export.diffB-A.txt index 6b97b37d8..c0d98eefd 100644 --- a/test/fixtures/typescript/export.diffB-A.txt +++ b/test/fixtures/typescript/export.diffB-A.txt @@ -73,11 +73,7 @@ (DefaultExport { (TextElement) ->(TextElement) }) -{ (QualifiedExportFrom - {-(Identifier)-}) -->(QualifiedExportFrom - {+(Identifier)+}) } -{ (QualifiedExportFrom - {-(Identifier)-}) -->(QualifiedExportFrom - {+(Identifier)+}) }) +{ (QualifiedExportFrom) +->(QualifiedExportFrom) } +{ (QualifiedExportFrom) +->(QualifiedExportFrom) }) diff --git a/test/fixtures/typescript/export.parseA.txt b/test/fixtures/typescript/export.parseA.txt index fa9cfc3dd..5e293e404 100644 --- a/test/fixtures/typescript/export.parseA.txt +++ b/test/fixtures/typescript/export.parseA.txt @@ -50,7 +50,5 @@ (QualifiedExport) (DefaultExport (TextElement)) - (QualifiedExportFrom - (Identifier)) - (QualifiedExportFrom - (Identifier))) + (QualifiedExportFrom) + (QualifiedExportFrom)) diff --git a/test/fixtures/typescript/export.parseB.txt b/test/fixtures/typescript/export.parseB.txt index bf96a822f..12ec54bef 100644 --- a/test/fixtures/typescript/export.parseB.txt +++ b/test/fixtures/typescript/export.parseB.txt @@ -50,7 +50,5 @@ (QualifiedExport) (DefaultExport (TextElement)) - (QualifiedExportFrom - (Identifier)) - (QualifiedExportFrom - (Identifier))) + (QualifiedExportFrom) + (QualifiedExportFrom)) diff --git a/test/fixtures/typescript/import.diffA-B.txt b/test/fixtures/typescript/import.diffA-B.txt index 70af8adff..9fa79264e 100644 --- a/test/fixtures/typescript/import.diffA-B.txt +++ b/test/fixtures/typescript/import.diffA-B.txt @@ -1,68 +1,31 @@ (Program -{+(Import - {+(Identifier)+} - {+(Empty)+})+} -{+(QualifiedImport - {+(Identifier)+} - {+(Identifier)+})+} -{+(Import - {+(Identifier)+} - {+(Empty)+})+} -{+(Import - {+(Identifier)+} - {+(Empty)+})+} -{+(Import - {+(Identifier)+} - {+(Empty)+})+} +{ (Import) +->(Import) } +{ (QualifiedAliasedImport + {-(Identifier)-}) +->(QualifiedAliasedImport + {+(Identifier)+}) } +{+(Import)+} +{ (Import) +->(Import) } +{+(Import)+} {+( - {+(Import - {+(Identifier)+} - {+(Empty)+})+} - {+(Import - {+(Identifier)+} - {+(Empty)+})+})+} + {+(Import)+} + {+(Import)+})+} {+( - {+(Import - {+(Identifier)+} - {+(Empty)+})+} - {+(QualifiedImport - {+(Identifier)+} + {+(Import)+} + {+(QualifiedAliasedImport {+(Identifier)+})+})+} -{+(SideEffectImport - {+(Identifier)+} - {+(Empty)+})+} -{-(Import - {-(Identifier)-} - {-(Empty)-})-} -{-(QualifiedImport - {-(Identifier)-} - {-(Identifier)-})-} -{-(Import - {-(Identifier)-} - {-(Empty)-})-} -{-(Import - {-(Identifier)-} - {-(Empty)-})-} -{-(Import - {-(Identifier)-} - {-(Empty)-})-} +{+(SideEffectImport)+} +{-(Import)-} +{-(Import)-} {-( - {-(Import - {-(Identifier)-} - {-(Empty)-})-} - {-(Import - {-(Identifier)-} - {-(Empty)-})-})-} + {-(Import)-} + {-(Import)-})-} {-( - {-(Import - {-(Identifier)-} - {-(Empty)-})-} - {-(QualifiedImport - {-(Identifier)-} + {-(Import)-} + {-(QualifiedAliasedImport {-(Identifier)-})-})-} -{-(SideEffectImport - {-(Identifier)-} - {-(Empty)-})-} -{-(QualifiedImport - {-(Identifier)-} +{-(SideEffectImport)-} +{-(QualifiedAliasedImport {-(Identifier)-})-}) diff --git a/test/fixtures/typescript/import.diffB-A.txt b/test/fixtures/typescript/import.diffB-A.txt index 17359b2a2..06ceabf25 100644 --- a/test/fixtures/typescript/import.diffB-A.txt +++ b/test/fixtures/typescript/import.diffB-A.txt @@ -1,68 +1,31 @@ (Program -{+(Import - {+(Identifier)+} - {+(Empty)+})+} -{+(QualifiedImport - {+(Identifier)+} - {+(Identifier)+})+} -{ (Import - {-(Identifier)-} - {-(Empty)-}) -->(Import - {+(Identifier)+} - {+(Empty)+}) } -{+(Import - {+(Identifier)+} - {+(Empty)+})+} -{+(Import - {+(Identifier)+} - {+(Empty)+})+} +{ (Import) +->(Import) } +{ (QualifiedAliasedImport + {-(Identifier)-}) +->(QualifiedAliasedImport + {+(Identifier)+}) } +{+(Import)+} +{+(Import)+} +{ (Import) +->(Import) } {+( - {+(Import - {+(Identifier)+} - {+(Empty)+})+} - {+(Import - {+(Identifier)+} - {+(Empty)+})+})+} + {+(Import)+} + {+(Import)+})+} {+( - {+(Import - {+(Identifier)+} - {+(Empty)+})+} - {+(QualifiedImport - {+(Identifier)+} + {+(Import)+} + {+(QualifiedAliasedImport {+(Identifier)+})+})+} -{+(SideEffectImport - {+(Identifier)+} - {+(Empty)+})+} -{+(QualifiedImport - {+(Identifier)+} +{+(SideEffectImport)+} +{+(QualifiedAliasedImport {+(Identifier)+})+} -{-(QualifiedImport - {-(Identifier)-} - {-(Identifier)-})-} -{-(Import - {-(Identifier)-} - {-(Empty)-})-} -{-(Import - {-(Identifier)-} - {-(Empty)-})-} -{-(Import - {-(Identifier)-} - {-(Empty)-})-} +{-(Import)-} +{-(Import)-} {-( - {-(Import - {-(Identifier)-} - {-(Empty)-})-} - {-(Import - {-(Identifier)-} - {-(Empty)-})-})-} + {-(Import)-} + {-(Import)-})-} {-( - {-(Import - {-(Identifier)-} - {-(Empty)-})-} - {-(QualifiedImport - {-(Identifier)-} + {-(Import)-} + {-(QualifiedAliasedImport {-(Identifier)-})-})-} -{-(SideEffectImport - {-(Identifier)-} - {-(Empty)-})-}) +{-(SideEffectImport)-}) diff --git a/test/fixtures/typescript/import.parseA.txt b/test/fixtures/typescript/import.parseA.txt index b51ad3f68..4301638e4 100644 --- a/test/fixtures/typescript/import.parseA.txt +++ b/test/fixtures/typescript/import.parseA.txt @@ -1,36 +1,17 @@ (Program - (Import - (Identifier) - (Empty)) - (QualifiedImport - (Identifier) + (Import) + (QualifiedAliasedImport (Identifier)) - (Import - (Identifier) - (Empty)) - (Import - (Identifier) - (Empty)) - (Import - (Identifier) - (Empty)) + (Import) + (Import) + (Import) ( - (Import - (Identifier) - (Empty)) - (Import - (Identifier) - (Empty))) + (Import) + (Import)) ( - (Import - (Identifier) - (Empty)) - (QualifiedImport - (Identifier) + (Import) + (QualifiedAliasedImport (Identifier))) - (SideEffectImport - (Identifier) - (Empty)) - (QualifiedImport - (Identifier) + (SideEffectImport) + (QualifiedAliasedImport (Identifier))) diff --git a/test/fixtures/typescript/import.parseB.txt b/test/fixtures/typescript/import.parseB.txt index ea05f8535..037e1c7c8 100644 --- a/test/fixtures/typescript/import.parseB.txt +++ b/test/fixtures/typescript/import.parseB.txt @@ -1,33 +1,15 @@ (Program - (Import - (Identifier) - (Empty)) - (QualifiedImport - (Identifier) + (Import) + (QualifiedAliasedImport (Identifier)) - (Import - (Identifier) - (Empty)) - (Import - (Identifier) - (Empty)) - (Import - (Identifier) - (Empty)) + (Import) + (Import) + (Import) ( - (Import - (Identifier) - (Empty)) - (Import - (Identifier) - (Empty))) + (Import) + (Import)) ( - (Import - (Identifier) - (Empty)) - (QualifiedImport - (Identifier) + (Import) + (QualifiedAliasedImport (Identifier))) - (SideEffectImport - (Identifier) - (Empty))) + (SideEffectImport))