Merge pull request leafo#122 from sergeylukin/mixin-content-for-env

leafo · leafo · commit bc9d63418558 · 2013-10-07T11:28:57.000-07:00
Keep @for environment inside @content block. Fixes leafo#120
diff --git a/scss.inc.php b/scss.inc.php
@@ -732,8 +732,9 @@ protected function compileChild($child, $out) {
 				$this->throwError("Expected @content inside of mixin");
 			}
 
+			$strongTypes = array('include', 'block', 'for', 'while');
 			foreach ($content->children as $child) {
-				$this->storeEnv = ($child[0] == 'include' || $child[0] == 'block')
+				$this->storeEnv = (in_array($child[0], $strongTypes))
 					? null
 					: $content->scope;
 
diff --git a/tests/inputs/content.scss b/tests/inputs/content.scss
@@ -42,4 +42,20 @@ $color: white;
 }
 
 
+@mixin respond-to($width) {
+  @media only screen and (min-width: $width) { @content; }
+}
+
+@include respond-to(40em) {
+  @for $i from 1 through 2 {
+    .grid-#{$i} { width: 100%; }
+  }
+}
 
+@include respond-to(40em) {
+  $i: 1;
+  @while $i <= 2 {
+    .grid-#{$i} { width: 100%; }
+    $i: $i + 1;
+  }
+}
diff --git a/tests/outputs/content.css b/tests/outputs/content.css
@@ -15,3 +15,15 @@
   @media only screen and (max-width: 480px) {
   #sidebar {
     width: 100px; } }
+
+@media only screen and (min-width: 40em) {
+  .grid-1 {
+    width: 100%; }
+    .grid-2 {
+      width: 100%; } }
+
+@media only screen and (min-width: 40em) {
+  .grid-1 {
+    width: 100%; }
+    .grid-2 {
+      width: 100%; } }

Original file line number	Diff line number	Diff line change
`@@ -732,8 +732,9 @@ protected function compileChild($child, $out) {`
`732`	`732`	`$this->throwError("Expected @content inside of mixin");`
`733`	`733`	`}`
`734`	`734`
	`735`	`+ $strongTypes = array('include', 'block', 'for', 'while');`
`735`	`736`	`foreach ($content->children as $child) {`
`736`		`- $this->storeEnv = ($child[0] == 'include' \|\| $child[0] == 'block')`
	`737`	`+ $this->storeEnv = (in_array($child[0], $strongTypes))`
`737`	`738`	`? null`
`738`	`739`	`: $content->scope;`
`739`	`740`