Add Node around QualifiedNameRef in DestructurePatterns

stil4m · May 30, 2022 · 3cbe410 · 3cbe410
1 parent edb9e19
commit 3cbe410
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/src/Elm/Parser/Declarations.elm b/src/Elm/Parser/Declarations.elm
@@ -1,7 +1,7 @@
 module Elm.Parser.Declarations exposing (caseBlock, caseStatement, caseStatements, declaration, expression, function, functionArgument, functionSignature, letBlock, letBody, letExpression, signature)
 
 import Combine exposing (Parser, choice, lazy, many, maybe, modifyState, or, sepBy1, string, succeed, withLocation)
-import Elm.Parser.DestructurePatterns as DestructurPatterns exposing (destructurPattern)
+import Elm.Parser.DestructurePatterns as DestructurPatterns exposing (destructurePattern)
 import Elm.Parser.Infix as Infix
 import Elm.Parser.Layout as Layout
 import Elm.Parser.Node as Node
@@ -149,7 +149,7 @@ portDeclaration =
 
 functionArgument : Parser State (Node DestructurePattern)
 functionArgument =
-    DestructurPatterns.destructurPattern
+    DestructurPatterns.destructurePattern
 
 
 
@@ -502,7 +502,7 @@ letBody =
             let
                 blockElement : Parser State LetDeclaration
                 blockElement =
-                    destructurPattern
+                    destructurePattern
                         |> Combine.andThen
                             (\(Node r p) ->
                                 case p of

diff --git a/src/Elm/Parser/DestructurePatterns.elm b/src/Elm/Parser/DestructurePatterns.elm
@@ -1,4 +1,4 @@
-module Elm.Parser.DestructurePatterns exposing (destructurPattern)
+module Elm.Parser.DestructurePatterns exposing (destructurePattern)
 
 import Combine exposing (Parser, between, lazy, many, maybe, parens, sepBy, string)
 import Elm.Parser.Base as Base
@@ -27,8 +27,8 @@ tryToCompose x =
             )
 
 
-destructurPattern : Parser State (Node DestructurePattern)
-destructurPattern =
+destructurePattern : Parser State (Node DestructurePattern)
+destructurePattern =
     composablePattern |> Combine.andThen tryToCompose
 
 
@@ -37,7 +37,7 @@ parensPattern =
     Combine.lazy
         (\() ->
             Node.parser
-                (parens (sepBy (string ",") (Layout.maybeAroundBothSides destructurPattern))
+                (parens (sepBy (string ",") (Layout.maybeAroundBothSides destructurePattern))
                     |> Combine.map
                         (\c ->
                             case c of
@@ -100,7 +100,7 @@ qualifiedPattern consumeArgs =
                         (\args ->
                             Node
                                 (Range.combine (range :: List.map (\(Node r _) -> r) args))
-                                (NamedPattern_ (QualifiedNameRef mod name) args)
+                                (NamedPattern_ (Node range (QualifiedNameRef mod name)) args)
                         )
             )
 

diff --git a/src/Elm/Syntax/DestructurePattern.elm b/src/Elm/Syntax/DestructurePattern.elm
@@ -22,7 +22,7 @@ For example:
 -}
 
 import Elm.Json.Util exposing (decodeTyped, encodeTyped)
-import Elm.Syntax.ModuleName as ModuleName exposing (ModuleName)
+import Elm.Syntax.ModuleName as ModuleName
 import Elm.Syntax.Node as Node exposing (Node)
 import Elm.Syntax.Pattern exposing (QualifiedNameRef)
 import Json.Decode as JD exposing (Decoder)
@@ -47,7 +47,7 @@ type DestructurePattern
     | TuplePattern_ (List (Node DestructurePattern))
     | RecordPattern_ (List (Node String))
     | VarPattern_ String
-    | NamedPattern_ QualifiedNameRef (List (Node DestructurePattern))
+    | NamedPattern_ (Node QualifiedNameRef) (List (Node DestructurePattern))
     | AsPattern_ (Node DestructurePattern) (Node String)
     | ParenthesizedPattern_ (Node DestructurePattern)
 
@@ -92,10 +92,14 @@ encode pattern =
             encodeTyped "named" <|
                 JE.object
                     [ ( "qualified"
-                      , JE.object
-                            [ ( "moduleName", ModuleName.encode qualifiedNameRef.moduleName )
-                            , ( "name", JE.string qualifiedNameRef.name )
-                            ]
+                      , Node.encode
+                            (\{ moduleName, name } ->
+                                JE.object
+                                    [ ( "moduleName", ModuleName.encode moduleName )
+                                    , ( "name", JE.string name )
+                                    ]
+                            )
+                            qualifiedNameRef
                       )
                     , ( "patterns", JE.list (Node.encode encode) patterns )
                     ]
@@ -127,7 +131,7 @@ decoder =
                 , ( "tuple", JD.field "value" (JD.list (Node.decoder decoder)) |> JD.map TuplePattern_ )
                 , ( "record", JD.field "value" (JD.list (Node.decoder JD.string)) |> JD.map RecordPattern_ )
                 , ( "var", JD.field "value" JD.string |> JD.map VarPattern_ )
-                , ( "named", JD.map2 NamedPattern_ (JD.field "qualified" decodeQualifiedNameRef) (JD.field "patterns" (JD.list (Node.decoder decoder))) )
+                , ( "named", JD.map2 NamedPattern_ (JD.field "qualified" (Node.decoder decodeQualifiedNameRef)) (JD.field "patterns" (JD.list (Node.decoder decoder))) )
                 , ( "as", JD.map2 AsPattern_ (JD.field "pattern" (Node.decoder decoder)) (JD.field "name" (Node.decoder JD.string)) )
                 , ( "parentisized", JD.map ParenthesizedPattern_ (JD.field "value" (Node.decoder decoder)) )
                 ]

diff --git a/src/Elm/Writer.elm b/src/Elm/Writer.elm
@@ -637,7 +637,7 @@ writeDestructurPattern (Node _ p) =
         VarPattern_ var ->
             string var
 
-        NamedPattern_ qnr others ->
+        NamedPattern_ (Node _ qnr) others ->
             spaced
                 [ writeQualifiedNameRef qnr
                 , spaced (List.map writeDestructurPattern others)