Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(css/parser): refactor code #6395

Merged
merged 7 commits into from Nov 11, 2022
Merged

refactor(css/parser): refactor code #6395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e6f7e8
test(css/parser): more
alexander-akait Nov 9, 2022
7775f66
test(css/parser): more
alexander-akait Nov 9, 2022
bb1802c
refactor(css/parser): code
alexander-akait Nov 10, 2022
b84a42a
fix(css/parser): error message
alexander-akait Nov 10, 2022
73211c5
fix(css/parser): rebase
alexander-akait Nov 10, 2022
4ed3fd5
fix: syntax
alexander-akait Nov 10, 2022
48d00d9
test: update
alexander-akait Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/swc_css_ast/src/base.rs
View file
Open in desktop
Expand Up @@ -49,14 +49,14 @@ pub enum QualifiedRulePrelude {
#[ast_node]
#[derive(Eq, Hash, Is, EqIgnoreSpan)]
pub enum StyleBlock {
#[tag("ListOfComponentValues")]
ListOfComponentValues(ListOfComponentValues),
#[tag("AtRule")]
AtRule(Box<AtRule>),
#[tag("Declaration")]
Declaration(Box<Declaration>),
#[tag("QualifiedRule")]
QualifiedRule(Box<QualifiedRule>),
#[tag("ListOfComponentValues")]
ListOfComponentValues(Box<ListOfComponentValues>),
}

#[ast_node("SimpleBlock")]
Expand Down Expand Up @@ -158,7 +158,7 @@ pub enum DeclarationOrAtRule {
AtRule(Box<AtRule>),
// For recovery mode
#[tag("ListOfComponentValues")]
ListOfComponentValues(ListOfComponentValues),
ListOfComponentValues(Box<ListOfComponentValues>),
}

#[ast_node("Declaration")]
Expand Down
114 changes: 59 additions & 55 deletions crates/swc_css_parser/src/parser/syntax/mod.rs
View file
Open in desktop
Expand Up @@ -362,10 +362,9 @@ where
// Otherwise, append a <semicolon-token> to the qualified rule’s prelude.
tok!(";") => {
if self.ctx.mixed_with_declarations {
return Err(Error::new(
span!(self, span.lo),
ErrorKind::EofButExpected("'{'"),
));
let span = self.input.cur_span();

return Err(Error::new(span, ErrorKind::Expected("'{'")));
} else {
let component_value = self.parse_as::<ComponentValue>()?;

Expand Down Expand Up @@ -505,19 +504,17 @@ where
temporary_list.children.push(component_value);
}

let decl_or_list_of_component_values = match self
.parse_according_to_grammar::<Declaration>(&temporary_list, |parser| {
parser.parse_as()
}) {
Ok(decl) => StyleBlock::Declaration(Box::new(decl)),
Err(err) => {
self.errors.push(err);
let decl_or_list_of_component_values =
match self.parse_declaration_from_temporary_list(&temporary_list) {
Ok(decl) => StyleBlock::Declaration(Box::new(decl)),
Err(err) => {
self.errors.push(err);

temporary_list.span = span!(self, span.lo);
temporary_list.span = span!(self, span.lo);

StyleBlock::ListOfComponentValues(temporary_list)
}
};
StyleBlock::ListOfComponentValues(Box::new(temporary_list))
}
};

declarations.push(decl_or_list_of_component_values);
}
Expand All @@ -528,6 +525,7 @@ where
let state = self.input.state();
let qualified_rule = self
.with_ctx(Ctx {
block_contents_grammar: BlockContentsGrammar::StyleBlock,
mixed_with_declarations: true,
..self.ctx
})
Expand All @@ -550,7 +548,6 @@ where
children: vec![],
};

