make mixins work better with complex selectors

cloudhead · cloudhead · commit 333163791318 · 2011-08-20T10:14:18.000-04:00
diff --git a/lib/less/parser.js b/lib/less/parser.js
@@ -889,16 +889,11 @@ less.Parser = function Parser(env) {
                 var selectors = [], s, rules, match;
                 save();
 
-                if (match = /^([.#:% \w-]+)[\s\n]*\{/.exec(chunks[j])) {
-                    i += match[0].length - 1;
-                    selectors = [new(tree.Selector)([new(tree.Element)(null, match[1])])];
-                } else {
-                    while (s = $(this.selector)) {
-                        selectors.push(s);
-                        $(this.comment);
-                        if (! $(',')) { break }
-                        $(this.comment);
-                    }
+                while (s = $(this.selector)) {
+                    selectors.push(s);
+                    $(this.comment);
+                    if (! $(',')) { break }
+                    $(this.comment);
                 }
 
                 if (selectors.length > 0 && (rules = $(this.block))) {
diff --git a/lib/less/tree/ruleset.js b/lib/less/tree/ruleset.js
@@ -90,7 +90,7 @@ tree.Ruleset.prototype = {
             if (rule !== self) {
                 for (var j = 0; j < rule.selectors.length; j++) {
                     if (match = selector.match(rule.selectors[j])) {
-                        if (selector.elements.length > 1) {
+                        if (selector.elements.length > rule.selectors[j].elements.length) {
                             Array.prototype.push.apply(rules, rule.find(
                                 new(tree.Selector)(selector.elements.slice(1)), self));
                         } else {
diff --git a/lib/less/tree/selector.js b/lib/less/tree/selector.js
@@ -7,11 +7,25 @@ tree.Selector = function (elements) {
     }
 };
 tree.Selector.prototype.match = function (other) {
-    if (this.elements[0].value === other.elements[0].value) {
-        return true;
-    } else {
-        return false;
+    var value = this.elements[0].value,
+        len   = this.elements.length,
+        olen  = other.elements.length;
+
+    if (len > olen) {
+        return value === other.elements[0].value;
+    }
+
+    for (var i = 0; i < olen; i ++) {
+        if (value === other.elements[i].value) {
+            for (var j = 1; j < len; j ++) {
+                if (this.elements[j].value !== other.elements[i + j].value) {
+                    return false;
+                }
+            }
+            return true;
+        }
     }
+    return false;
 };
 tree.Selector.prototype.toCSS = function (env) {
     if (this._css) { return this._css }
diff --git a/test/css/mixins.css b/test/css/mixins.css
@@ -48,3 +48,17 @@
 .direct {
   border-style: dotted;
 }
+.bo {
+  border: 1px;
+}
+.ar.bo.ca {
+  color: black;
+}
+.jo.ki {
+  background: none;
+}
+.extended {
+  border: 1px;
+  color: black;
+  background: none;
+}
diff --git a/test/less/mixins.less b/test/less/mixins.less
@@ -45,3 +45,17 @@
 .direct {
   #namespace > .borders;
 }
+
+.bo {
+    border: 1px;
+}
+.ar.bo.ca {
+    color: black;
+}
+.jo.ki {
+    background: none;
+}
+.extended {
+    .bo;
+    .jo.ki;
+}
