0.19 upgrade: keep all comments when upgrading Html.Attributes.style

avh4 · May 17, 2018 · e7e7757 · e7e7757
1 parent 49f52e9
commit e7e7757
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/ElmFormat/Upgrade_0_19.hs b/src/ElmFormat/Upgrade_0_19.hs
@@ -156,8 +156,8 @@ expandHtmlStyle styleExposed importAlias (preComma, (pre, (term, eol))) =
                 _ -> False
     in
     case RA.drop term of
-        App (A _ (VarExpr var)) [(xx, A _ (ExplicitList styles trailing multiline))] _ | isHtmlAttributesStyle var ->
-            fmap (\(preComma', (pre', (style, eol'))) -> (preComma', (pre', (applyLambda (noRegion $ lambda var) [([], style)] (FAJoinFirst JoinAll), eol')))) styles
+        App (A _ (VarExpr var)) [(preStyle, A _ (ExplicitList styles trailing _))] _ | isHtmlAttributesStyle var ->
+            fmap (\(preComma', (pre', (style, eol'))) -> (preComma ++ preComma', (pre ++ preStyle ++ pre' ++ trailing ++ (Maybe.maybeToList $ fmap LineComment eol), (applyLambda (noRegion $ lambda var) [([], style)] (FAJoinFirst JoinAll), eol')))) styles
 
         _ ->
             [(preComma, (pre, (term, eol)))]

diff --git a/tests/test-files/transform/Elm-0.19/ConvertHtmlAttributesStyle.elm b/tests/test-files/transform/Elm-0.19/ConvertHtmlAttributesStyle.elm
@@ -5,3 +5,5 @@ convertsStyle = Html.div [Html.Attributes.style [("a", "1")]] []
 convertsExposedStyle = Html.div [style [("a", "1")]] []
 
 doesntConvertOtherFunctions f = Html.div [ f [("a", "1")] ] []
+
+comments = Html.div{-A-}[{-B-}style{-C-}[{-D-}({-E-}"a"{-F-},{-G-}"1"{-H-}){-I-},{-J-}({-K-}"b"{-L-},{-M-}"2"{-N-}){-O-}]{-P-}]{-Q-}[]
diff --git a/tests/test-files/transform/Elm-0.19/ConvertHtmlAttributesStyle.formatted.elm b/tests/test-files/transform/Elm-0.19/ConvertHtmlAttributesStyle.formatted.elm
@@ -14,3 +14,16 @@ convertsExposedStyle =
 
 doesntConvertOtherFunctions f =
     Html.div [ f [ ( "a", "1" ) ] ] []
+
+
+comments =
+    Html.div
+        {- A -}
+        [ {- B -} {- C -} {- D -} {- O -} style ({- E -} "a" {- F -}) ({- G -} "1" {- H -})
+
+        {- I -}
+        , {- B -} {- C -} {- J -} {- O -} style ({- K -} "b" {- L -}) ({- M -} "2" {- N -})
+
+        {- P -}
+        ]
+        {- Q -} []
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,5 @@ convertsStyle = Html.div [Html.Attributes.style [("a", "1")]] []
		convertsExposedStyle = Html.div [style [("a", "1")]] []

		doesntConvertOtherFunctions f = Html.div [ f [("a", "1")] ] []

		comments = Html.div{-A-}[{-B-}style{-C-}[{-D-}({-E-}"a"{-F-},{-G-}"1"{-H-}){-I-},{-J-}({-K-}"b"{-L-},{-M-}"2"{-N-}){-O-}]{-P-}]{-Q-}[]