From dfafcc983fe8b9e7e55af9fab84b9f3a0f49963b Mon Sep 17 00:00:00 2001 From: Timothy Clem Date: Mon, 2 Apr 2018 15:14:05 -0700 Subject: [PATCH] Go import assignment changed - update fixtures --- .../grouped-import-declarations.diffA-B.txt | 29 ++++++++----------- .../grouped-import-declarations.diffB-A.txt | 29 ++++++++----------- .../go/grouped-import-declarations.parseA.txt | 3 -- .../go/grouped-import-declarations.parseB.txt | 3 -- .../fixtures/go/import-statements.diffA-B.txt | 8 ++--- .../fixtures/go/import-statements.diffB-A.txt | 8 ++--- test/fixtures/go/import-statements.parseA.txt | 1 - test/fixtures/go/import-statements.parseB.txt | 1 - .../go/single-import-declarations.diffA-B.txt | 25 ++++++++-------- .../go/single-import-declarations.diffB-A.txt | 25 ++++++++-------- .../go/single-import-declarations.parseA.txt | 3 -- .../go/single-import-declarations.parseB.txt | 3 -- 12 files changed, 56 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 bb5f638d9..a311b847e 100644 --- a/test/fixtures/go/grouped-import-declarations.diffA-B.txt +++ b/test/fixtures/go/grouped-import-declarations.diffA-B.txt @@ -2,23 +2,18 @@ (Package (Identifier)) ( - (QualifiedImport - { (Identifier) - ->(Identifier) } - { (Identifier) - ->(Identifier) }) - {+(Import - {+(Identifier)+} - {+(TextElement)+})+} - {+(QualifiedImport - {+(Identifier)+} - {+(Identifier)+})+} - {-(Import - {-(Identifier)-} - {-(TextElement)-})-} - {-(QualifiedImport - {-(Identifier)-} - {-(Identifier)-})-}) + { (QualifiedImport + {-(Identifier)-}) + ->(QualifiedImport + {+(Identifier)+}) } + { (Import + {-(TextElement)-}) + ->(Import + {+(TextElement)+}) } + { (QualifiedImport + {-(Identifier)-}) + ->(QualifiedImport + {+(Identifier)+}) }) (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 bb5f638d9..a311b847e 100644 --- a/test/fixtures/go/grouped-import-declarations.diffB-A.txt +++ b/test/fixtures/go/grouped-import-declarations.diffB-A.txt @@ -2,23 +2,18 @@ (Package (Identifier)) ( - (QualifiedImport - { (Identifier) - ->(Identifier) } - { (Identifier) - ->(Identifier) }) - {+(Import - {+(Identifier)+} - {+(TextElement)+})+} - {+(QualifiedImport - {+(Identifier)+} - {+(Identifier)+})+} - {-(Import - {-(Identifier)-} - {-(TextElement)-})-} - {-(QualifiedImport - {-(Identifier)-} - {-(Identifier)-})-}) + { (QualifiedImport + {-(Identifier)-}) + ->(QualifiedImport + {+(Identifier)+}) } + { (Import + {-(TextElement)-}) + ->(Import + {+(TextElement)+}) } + { (QualifiedImport + {-(Identifier)-}) + ->(QualifiedImport + {+(Identifier)+}) }) (Function (Empty) (Identifier) diff --git a/test/fixtures/go/grouped-import-declarations.parseA.txt b/test/fixtures/go/grouped-import-declarations.parseA.txt index cbb57faf6..a42c1120b 100644 --- a/test/fixtures/go/grouped-import-declarations.parseA.txt +++ b/test/fixtures/go/grouped-import-declarations.parseA.txt @@ -3,13 +3,10 @@ (Identifier)) ( (QualifiedImport - (Identifier) (Identifier)) (Import - (Identifier) (TextElement)) (QualifiedImport - (Identifier) (Identifier))) (Function (Empty) diff --git a/test/fixtures/go/grouped-import-declarations.parseB.txt b/test/fixtures/go/grouped-import-declarations.parseB.txt index cbb57faf6..a42c1120b 100644 --- a/test/fixtures/go/grouped-import-declarations.parseB.txt +++ b/test/fixtures/go/grouped-import-declarations.parseB.txt @@ -3,13 +3,10 @@ (Identifier)) ( (QualifiedImport - (Identifier) (Identifier)) (Import - (Identifier) (TextElement)) (QualifiedImport - (Identifier) (Identifier))) (Function (Empty) diff --git a/test/fixtures/go/import-statements.diffA-B.txt b/test/fixtures/go/import-statements.diffA-B.txt index a1878f30f..5b08d8e40 100644 --- a/test/fixtures/go/import-statements.diffA-B.txt +++ b/test/fixtures/go/import-statements.diffA-B.txt @@ -4,10 +4,10 @@ ( (Comment) (Comment) - (QualifiedImport - { (Identifier) - ->(Identifier) } - (Identifier)) + { (QualifiedImport + {-(Identifier)-}) + ->(QualifiedImport + {+(Identifier)+}) } (Comment)) (Function (Empty) diff --git a/test/fixtures/go/import-statements.diffB-A.txt b/test/fixtures/go/import-statements.diffB-A.txt index a1878f30f..5b08d8e40 100644 --- a/test/fixtures/go/import-statements.diffB-A.txt +++ b/test/fixtures/go/import-statements.diffB-A.txt @@ -4,10 +4,10 @@ ( (Comment) (Comment) - (QualifiedImport - { (Identifier) - ->(Identifier) } - (Identifier)) + { (QualifiedImport + {-(Identifier)-}) + ->(QualifiedImport + {+(Identifier)+}) } (Comment)) (Function (Empty) diff --git a/test/fixtures/go/import-statements.parseA.txt b/test/fixtures/go/import-statements.parseA.txt index cb37a0d2f..0c4964ed1 100644 --- a/test/fixtures/go/import-statements.parseA.txt +++ b/test/fixtures/go/import-statements.parseA.txt @@ -5,7 +5,6 @@ (Comment) (Comment) (QualifiedImport - (Identifier) (Identifier)) (Comment)) (Function diff --git a/test/fixtures/go/import-statements.parseB.txt b/test/fixtures/go/import-statements.parseB.txt index cb37a0d2f..0c4964ed1 100644 --- a/test/fixtures/go/import-statements.parseB.txt +++ b/test/fixtures/go/import-statements.parseB.txt @@ -5,7 +5,6 @@ (Comment) (Comment) (QualifiedImport - (Identifier) (Identifier)) (Comment)) (Function diff --git a/test/fixtures/go/single-import-declarations.diffA-B.txt b/test/fixtures/go/single-import-declarations.diffA-B.txt index 2c2fcd9b1..708a431ba 100644 --- a/test/fixtures/go/single-import-declarations.diffA-B.txt +++ b/test/fixtures/go/single-import-declarations.diffA-B.txt @@ -1,19 +1,18 @@ (Program (Package (Identifier)) - (QualifiedImport - { (Identifier) - ->(Identifier) } - { (Identifier) - ->(Identifier) }) - (Import - { (Identifier) - ->(Identifier) } - (TextElement)) - (QualifiedImport - { (Identifier) - ->(Identifier) } - (Identifier)) +{ (QualifiedImport + {-(Identifier)-}) +->(QualifiedImport + {+(Identifier)+}) } +{ (Import + {-(TextElement)-}) +->(Import + {+(TextElement)+}) } +{ (QualifiedImport + {-(Identifier)-}) +->(QualifiedImport + {+(Identifier)+}) } (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 2c2fcd9b1..708a431ba 100644 --- a/test/fixtures/go/single-import-declarations.diffB-A.txt +++ b/test/fixtures/go/single-import-declarations.diffB-A.txt @@ -1,19 +1,18 @@ (Program (Package (Identifier)) - (QualifiedImport - { (Identifier) - ->(Identifier) } - { (Identifier) - ->(Identifier) }) - (Import - { (Identifier) - ->(Identifier) } - (TextElement)) - (QualifiedImport - { (Identifier) - ->(Identifier) } - (Identifier)) +{ (QualifiedImport + {-(Identifier)-}) +->(QualifiedImport + {+(Identifier)+}) } +{ (Import + {-(TextElement)-}) +->(Import + {+(TextElement)+}) } +{ (QualifiedImport + {-(Identifier)-}) +->(QualifiedImport + {+(Identifier)+}) } (Function (Empty) (Identifier) diff --git a/test/fixtures/go/single-import-declarations.parseA.txt b/test/fixtures/go/single-import-declarations.parseA.txt index 5fe52832f..7e5f7cc1b 100644 --- a/test/fixtures/go/single-import-declarations.parseA.txt +++ b/test/fixtures/go/single-import-declarations.parseA.txt @@ -2,13 +2,10 @@ (Package (Identifier)) (QualifiedImport - (Identifier) (Identifier)) (Import - (Identifier) (TextElement)) (QualifiedImport - (Identifier) (Identifier)) (Function (Empty) diff --git a/test/fixtures/go/single-import-declarations.parseB.txt b/test/fixtures/go/single-import-declarations.parseB.txt index 5fe52832f..7e5f7cc1b 100644 --- a/test/fixtures/go/single-import-declarations.parseB.txt +++ b/test/fixtures/go/single-import-declarations.parseB.txt @@ -2,13 +2,10 @@ (Package (Identifier)) (QualifiedImport - (Identifier) (Identifier)) (Import - (Identifier) (TextElement)) (QualifiedImport - (Identifier) (Identifier)) (Function (Empty)