Fixes #9546, #9974, #10100, #10105

Change-Id: I1baccb5604899707960b1cf06887ada0fe217d08

1 files changed, 12 insertions, 0 deletions

diff --git a/theme-compiler/src/com/vaadin/sass/tree/ExtendNode.java b/theme-compiler/src/com/vaadin/sass/tree/ExtendNode.java
index 909e69e12f..b9bf5869d1 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/ExtendNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/ExtendNode.java
@@ -18,6 +18,8 @@ package com.vaadin.sass.tree;
 
 import java.util.ArrayList;
 
+import com.vaadin.sass.visitor.ExtendNodeHandler;
+
 public class ExtendNode extends Node implements IVariableNode {
     private static final long serialVersionUID = 3301805078983796878L;
 
@@ -45,4 +47,14 @@ public class ExtendNode extends Node implements IVariableNode {
 
         return b.toString();
     }
+
+    @Override
+    public void traverse() {
+        try {
+            ExtendNodeHandler.traverse(this);
+            getParentNode().removeChild(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }