summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2012-11-20 14:32:36 +0000
committerVaadin Code Review <review@vaadin.com>2012-11-20 14:32:36 +0000
commit46ffc9ed87bc925eacd2e0db707b7f2ad31bea55 (patch)
tree1e61c5fb2848d2da7c256df366114f74c634c351
parent09565f6536570811767998b950dc60a4e37c54b6 (diff)
parentb35b82ec7ab8f8245170db95434a44f7a3b29cc0 (diff)
downloadvaadin-framework-46ffc9ed87bc925eacd2e0db707b7f2ad31bea55.tar.gz
vaadin-framework-46ffc9ed87bc925eacd2e0db707b7f2ad31bea55.zip
Merge "(#10186) Using the lighten function breaks up any later references to the parameter value"
-rw-r--r--theme-compiler/src/com/vaadin/sass/tree/RuleNode.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/tree/RuleNode.java b/theme-compiler/src/com/vaadin/sass/tree/RuleNode.java
index 38c5b1cb4e..217f6423a7 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/RuleNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/RuleNode.java
@@ -98,7 +98,7 @@ public class RuleNode extends Node implements IVariableNode {
if (param.getValue().toString()
.contains(node.getName())) {
- LexicalUnitImpl expr = node.getExpr();
+ String value = node.getExpr().toString();
LexicalUnitImpl prev = param
.getPreviousLexicalUnit();
@@ -106,7 +106,9 @@ public class RuleNode extends Node implements IVariableNode {
.getNextLexicalUnit();
if (param.getLexicalUnitType() == LexicalUnitImpl.SCSS_VARIABLE) {
- param.replaceValue(expr);
+ param.setStringValue(value);
+ param.setLexicalUnitType(node.getExpr()
+ .getLexicalUnitType());
param.setPrevLexicalUnit(prev);
param.setNextLexicalUnit(next);
}