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

do not strip newlines after comments in selectors

Browse Source
This commit is contained in:
Connor Skees 2020-07-04 21:02:49 -04:00
parent 827225a143
commit c4439c14fd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/parse/mod.rs
View File

@ -219,6 +219,7 @@ impl<'a> Parser<'a> {
'/' => { '/' => {
self.toks.next(); self.toks.next();
let comment = self.parse_comment()?; let comment = self.parse_comment()?;
self.whitespace();
match comment.node { match comment.node {
Comment::Silent => continue, Comment::Silent => continue,
Comment::Loud(s) => stmts.push(Stmt::Comment(s)), Comment::Loud(s) => stmts.push(Stmt::Comment(s)),
@ -346,7 +347,6 @@ impl<'a> Parser<'a> {
return Err(("Expected selector.", tok.pos()).into()); return Err(("Expected selector.", tok.pos()).into());
} }
self.parse_comment()?; self.parse_comment()?;
self.whitespace();
string.push(' '); string.push(' ');
} }
'{' => { '{' => {
@ -403,11 +403,12 @@ impl<'a> Parser<'a> {
Ok(Spanned { Ok(Spanned {
node: match self.toks.next() { node: match self.toks.next() {
Some(Token { kind: '/', .. }) => { Some(Token { kind: '/', .. }) => {
while let Some(tok) = self.toks.next() { while let Some(tok) = self.toks.peek() {
if tok.kind == '\n' { if tok.kind == '\n' {
break; break;
} }
span = span.merge(tok.pos); span = span.merge(tok.pos);
self.toks.next();
} }
Comment::Silent Comment::Silent

5
tests/selectors.rs
View File

@ -663,6 +663,11 @@ test!(
"@mixin foo {\n #{if(&, 'true', 'false')} {\n color: red;\n }\n}\n\n@include foo;\n\na {\n @include foo;\n}\n", "@mixin foo {\n #{if(&, 'true', 'false')} {\n color: red;\n }\n}\n\n@include foo;\n\na {\n @include foo;\n}\n",
"false {\n color: red;\n}\n\na true {\n color: red;\n}\n" "false {\n color: red;\n}\n\na true {\n color: red;\n}\n"
); );
test!(
newline_is_preserved_when_following_comment,
"a, // 1\nb,\nc {\n color: red;\n}\n",
"a,\nb,\nc {\n color: red;\n}\n"
);
error!( error!(
a_n_plus_b_n_invalid_odd, a_n_plus_b_n_invalid_odd,
":nth-child(ofdd) {\n color: &;\n}\n", "Error: Expected \"odd\"." ":nth-child(ofdd) {\n color: &;\n}\n", "Error: Expected \"odd\"."