From 9b3cc349d3fe95ee010561637232c3be30b46d5b Mon Sep 17 00:00:00 2001 From: Timothy Clem Date: Mon, 15 Jan 2018 20:10:48 -0700 Subject: [PATCH] Fix up Go test for new structure of Import --- .../grouped-import-declarations.diffA-B.txt | 18 ++++++++++++------ .../grouped-import-declarations.diffB-A.txt | 18 ++++++++++++------ .../go/grouped-import-declarations.parseA.txt | 16 +++++++++++----- .../go/grouped-import-declarations.parseB.txt | 16 +++++++++++----- .../fixtures/go/import-statements.diffA-B.txt | 19 +++++++++---------- .../fixtures/go/import-statements.diffB-A.txt | 19 +++++++++---------- test/fixtures/go/import-statements.parseA.txt | 17 ++++++++--------- test/fixtures/go/import-statements.parseB.txt | 17 ++++++++--------- .../go/single-import-declarations.diffA-B.txt | 16 ++++++++++------ .../go/single-import-declarations.diffB-A.txt | 16 ++++++++++------ .../go/single-import-declarations.parseA.txt | 14 +++++++++----- .../go/single-import-declarations.parseB.txt | 14 +++++++++----- 12 files changed, 118 insertions(+), 82 deletions(-) diff --git a/test/fixtures/go/grouped-import-declarations.diffA-B.txt b/test/fixtures/go/grouped-import-declarations.diffA-B.txt index 813ee2e3e..f8cc8d5c7 100644 --- a/test/fixtures/go/grouped-import-declarations.diffA-B.txt +++ b/test/fixtures/go/grouped-import-declarations.diffA-B.txt @@ -1,16 +1,22 @@ (Program (Module (Identifier)) - (Import - ( + ( + (Import { (TextElement) ->(TextElement) } + (Empty) + (Empty)) + (Import { (TextElement) ->(TextElement) } - ( - (Identifier) - { (TextElement) - ->(TextElement) }))) + (Empty) + (Empty)) + (Import + { (TextElement) + ->(TextElement) } + (Identifier) + (Empty))) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/grouped-import-declarations.diffB-A.txt b/test/fixtures/go/grouped-import-declarations.diffB-A.txt index 813ee2e3e..f8cc8d5c7 100644 --- a/test/fixtures/go/grouped-import-declarations.diffB-A.txt +++ b/test/fixtures/go/grouped-import-declarations.diffB-A.txt @@ -1,16 +1,22 @@ (Program (Module (Identifier)) - (Import - ( + ( + (Import { (TextElement) ->(TextElement) } + (Empty) + (Empty)) + (Import { (TextElement) ->(TextElement) } - ( - (Identifier) - { (TextElement) - ->(TextElement) }))) + (Empty) + (Empty)) + (Import + { (TextElement) + ->(TextElement) } + (Identifier) + (Empty))) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/grouped-import-declarations.parseA.txt b/test/fixtures/go/grouped-import-declarations.parseA.txt index 14913a0e6..9559c1906 100644 --- a/test/fixtures/go/grouped-import-declarations.parseA.txt +++ b/test/fixtures/go/grouped-import-declarations.parseA.txt @@ -1,13 +1,19 @@ (Program (Module (Identifier)) - (Import - ( + ( + (Import (TextElement) + (Empty) + (Empty)) + (Import (TextElement) - ( - (Identifier) - (TextElement)))) + (Empty) + (Empty)) + (Import + (TextElement) + (Identifier) + (Empty))) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/grouped-import-declarations.parseB.txt b/test/fixtures/go/grouped-import-declarations.parseB.txt index 14913a0e6..9559c1906 100644 --- a/test/fixtures/go/grouped-import-declarations.parseB.txt +++ b/test/fixtures/go/grouped-import-declarations.parseB.txt @@ -1,13 +1,19 @@ (Program (Module (Identifier)) - (Import - ( + ( + (Import (TextElement) + (Empty) + (Empty)) + (Import (TextElement) - ( - (Identifier) - (TextElement)))) + (Empty) + (Empty)) + (Import + (TextElement) + (Identifier) + (Empty))) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/import-statements.diffA-B.txt b/test/fixtures/go/import-statements.diffA-B.txt index 03a3f3486..d47bfda05 100644 --- a/test/fixtures/go/import-statements.diffA-B.txt +++ b/test/fixtures/go/import-statements.diffA-B.txt @@ -1,16 +1,15 @@ (Program (Module (Identifier)) - (Import - ( - (Context - (Comment) - (Comment) - { (TextElement) - ->(TextElement) }) - (Context - (Comment) - (Empty)))) + ( + (Comment) + (Comment) + (Import + { (TextElement) + ->(TextElement) } + (Empty) + (Empty)) + (Comment)) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/import-statements.diffB-A.txt b/test/fixtures/go/import-statements.diffB-A.txt index 03a3f3486..d47bfda05 100644 --- a/test/fixtures/go/import-statements.diffB-A.txt +++ b/test/fixtures/go/import-statements.diffB-A.txt @@ -1,16 +1,15 @@ (Program (Module (Identifier)) - (Import - ( - (Context - (Comment) - (Comment) - { (TextElement) - ->(TextElement) }) - (Context - (Comment) - (Empty)))) + ( + (Comment) + (Comment) + (Import + { (TextElement) + ->(TextElement) } + (Empty) + (Empty)) + (Comment)) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/import-statements.parseA.txt b/test/fixtures/go/import-statements.parseA.txt index 102ff879c..b05f0f959 100644 --- a/test/fixtures/go/import-statements.parseA.txt +++ b/test/fixtures/go/import-statements.parseA.txt @@ -1,15 +1,14 @@ (Program (Module (Identifier)) - (Import - ( - (Context - (Comment) - (Comment) - (TextElement)) - (Context - (Comment) - (Empty)))) + ( + (Comment) + (Comment) + (Import + (TextElement) + (Empty) + (Empty)) + (Comment)) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/import-statements.parseB.txt b/test/fixtures/go/import-statements.parseB.txt index 102ff879c..b05f0f959 100644 --- a/test/fixtures/go/import-statements.parseB.txt +++ b/test/fixtures/go/import-statements.parseB.txt @@ -1,15 +1,14 @@ (Program (Module (Identifier)) - (Import - ( - (Context - (Comment) - (Comment) - (TextElement)) - (Context - (Comment) - (Empty)))) + ( + (Comment) + (Comment) + (Import + (TextElement) + (Empty) + (Empty)) + (Comment)) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/single-import-declarations.diffA-B.txt b/test/fixtures/go/single-import-declarations.diffA-B.txt index d76742c13..bd5accec7 100644 --- a/test/fixtures/go/single-import-declarations.diffA-B.txt +++ b/test/fixtures/go/single-import-declarations.diffA-B.txt @@ -3,15 +3,19 @@ (Identifier)) (Import { (TextElement) - ->(TextElement) }) + ->(TextElement) } + (Empty) + (Empty)) (Import { (TextElement) - ->(TextElement) }) + ->(TextElement) } + (Empty) + (Empty)) (Import - ( - (Identifier) - { (TextElement) - ->(TextElement) })) + { (TextElement) + ->(TextElement) } + (Identifier) + (Empty)) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/single-import-declarations.diffB-A.txt b/test/fixtures/go/single-import-declarations.diffB-A.txt index d76742c13..bd5accec7 100644 --- a/test/fixtures/go/single-import-declarations.diffB-A.txt +++ b/test/fixtures/go/single-import-declarations.diffB-A.txt @@ -3,15 +3,19 @@ (Identifier)) (Import { (TextElement) - ->(TextElement) }) + ->(TextElement) } + (Empty) + (Empty)) (Import { (TextElement) - ->(TextElement) }) + ->(TextElement) } + (Empty) + (Empty)) (Import - ( - (Identifier) - { (TextElement) - ->(TextElement) })) + { (TextElement) + ->(TextElement) } + (Identifier) + (Empty)) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/single-import-declarations.parseA.txt b/test/fixtures/go/single-import-declarations.parseA.txt index 52b20c769..d8976f1a0 100644 --- a/test/fixtures/go/single-import-declarations.parseA.txt +++ b/test/fixtures/go/single-import-declarations.parseA.txt @@ -2,13 +2,17 @@ (Module (Identifier)) (Import - (TextElement)) + (TextElement) + (Empty) + (Empty)) (Import - (TextElement)) + (TextElement) + (Empty) + (Empty)) (Import - ( - (Identifier) - (TextElement))) + (TextElement) + (Identifier) + (Empty)) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/single-import-declarations.parseB.txt b/test/fixtures/go/single-import-declarations.parseB.txt index 52b20c769..d8976f1a0 100644 --- a/test/fixtures/go/single-import-declarations.parseB.txt +++ b/test/fixtures/go/single-import-declarations.parseB.txt @@ -2,13 +2,17 @@ (Module (Identifier)) (Import - (TextElement)) + (TextElement) + (Empty) + (Empty)) (Import - (TextElement)) + (TextElement) + (Empty) + (Empty)) (Import - ( - (Identifier) - (TextElement))) + (TextElement) + (Identifier) + (Empty)) (Function (Empty) (Identifier)