Merge pull request #143 from tolgap/fix_mixed_nesting

Fix properties not resolving after or inbetween an ExtendSelector and/or WithPseudoElement
rtfeldman · Jul 22, 2016 · 6c7a0cc · 6c7a0cc
2 parents e7ab020 + c5f68fb
commit 6c7a0cc
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/Css/Preprocess/Resolve.elm b/src/Css/Preprocess/Resolve.elm
@@ -418,9 +418,26 @@ applyNestedMixinsToLast nestedMixins rest f declarations =
         withoutParent decls =
             List.tail decls
                 |> Maybe.withDefault []
+
+        {- We recreate the declarations if necessary. It is possible that
+           there was an `AppendProperty` in between two `ExtendSelectors` or two `WithPseudoElements`
+           or an `AppendProperty` after an `ExtendSelector` or `WithPseudoElement`.
+        -}
+        newDeclarations =
+            case ( List.head nextResult.declarations, List.head <| List.reverse declarations ) of
+                ( Just nextResultParent, Just originalParent ) ->
+                    List.take (List.length declarations - 1) declarations
+                        ++ [ if originalParent /= nextResultParent then
+                                nextResultParent
+                             else
+                                originalParent
+                           ]
+
+                _ ->
+                    declarations
     in
         { warnings = initialResult.warnings ++ nextResult.warnings
-        , declarations = declarations ++ (withoutParent initialResult.declarations ) ++ (withoutParent nextResult.declarations)
+        , declarations = newDeclarations ++ (withoutParent initialResult.declarations) ++ (withoutParent nextResult.declarations)
         }
 
 

diff --git a/test/Fixtures.elm b/test/Fixtures.elm
@@ -350,6 +350,7 @@ pseudoElementStylesheet =
                 [ color (hex "#fff") ]
             , after
                 [ color (hex "#000") ]
+            , color (hex "#aaa")
             ]
         ]
 
@@ -368,5 +369,6 @@ pseudoClassStylesheet =
                 [ fontSize (em 3) ]
             , disabled
                 [ marginTop (px 20) ]
+            , backgroundColor (hex "#aaa")
             ]
         ]
diff --git a/test/Tests.elm b/test/Tests.elm
@@ -595,6 +595,7 @@ pseudoElements =
             """
             #Page {
                 margin: 10px;
+                color: #aaa;
             }
 
             #Page::before {
@@ -624,6 +625,7 @@ pseudoClasses =
             """
             #Page {
                 color: #fff;
+                background-color: #aaa;
             }
 
             #Page:hover {