allow mixins to recursively reference each other leafo#208 leafo#203

leafo · leafo · commit d5aa97ca64e5 · 2012-04-06T00:48:49.000-07:00
diff --git a/lessc.inc.php b/lessc.inc.php
@@ -1357,7 +1357,7 @@ function compileProp($prop, $block, $tags, &$_lines, &$_blocks) {
 				}
 
 				$old_parent = $mixin->parent;
-				$mixin->parent = $block;
+				if ($mixin != $block) $mixin->parent = $block;
 
 				foreach ($mixin->props as $sub_prop) {
 					$this->compileProp($sub_prop, $mixin, $tags, $_lines, $_blocks);
diff --git a/tests/inputs/selector_expressions.less b/tests/inputs/selector_expressions.less
@@ -0,0 +1,29 @@
+
+@color: blue;
+
+(~"something @{color}"), world {
+	color: blue;
+}
+
+.div {
+	@color: red;
+	(3434) {
+		height: 100px;
+	}
+
+	(~"cool @{color}") {
+		height: 4000px;
+	}
+}
+
+.heck(@a) { color: @a+10 }
+
+.spanX (@index) when (@index > 0) {
+	(~".span@{index}") { .heck(@index) }
+	.spanX(@index - 1);
+}
+.spanX (0) {}
+
+.spanX (5);
+
+
diff --git a/tests/outputs/selector_expressions.css b/tests/outputs/selector_expressions.css
@@ -0,0 +1,8 @@
+something blue, world { color:blue; }
+.div 3434 { height:100px; }
+.div cool red { height:4000px; }
+.span5 { color:15; }
+.span4 { color:14; }
+.span3 { color:13; }
+.span2 { color:12; }
+.span1 { color:11; }

Original file line number	Diff line number	Diff line change
`@@ -1357,7 +1357,7 @@ function compileProp($prop, $block, $tags, &$_lines, &$_blocks) {`
`1357`	`1357`	`}`
`1358`	`1358`
`1359`	`1359`	`$old_parent = $mixin->parent;`
`1360`		`- $mixin->parent = $block;`
	`1360`	`+ if ($mixin != $block) $mixin->parent = $block;`
`1361`	`1361`
`1362`	`1362`	`foreach ($mixin->props as $sub_prop) {`
`1363`	`1363`	`$this->compileProp($sub_prop, $mixin, $tags, $_lines, $_blocks);`