// TODO verify error recovery (copied from prev spec)
while !is_one_of!(self, ";", EOF) {
let component_value = self.parse_as::<ComponentValue>()?;

Expand All @@ -559,8 +556,9 @@ where

list_of_component_values.span = span!(self, span.lo);

declarations
.push(StyleBlock::ListOfComponentValues(list_of_component_values));
declarations.push(StyleBlock::ListOfComponentValues(Box::new(
list_of_component_values,
)));
}
};
}
Expand Down Expand Up @@ -615,7 +613,14 @@ where
// Reconsume the current input token. Consume an at-rule. Append the returned rule
// to the list of declarations.
tok!("@") => {
declarations.push(DeclarationOrAtRule::AtRule(self.parse()?));
let at_rule = self
.with_ctx(Ctx {
block_contents_grammar: BlockContentsGrammar::DeclarationList,
..self.ctx
})
.parse_as::<AtRule>()?;

declarations.push(DeclarationOrAtRule::AtRule(Box::new(at_rule)));
}
// <ident-token>
// Initialize a temporary list initially filled with the current input token. As
Expand All @@ -625,9 +630,10 @@ where
// it to the list of declarations.
tok!("ident") => {
let span = self.input.cur_span();
let cur = self.input.bump().unwrap();
let mut temporary_list = ListOfComponentValues {
span: Default::default(),
children: vec![],
children: vec![ComponentValue::PreservedToken(cur)],
};

while !is_one_of!(self, ";", EOF) {
Expand All @@ -636,19 +642,17 @@ where
temporary_list.children.push(component_value);
}

let decl_or_list_of_component_values = match self
.parse_according_to_grammar::<Declaration>(&temporary_list, |parser| {
parser.parse_as()
}) {
Ok(decl) => DeclarationOrAtRule::Declaration(Box::new(decl)),
Err(err) => {
self.errors.push(err);
let decl_or_list_of_component_values =
match self.parse_declaration_from_temporary_list(&temporary_list) {
Ok(decl) => DeclarationOrAtRule::Declaration(Box::new(decl)),
Err(err) => {
self.errors.push(err);

temporary_list.span = span!(self, span.lo);
temporary_list.span = span!(self, span.lo);

DeclarationOrAtRule::ListOfComponentValues(temporary_list)
}
};
DeclarationOrAtRule::ListOfComponentValues(Box::new(temporary_list))
}
};

declarations.push(decl_or_list_of_component_values);
}
Expand All @@ -664,9 +668,7 @@ where

self.errors.push(Error::new(
span,
ErrorKind::Expected(
"whitespace, semicolon, EOF, at-keyword or ident token",
),
ErrorKind::Expected("whitespace, ';', '@', ident or EOF"),
));

// For recovery mode
Expand All @@ -683,9 +685,9 @@ where

list_of_component_values.span = span!(self, span.lo);

declarations.push(DeclarationOrAtRule::ListOfComponentValues(
declarations.push(DeclarationOrAtRule::ListOfComponentValues(Box::new(
list_of_component_values,
));
)));
}
}
}
Expand Down Expand Up @@ -718,7 +720,7 @@ where
let is_dashed_ident = match cur!(self) {
Token::Ident { value, .. } => value.starts_with("--"),
_ => {
return Err(Error::new(span, ErrorKind::Expected("Ident")));
return Err(Error::new(span, ErrorKind::Expected("ident")));
}
};
let name = if is_dashed_ident {
Expand Down Expand Up @@ -879,30 +881,31 @@ where
}

// Grammar parsing
let locv = self.create_locv(declaration.value);
let list_of_component_values = self.create_locv(declaration.value);

declaration.value = match self.parse_according_to_grammar(&locv, |parser| {
let mut values = vec![];
declaration.value =
match self.parse_according_to_grammar(&list_of_component_values, |parser| {
let mut values = vec![];

loop {
if is!(parser, EOF) {
break;
loop {
if is!(parser, EOF) {
break;
}

values.push(parser.parse_generic_value()?);
}

values.push(parser.parse_generic_value()?);
}
Ok(values)
}) {
Ok(values) => values,
Err(err) => {
if *err.kind() != ErrorKind::Ignore {
self.errors.push(err);
}

Ok(values)
}) {
Ok(values) => values,
Err(err) => {
if *err.kind() != ErrorKind::Ignore {
self.errors.push(err);
list_of_component_values.children
}

locv.children
}
};
};

// 8. Return the declaration.
Ok(declaration)
Expand Down Expand Up @@ -1098,6 +1101,7 @@ where

function.span = span!(self, span.lo);

// Grammar parsing
match self.ctx.block_contents_grammar {
BlockContentsGrammar::DeclarationList => {}
_ => {
Expand Down
9 changes: 9 additions & 0 deletions crates/swc_css_parser/src/parser/util.rs
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@ use super::{
input::{Input, InputType, ParserInput},
Ctx, Error, PResult, Parse, Parser,
};
use crate::parser::BlockContentsGrammar;

impl<I> Parser<I>
where
Expand Down Expand Up @@ -77,6 +78,7 @@ where
let state = self.input.state();
let qualified_rule = self
.with_ctx(Ctx {
block_contents_grammar: BlockContentsGrammar::StyleBlock,
mixed_with_declarations: true,
..self.ctx
})
Expand Down Expand Up @@ -114,6 +116,13 @@ where
Err(_) => None,
}
}

pub(super) fn parse_declaration_from_temporary_list(
&mut self,
temporary_list: &ListOfComponentValues,
) -> PResult<Declaration> {
self.parse_according_to_grammar::<Declaration>(temporary_list, |parser| parser.parse_as())
}
}

pub(super) struct WithCtx<'w, I: 'w + ParserInput> {
Expand Down
24 changes: 24 additions & 0 deletions crates/swc_css_parser/tests/fixture/style-block/input.css
View file
Open in desktop
Expand Up @@ -113,3 +113,27 @@ a/**/
}
;
}

a {
color: red;

.class {
color: green;
}

color: blue;
}

.foo {
color: red;

+ .bar {
color: blue;
}
}

article {
color: green;
& { color: blue; }
color: red;
}