Fix incorrect range for imports with alias and exposing

stil4m · Oct 8, 2024 · 8c03929 · 8c03929
1 parent 6a07f48
commit 8c03929
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+- Fixed a bug where the range was incorrect for imports with both `as` and `exposing`. 
+
 ## [7.3.6] - 2024-09-11
 
 - The parser is stricter in a few cases where code that was incorrect (according to the Elm compiler) was successfully parsed: tuple patterns and tuple type annotations with more than 3 parts, non-associative operators (so no more `a < b < c`), lambda indentation

diff --git a/src/Elm/Parser/Imports.elm b/src/Elm/Parser/Imports.elm
@@ -19,20 +19,20 @@ importDefinition =
             let
                 endRange : Range
                 endRange =
-                    case maybeModuleAlias of
-                        Just moduleAliasValue ->
+                    case maybeExposingList of
+                        Just exposingListValue ->
                             let
                                 (Node range _) =
-                                    moduleAliasValue.syntax
+                                    exposingListValue.syntax
                             in
                             range
 
                         Nothing ->
-                            case maybeExposingList of
-                                Just exposingListValue ->
+                            case maybeModuleAlias of
+                                Just moduleAliasValue ->
                                     let
                                         (Node range _) =
-                                            exposingListValue.syntax
+                                            moduleAliasValue.syntax
                                     in
                                     range
 

diff --git a/tests/Elm/Parser/ImportsTests.elm b/tests/Elm/Parser/ImportsTests.elm
@@ -68,7 +68,7 @@ all =
             \() ->
                 "import Foo as Bar exposing (..)"
                     |> expectAst
-                        (Node { start = { row = 1, column = 1 }, end = { row = 1, column = 18 } }
+                        (Node { start = { row = 1, column = 1 }, end = { row = 1, column = 32 } }
                             { moduleName = Node { start = { row = 1, column = 8 }, end = { row = 1, column = 11 } } [ "Foo" ]
                             , moduleAlias = Just (Node { start = { row = 1, column = 15 }, end = { row = 1, column = 18 } } [ "Bar" ])
                             , exposingList =