diff options
| author | Sebastian Nyholm <sebastian@vaadin.com> | 2012-11-15 17:45:19 +0200 |
|---|---|---|
| committer | Sebastian Nyholm <sebastian@vaadin.com> | 2012-11-15 17:45:19 +0200 |
| commit | 0bfa96ee1e05ad0867eb22e05a44e3a4290ec586 (patch) | |
| tree | 2064433c55e5799077c1ea87ee7b4fae2c2ba8b4 /theme-compiler/src | |
| parent | e54ff59fbe6a5452b469a355176351cd710663d1 (diff) | |
| download | vaadin-framework-0bfa96ee1e05ad0867eb22e05a44e3a4290ec586.tar.gz vaadin-framework-0bfa96ee1e05ad0867eb22e05a44e3a4290ec586.zip | |
(#10174) Value of a variable cannot be assigned to another variable
Change-Id: Ib6879b685259c775fc9159e572c182093ae69f8d
Diffstat (limited to 'theme-compiler/src')
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/tree/VariableNode.java | 2 | ||||
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java b/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java index 3ea8379829..89cab33129 100644 --- a/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java +++ b/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java @@ -77,6 +77,8 @@ public class VariableNode extends Node implements IVariableNode { && expr.getParameters().toString() .contains("$" + node.getName())) { replaceValues(expr.getParameters(), node); + } else if (expr.getLexicalUnitType() == LexicalUnitImpl.SCSS_VARIABLE) { + replaceValues(expr, node); } } } diff --git a/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java b/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java index 3c31ee1073..4875a39b1d 100644 --- a/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java +++ b/theme-compiler/src/com/vaadin/sass/visitor/MixinNodeHandler.java @@ -48,6 +48,7 @@ public class MixinNodeHandler { Node pre = mixinNode; MixinDefNode defClone = (MixinDefNode) DeepCopy.copy(mixinDef); + defClone.traverse(); if (mixinDef.getArglist().isEmpty()) { for (Node child : new ArrayList<Node>(defClone.getChildren())) { |