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

don't read multiple stars in comment eagerly

Browse Source
This commit is contained in:
Connor Skees 2021-07-03 18:42:39 -04:00
parent d1be778682
commit e5d73ac265
3 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/parse/mod.rs
View File

@ -589,7 +589,8 @@ impl<'a> Parser<'a> {
self.toks.next(); self.toks.next();
while let Some(tok) = self.toks.next() { while let Some(tok) = self.toks.next() {
if tok.kind == '*' { if tok.kind == '*' {
if let Some(Token { kind: '/', .. }) = self.toks.next() { if let Some(Token { kind: '/', .. }) = self.toks.peek() {
self.toks.next();
break; break;
} }
} }

36
src/parse/value/parse.rs
View File

@ -578,10 +578,12 @@ impl<'a> Parser<'a> {
} }
let mut map = SassMap::new(); let mut map = SassMap::new();
let key = self.parse_value( let key = self.parse_value(true, &|c| {
true, matches!(
&|c| matches!(c.peek(), Some(Token { kind: ':', .. }) | Some(Token { kind: ')', .. })), c.peek(),
)?; Some(Token { kind: ':', .. }) | Some(Token { kind: ')', .. })
)
})?;
match self.toks.next() { match self.toks.next() {
Some(Token { kind: ':', .. }) => {} Some(Token { kind: ':', .. }) => {}
@ -594,10 +596,12 @@ impl<'a> Parser<'a> {
Some(..) | None => return Err(("expected \")\".", key.span).into()), Some(..) | None => return Err(("expected \")\".", key.span).into()),
} }
let val = self.parse_value( let val = self.parse_value(true, &|c| {
true, matches!(
&|c| matches!(c.peek(), Some(Token { kind: ',', .. }) | Some(Token { kind: ')', .. })), c.peek(),
)?; Some(Token { kind: ',', .. }) | Some(Token { kind: ')', .. })
)
})?;
map.insert(key.node, val.node); map.insert(key.node, val.node);
@ -630,14 +634,22 @@ impl<'a> Parser<'a> {
} }
loop { loop {
let key = let key = self.parse_value(true, &|c| {
self.parse_value(true, &|c| matches!(c.peek(), Some(Token { kind: ':', .. }) | Some(Token { kind: ',', .. })))?; matches!(
c.peek(),
Some(Token { kind: ':', .. }) | Some(Token { kind: ',', .. })
)
})?;
self.expect_char(':')?; self.expect_char(':')?;
self.whitespace_or_comment(); self.whitespace_or_comment();
let val = let val = self.parse_value(true, &|c| {
self.parse_value(true, &|c| matches!(c.peek(), Some(Token { kind: ',', .. }) | Some(Token { kind: ')', .. })))?; matches!(
c.peek(),
Some(Token { kind: ',', .. }) | Some(Token { kind: ')', .. })
)
})?;
span = span.merge(val.span); span = span.merge(val.span);

13
tests/comments.rs
View File

@ -66,3 +66,16 @@ test!(
"$a: foo;/* interpolation #{1 + 1} in #{$a} comments */", "$a: foo;/* interpolation #{1 + 1} in #{$a} comments */",
"/* interpolation 2 in foo comments */\n" "/* interpolation 2 in foo comments */\n"
); );
test!(
triple_star_in_selector,
"a/***/ {x: y} b { color: red; }",
"a {\n x: y;\n}\n\nb {\n color: red;\n}\n"
);
test!(
sass_spec__css_comments_multiple_stars,
"a /***/ b {x: y}
a /****/ b {x: y}
a /* **/ b {x: y}
a /** */ b {x: y}",
"a b {\n x: y;\n}\n\na b {\n x: y;\n}\n\na b {\n x: y;\n}\n\na b {\n x: y;\n}\n"
);