Fix extends when selector to add includes & and :extend is inline. Fixes #1227

Author: lukeapage

lib/less/tree/ruleset.js

@@ -364,11 +364,11 @@ tree.Ruleset.prototype = {
                             if (sel.length > 0) {
                                 newSelectorPath = sel.slice(0);
                                 lastSelector = newSelectorPath.pop();
-                                newJoinedSelector = new(tree.Selector)(lastSelector.elements.slice(0));
+                                newJoinedSelector = new(tree.Selector)(lastSelector.elements.slice(0), selector.extendList);
                                 newJoinedSelectorEmpty = false;
                             }
                             else {
-                                newJoinedSelector = new(tree.Selector)([]);
+                                newJoinedSelector = new(tree.Selector)([], selector.extendList);
                             }
 
                             //put together the parent selectors after the join
@@ -418,7 +418,7 @@ tree.Ruleset.prototype = {
     },
 
     mergeElementsOnToSelectors: function(elements, selectors) {
-        var i, sel;
+        var i, sel, extendList;
 
         if (selectors.length == 0) {
             selectors.push([ new(tree.Selector)(elements) ]);
@@ -430,7 +430,7 @@ tree.Ruleset.prototype = {
 
             // if the previous thing in sel is a parent this needs to join on to it
             if (sel.length > 0) {
-                sel[sel.length - 1] = new(tree.Selector)(sel[sel.length - 1].elements.concat(elements));
+                sel[sel.length - 1] = new(tree.Selector)(sel[sel.length - 1].elements.concat(elements), sel[sel.length - 1].extendList);
             }
             else {
                 sel.push(new(tree.Selector)(elements));

test/css/extend-nest.css

@@ -22,3 +22,17 @@
 .type2.sidebar4 {
   background: red;
 }
+.button,
+.submit {
+    color: black;
+}
+.button:hover,
+.submit:hover {
+    color: white;
+}
+.button2 :hover {
+    nested: white;
+}
+.button2 :hover {
+    notnested: black;
+}

test/less/extend-nest.less

@@ -27,3 +27,29 @@
     background: red;
   }
 }
+
+.button {
+  color: black;
+  &:hover {
+    color: white;
+  }
+}
+.submit {
+  &:extend(.button);
+  &:hover:extend(.button:hover) {}
+}
+
+.nomatch {
+  &:hover:extend(.button :hover) {}
+}
+
+.button2 {
+  :hover {
+    nested: white;
+  }
+}
+.button2 :hover {
+  notnested: black;
+}
+
+.nomatch :extend(.button2:hover) {}