fix string interpolation with mixins, closes #272

less · May 19, 2011 · 853604a · jamesfoster · May 24, 2011 · clooth
1 parent 0726b9b
commit 853604a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/lib/less/tree/quoted.js b/lib/less/tree/quoted.js
@@ -16,13 +16,13 @@ tree.Quoted.prototype = {
     },
     eval: function (env) {
         var that = this;
-        this.value = this.value.replace(/`([^`]+)`/g, function (_, exp) {
+        var value = this.value.replace(/`([^`]+)`/g, function (_, exp) {
             return new(tree.JavaScript)(exp, that.index, true).eval(env).value;
         }).replace(/@\{([\w-]+)\}/g, function (_, name) {
             var v = new(tree.Variable)('@' + name, that.index).eval(env);
             return v.value || v.toCSS();
         });
-        return this;
+        return new(tree.Quoted)(this.quote + value + this.quote, value, this.escaped, this.index);
     }
 };
 

diff --git a/test/css/strings.css b/test/css/strings.css
@@ -30,3 +30,9 @@
   url4: "http://lesscss.org/hello";
   url5: "http://lesscss.org/54.4";
 }
+.mix-mul-class {
+  color: blue;
+  color: red;
+  color: blue;
+  color: orange;
+}
diff --git a/test/less/strings.less b/test/less/strings.less
@@ -35,3 +35,15 @@
   @var5: 54.4px;
   url5: "http://lesscss.org/@{var5}";
 }
+
+// multiple calls with string interpolation
+
+.mix-mul (@a: green) {
+    color: ~"@{a}";
+}
+.mix-mul-class {
+    .mix-mul(blue);
+    .mix-mul(red);
+    .mix-mul(blue);
+    .mix-mul(orange);
+}