shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle edge case of single list containing map used in @each

Browse Source
This commit is contained in:
Connor Skees 2020-07-06 16:10:09 -04:00
parent aa8f120824
commit 7c320ae9a2
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/parse/mod.rs
View File

@ -911,14 +911,13 @@ impl<'a> Parser<'a> {
let mut stmts = Vec::new(); let mut stmts = Vec::new();
for row in iter { for row in iter {
let this_iterator = row.as_list(); let this_iterator = row.clone().as_list();
if vars.len() == 1 { if vars.len() == 1 {
if this_iterator.len() == 1 { if this_iterator.len() == 1 {
self.scopes.last_mut().insert_var( self.scopes.last_mut().insert_var(
&vars[0].node, &vars[0].node,
Spanned { Spanned {
node: this_iterator[0].clone(), node: row,
span: vars[0].span, span: vars[0].span,
}, },
); );
@ -932,7 +931,7 @@ impl<'a> Parser<'a> {
); );
} }
} else { } else {
for (var, val) in vars.clone().into_iter().zip( for (var, val) in vars.iter().zip(
this_iterator this_iterator
.into_iter() .into_iter()
.chain(std::iter::once(Value::Null).cycle()), .chain(std::iter::once(Value::Null).cycle()),

9
tests/each.rs
View File

@ -48,6 +48,15 @@ test!(
"a {\n @each $i in 1 2 3 {\n color: type-of($i);\n }\n}\n", "a {\n @each $i in 1 2 3 {\n color: type-of($i);\n }\n}\n",
"a {\n color: number;\n color: number;\n color: number;\n}\n" "a {\n color: number;\n color: number;\n color: number;\n}\n"
); );
error!(
list_of_single_map,
"a {
@each $a in [(a: b)] {
color: $a;
}
}",
"Error: (a: b) isn't a valid CSS value."
);
error!( error!(
missing_closing_curly_brace, missing_closing_curly_brace,
"@each $i in 1 {", "Error: expected \"}\"." "@each $i in 1 {", "Error: expected \"}\"."