match multiple classes as the extend target

Author: lukeapage

lib/less/extend-visitor.js

@@ -112,7 +112,7 @@
                                     .slice(0, match.index)
                                     .concat([firstElement])
                                     .concat(selfSelector.elements.slice(1))
-                                    .concat(selector.elements.slice(match.index + 1))
+                                    .concat(selector.elements.slice(match.index + match.length))
                             ));
                         });
                     }
@@ -121,11 +121,17 @@
             rulesetNode.selectors = rulesetNode.selectors.concat(selectorsToAdd);
         },
         findMatch: function (extend, selector) {
-            var j = 0, element;
-            for(j = 0; j < selector.elements.length; j++) {
-                element = selector.elements[j];
-                if (extend.selector.elements[0].value === element.value) {
-                    return {index: j, initialCombinator: element.combinator};
+            var i, j, element, hasMatch;
+            for(i = 0; i <= (selector.elements.length - extend.selector.elements.length); i++) {
+                hasMatch = true;
+                for(j = 0; j < extend.selector.elements.length; j++) {
+                    if (extend.selector.elements[j].value !== selector.elements[i+j].value) {
+                        hasMatch = false;
+                        break;
+                    }
+                }
+                if (hasMatch) {
+                    return {index: i, initialCombinator: selector.elements[i].combinator, length: extend.selector.elements.length};
                 }
             }
             return null;

lib/less/parser.js

@@ -795,9 +795,9 @@ less.Parser = function Parser(env) {
                 while (true) {
                     option = $(/^(any|deep|all)(?=\s*\))/);
                     if (option) { break; }
-                    e = $(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/);
+                    e = $(this.element);
                     if (!e) { break; }
-                    elements.push(new(tree.Element)(null, e, i));
+                    elements.push(e);
                 }
 
                 expect(/^\)/);
@@ -1052,8 +1052,7 @@ less.Parser = function Parser(env) {
 
                 if (! e) {
                     if ($('(')) {
-                        if ((v = (//$(this.entities.variableCurly) || 
-                                $(this.selector))) && 
+                        if ((v = ($(this.selector))) &&
                                 $(')')) {
                             e = new(tree.Paren)(v);
                         }

test/css/extend.css

@@ -33,3 +33,10 @@ div.ext7,
 .ext6 > .ext7 {
   width: 100px;
 }
+.ext8.ext9,
+.foo {
+  result: pick-up-both;
+}
+.ext8.nomatch {
+  result: none;
+}

test/less/extend.less

@@ -36,3 +36,12 @@ div.ext5,
 .ext7 {
     &:extend(.ext5 all);
 }
+
+.ext8.ext9 {
+  result: pick-up-both;
+}
+.ext8.nomatch {
+  result: none;
+}
+
+.foo:extend(.ext8.ext9 all) {}