Merge branch 'selector-match-fixes' of https://github.com/seven-phases-max/less.js

Author: lukeapage

lib/less/tree/ruleset.js

@@ -170,9 +170,9 @@ 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 > rule.selectors[j].elements.length) {
+                        if (selector.elements.length > match) {
                             Array.prototype.push.apply(rules, rule.find(
-                                new(tree.Selector)(selector.elements.slice(1)), self));
+                                new(tree.Selector)(selector.elements.slice(match)), self));
                         } else {
                             rules.push(rule);
                         }

lib/less/tree/selector.js

@@ -35,15 +35,15 @@ tree.Selector.prototype = {
         max = Math.min(len, olen);
 
         if (olen === 0 || len < olen) {
-            return false;
+            return 0;
         } else {
             for (i = 0; i < max; i++) {
                 if (elements[i].value !== oelements[i].value) {
-                    return false;
+                    return 0;
                 }
             }
         }
-        return true;
+        return max; // return number of matched selectors 
     },
     eval: function (env) {
         var evaldCondition = this.condition && this.condition.eval(env);

test/css/mixins.css

@@ -64,11 +64,31 @@
 .amp.support {
   color: orange;
 }
+.amp.support .higher {
+  top: 0px;
+}
+.amp.support.deeper {
+  height: auto;
+}
 .extended {
   width: 100%;
   border: 1px;
   background: none;
   color: orange;
+  top: 0px;
+  height: auto;
+}
+.extended .higher {
+  top: 0px;
+}
+.extended.deeper {
+  height: auto;
+}
+.do .re .mi .fa .sol .la .si {
+  color: cyan;
+}
+.mutli-selector-parents {
+  color: cyan;
 }
 .foo .bar {
   width: 100%;

test/less/mixins.less

@@ -61,12 +61,30 @@
 .amp {
     &.support {
         color: orange;
+        .higher {
+            top: 0px;
+        }
+        &.deeper {
+            height: auto;
+        }
     }
 }
 .extended {
     .bo;
     .jo.ki;
     .amp.support;
+    .amp.support.higher;
+    .amp.support.deeper;
+}
+.do .re .mi .fa {
+    .sol .la {
+        .si {
+            color: cyan;
+        }
+    }
+}
+.mutli-selector-parents {
+    .do.re.mi.fa.sol.la.si;
 }
 .foo .bar {
   .bar;