Fixes stylus#879 Extends with parent reference

tonistiigi · Nov 20, 2012 · b0808e8 · b0808e8
1 parent b2944cc
commit b0808e8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 11 deletions.
diff --git a/lib/visitor/compiler.js b/lib/visitor/compiler.js
@@ -454,6 +454,20 @@ Compiler.prototype.compileSelectors = function(arr){
     , selectors = []
     , buf = [];
 
+  function interpolateParent(selector, buf) {
+    var str = selector.val.trim();
+    if (buf.length) {
+      for (var i = 0, len = buf.length; i < len; ++i) {
+        if (~buf[i].indexOf('&')) {
+          str = buf[i].replace(/&/g, str).trim();
+        } else {
+          str += ' ' + buf[i].trim();
+        }
+      }
+    }
+    return str;
+  }
+
   function compile(arr, i) {
     if (i) {
       arr[i].forEach(function(selector){
@@ -462,21 +476,12 @@ Compiler.prototype.compileSelectors = function(arr){
           compile(arr, i - 1);
           buf.shift();
         } else {
-          selectors.push(selector.val);
+          selectors.push(interpolateParent(selector, buf));
         }
       });
     } else {
       arr[0].forEach(function(selector){
-        var str = selector.val.trim();
-        if (buf.length) {
-          for (var i = 0, len = buf.length; i < len; ++i) {
-            if (~buf[i].indexOf('&')) {
-              str = buf[i].replace(/&/g, str).trim();
-            } else {
-              str += ' ' + buf[i].trim();
-            }
-          }
-        }
+        var str = interpolateParent(selector, buf);
         selectors.push(self.indent + str.trimRight());
       });
     }

diff --git a/test/cases/extend.with.parent.reference.css b/test/cases/extend.with.parent.reference.css
@@ -0,0 +1,8 @@
+#button_a:hover,
+#button_b:hover {
+  color: #fff;
+}
+body #button_c:hover,
+body #button_d:hover {
+  color: #000;
+}
diff --git a/test/cases/extend.with.parent.reference.styl b/test/cases/extend.with.parent.reference.styl
@@ -0,0 +1,12 @@
+#button_a
+  &:hover
+      color #fff
+#button_b
+  @extend #button_a
+
+body
+  #button_c
+    &:hover
+      color #000
+  #button_d
+    @extend body #button_c