Keep block order when unnesting (#10309)

Change-Id: I5a7e6b74a55176799e85c943a128d9aab0db0876

1 files changed, 6 insertions, 1 deletions

diff --git a/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java b/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
index af061d8e95..2a5d617a6b 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
@@ -235,9 +235,14 @@ public class ScssStylesheet extends Node {
         variables.clear();
         variables.putAll(variableScope);
 
+        // clean up insert point so that processing of the next block will
+        // insert after that block
+        lastNodeAdded.remove(originalParent);
+
         // has the node been removed from its parent?
         if (originalParent != null) {
-            return !originalParent.getChildren().contains(node);
+            boolean removed = !originalParent.getChildren().contains(node);
+            return removed;
         } else {
             return false;
         }