move extend fully into visitor, bringing back functionality and fixes #…

…1165
less · Mar 4, 2013 · da7de8f · da7de8f
1 parent aac8e97
commit da7de8f
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 37 deletions.
diff --git a/lib/less/extend-visitor.js b/lib/less/extend-visitor.js
@@ -13,11 +13,9 @@
         },
         visitRule: function (ruleNode, visitArgs) {
             visitArgs.visitDeeper = false;
-            return ruleNode;
         },
         visitMixinDefinition: function (mixinDefinitionNode, visitArgs) {
             visitArgs.visitDeeper = false;
-            return mixinDefinitionNode;
         },
         visitRuleset: function (rulesetNode, visitArgs) {
 
@@ -38,7 +36,9 @@
             // and the ones which apply to an individual extend
             for(i = 0; i < rulesetNode.selectors.length; i++) {
                 var selector = rulesetNode.selectors[i];
-                extendList = selector.extendList.slice(0).concat(allSelectorsExtendList);
+                extendList = selector.extendList.slice(0).concat(allSelectorsExtendList.map(function(allSelectorsExtend) {
+                    return allSelectorsExtend.clone();
+                }));
                 for(j = 0; j < extendList.length; j++) {
                     extend = extendList[j];
                     extend.findSelfSelectors([[selector]].concat(this.contexts.slice(0)));
@@ -82,16 +82,44 @@
         },
         visitRule: function (ruleNode, visitArgs) {
             visitArgs.visitDeeper = false;
-            return ruleNode;
         },
         visitMixinDefinition: function (mixinDefinitionNode, visitArgs) {
             visitArgs.visitDeeper = false;
-            return mixinDefinitionNode;
+        },
+        visitSelector: function (selectorNode, visitArgs) {
+            visitArgs.visitDeeper = false;
         },
         visitRuleset: function (rulesetNode, visitArgs) {
             if (rulesetNode.root) {
                 return;
             }
+            var i, j, k, selector, element, allExtends = this.allExtendsStack[this.allExtendsStack.length-1], selectorsToAdd = [];
+            if (allExtends.length) {
+                for(i = 0; i < rulesetNode.selectors.length; i++) {
+                    selector = rulesetNode.selectors[i];
+                    for(j = 0; j < selector.elements.length; j++) {
+                        element = selector.elements[j];
+                        for(k = 0; k < allExtends.length; k++) {
+                            if (allExtends[k].selector.elements[0].value === element.value) {
+                                allExtends[k].selfSelectors.forEach(function(selfSelector) {
+                                    selfSelector.elements[0] = new tree.Element(
+                                        element.combinator,
+                                        selfSelector.elements[0].value,
+                                        selfSelector.elements[0].index
+                                    );
+                                    selectorsToAdd.push(new tree.Selector(
+                                        selector.elements
+                                            .slice(0, j)
+                                            .concat(selfSelector.elements)
+                                            .concat(selector.elements.slice(j + 1))
+                                    ));
+                                });
+                            }
+                        }
+                    }
+                }
+                rulesetNode.selectors = rulesetNode.selectors.concat(selectorsToAdd);
+            }
         },
         visitRulesetOut: function (rulesetNode) {
         },

diff --git a/lib/less/tree/extend.js b/lib/less/tree/extend.js
@@ -14,6 +14,9 @@ tree.Extend.prototype = {
     eval: function (env) {
         return new(tree.Extend)(this.selector.eval(env), this.option, this.index);
     },
+    clone: function (env) {
+        return new(tree.Extend)(this.selector, this.option, this.index);
+    },
     findSelfSelectors: function (selectors) {
         var selfSelectors = [];
 
@@ -31,35 +34,6 @@ tree.Extend.prototype = {
         })([], 0);
 
         this.selfSelectors = selfSelectors;
-    },
-    a: function() {
-        var selfSelectors = findSelfSelectors(selectors || env.selectors),
-            targetValue = this.selector.elements[0].value;
-
-        env.frames.forEach(function(frame) {
-            frame.rulesets().forEach(function(rule) {
-                rule.selectors.forEach(function(selector) {
-                    selector.elements.forEach(function(element, idx) {
-                        if (element.value === targetValue) {
-                            selfSelectors.forEach(function(_selector) {
-                                _selector.elements[0] = new tree.Element(
-                                    element.combinator,
-                                    _selector.elements[0].value,
-                                    _selector.elements[0].index
-                                );
-                                rule.selectors.push(new tree.Selector(
-                                    selector.elements
-                                        .slice(0, idx)
-                                        .concat(_selector.elements)
-                                        .concat(selector.elements.slice(idx + 1))
-                                ));
-                            });
-                        }
-                    });
-                });
-            });
-        });
-        return this;
     }
 };
 

diff --git a/test/css/extend-media.css b/test/css/extend-media.css
@@ -0,0 +1,24 @@
+.ext1 .ext2,
+.all .ext2 {
+  background: black;
+}
+@media tv {
+  .ext1 .ext3,
+  .tv-lowres .ext3,
+  .all .ext3 {
+    color: white;
+  }
+  .tv-lowres {
+    background: blue;
+  }
+}
+@media tv and hires {
+  .ext1 .ext4,
+  .tv-hires .ext4,
+  .all .ext4 {
+    color: green;
+  }
+  .tv-hires {
+    background: red;
+  }
+}
diff --git a/test/css/extend-selector.css b/test/css/extend-selector.css
@@ -18,10 +18,10 @@
 .foo .bar,
 .foo .baz,
 .ext1 .ext2 .bar,
-.ext1 .ext2 .baz,
 .ext3 .bar,
-.ext3 .baz,
 .ext4 .bar,
+.ext1 .ext2 .baz,
+.ext3 .baz,
 .ext4 .baz {
   display: none;
 }

diff --git a/test/css/extend.css b/test/css/extend.css
@@ -18,9 +18,9 @@
 .foo .bar,
 .foo .baz,
 .ext1 .ext2 .bar,
-.ext1 .ext2 .baz,
 .ext3 .bar,
 .ext4 .bar,
+.ext1 .ext2 .baz,
 .ext3 .baz,
 .ext4 .baz {
   display: none;

diff --git a/test/less/extend-media.less b/test/less/extend-media.less
@@ -0,0 +1,24 @@
+.ext1 .ext2 {
+  background: black;
+}
+
+@media tv {
+  .ext1 .ext3 {
+    color: white;
+  }
+  .tv-lowres :extend(.ext1 all) {
+    background: blue;
+  }
+  @media hires {
+    .ext1 .ext4 {
+      color: green;
+    }
+    .tv-hires :extend(.ext1 all) {
+      background: red;
+    }
+  }
+}
+
+.all:extend(.ext1 all) {
+
+}