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

more robustly parse comments inside min and max

Browse Source
This commit is contained in:
Connor Skees 2021-07-12 02:22:13 -04:00
parent 8e08a5de4f
commit 03f48cfd22
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/parse/value/css_function.rs
View File

@ -4,6 +4,7 @@ use codemap::Spanned;
use crate::{
error::SassResult,
parse::common::Comment,
utils::{
as_hex, hex_char_for, is_name, peek_until_closing_curly_brace, peek_whitespace,
IsWhitespace,
@ -145,7 +146,7 @@ impl<'a> Parser<'a> {
String::new()
};
self.whitespace();
self.whitespace_or_comment();
while let Some(tok) = self.toks.peek() {
let kind = tok.kind;
@ -240,7 +241,7 @@ impl<'a> Parser<'a> {
_ => return Ok(None),
}
self.whitespace();
self.whitespace_or_comment();
let next = match self.toks.peek() {
Some(tok) => tok,
@ -270,7 +271,7 @@ impl<'a> Parser<'a> {
_ => return Ok(None),
}
self.whitespace();
self.whitespace_or_comment();
}
Ok(Some(buf))
@ -332,7 +333,16 @@ impl<'a> Parser<'a> {
}
'/' => {
if matches!(self.toks.peek_n(1), Some(Token { kind: '*', .. })) {
todo!()
self.toks.next();
let comment = match self.parse_comment()?.node {
Comment::Loud(s) => s,
Comment::Silent => continue,
};
buffer.push_str("/*");
buffer.push_str(&comment);
buffer.push_str("*/");
} else {
buffer.push('/');
self.toks.next();
@ -353,10 +363,7 @@ impl<'a> Parser<'a> {
}
c @ (' ' | '\t') => {
if wrote_newline
|| !self
.toks
.peek_n(1)
.map_or(false, |tok| tok.is_whitespace())
|| !self.toks.peek_n(1).map_or(false, |tok| tok.is_whitespace())
{
buffer.push(c);
}

16
tests/min-max.rs
View File

@ -170,3 +170,19 @@ test!(
"a {\n color: min(1, var(--foo));\n}\n",
"a {\n color: min(1, var(--foo));\n}\n"
);
test!(
min_conains_multiline_comment,
"a {\n color: min(1/**/);\n}\n",
"a {\n color: min(1);\n}\n"
);
test!(
min_conains_calc_contains_multiline_comment,
"a {\n color: min(calc(1 /**/ 2));\n}\n",
"a {\n color: min(calc(1 /**/ 2));\n}\n"
);
test!(
#[ignore = "we currently resolve interpolation eagerly inside loud comments"]
min_conains_calc_contains_multiline_comment_with_interpolation,
"a {\n color: min(calc(1 /* #{5} */ 2));\n}\n",
"a {\n color: min(calc(1 /* #{5} */ 2));\n}\n"
);