mixins carry their scope around

leafo · leafo · commit 7d01c0ca18f4 · 2012-02-18T19:24:43.000-08:00
diff --git a/lessc.inc.php b/lessc.inc.php
@@ -974,13 +974,15 @@ function compileBlock($block, $parent_tags = null) {
 			$tags = $this->multiplyTags($parent_tags, $block->tags);
 		}
 
-		$this->pushEnv();
+		$env = $this->pushEnv();
 		$lines = array();
 		$blocks = array();
 		foreach ($block->props as $prop) {
 			$this->compileProp($prop, $block, $tags, $lines, $blocks);
 		}
 
+		$block->scope = $env;
+
 		$this->pop();
 
 		$nl = $isRoot ? "\n".$indent :
@@ -1028,7 +1030,6 @@ function compileBlock($block, $parent_tags = null) {
 		return ob_get_clean();
 	}
 
-
 	// find the fully qualified tags for a block and its parent's tags
 	function multiplyTags($parents, $current) {
 		if ($parents == null) return $current;
@@ -1221,6 +1222,12 @@ function compileProp($prop, $block, $tags, &$_lines, &$_blocks) {
 			}
 
 			foreach ($mixins as $mixin) {
+				$old_scope = null;
+				if (isset($mixin->parent->scope)) {
+					$old_scope = $this->env;
+					$this->env = $mixin->parent->scope;
+				}
+
 				$have_args = false;
 				if (isset($mixin->args)) {
 					$have_args = true;
@@ -1238,6 +1245,10 @@ function compileProp($prop, $block, $tags, &$_lines, &$_blocks) {
 				$mixin->parent = $old_parent;
 
 				if ($have_args) $this->pop();
+
+				if ($old_scope) {
+					$this->env = $old_scope;
+				}
 			}
 
 			break;
