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): new approach #6224

Merged
merged 20 commits into from Oct 22, 2022
Merged

refactor(css/parser): new approach #6224

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e400f39
refactor(css/parser): inner parser
alexander-akait Oct 20, 2022
c931fe6
refactor(css/parser): new approach
alexander-akait Oct 21, 2022
f8845b8
refactor: using component values as per spec
alexander-akait Oct 21, 2022
69ce8aa
refactor: implement
alexander-akait Oct 21, 2022
9d07f1c
test: update
alexander-akait Oct 21, 2022
1499073
fix: clippy
alexander-akait Oct 21, 2022
ef35cbf
fix: logic
alexander-akait Oct 21, 2022
8482d44
test: fix invalid syntax
alexander-akait Oct 21, 2022
63799d5
test: fix invalid syntax
alexander-akait Oct 21, 2022
1dc8f37
fix: logic
alexander-akait Oct 21, 2022
f547f78
fix: logic
alexander-akait Oct 21, 2022
033a36a
test: fix
alexander-akait Oct 21, 2022
493861f
fix: logic
alexander-akait Oct 22, 2022
53c6796
test: fix TODO
alexander-akait Oct 22, 2022
235b62a
fix: logic and todo (already)
alexander-akait Oct 22, 2022
7519ae2
refactor: avoid extra clone
alexander-akait Oct 22, 2022
d6d3025
fix: small perf
alexander-akait Oct 22, 2022
012f98f
fix: small perf
alexander-akait Oct 22, 2022
b7929b5
BalanceToken
kdy1 Oct 22, 2022
55c1696
Merge branch 'main' into refactor-css-parser
swc-bot Oct 22, 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
7 changes: 7 additions & 0 deletions crates/swc_css_codegen/tests/fixture/qualified_rule/recovery-1/input.css
View file
Open in desktop
@@ -0,0 +1,7 @@
a {};

b {};

c { }

c {color: red; }
10 changes: 10 additions & 0 deletions crates/swc_css_codegen/tests/fixture/qualified_rule/recovery-1/output.css
View file
Open in desktop
@@ -0,0 +1,10 @@
a {}
;

b {}
;

c {}
c {
color: red;
}
5 changes: 5 additions & 0 deletions crates/swc_css_codegen/tests/fixture/qualified_rule/recovery-1/output.min.css
View file
Open in desktop
@@ -0,0 +1,5 @@
a{};

b {};

c {}c{color:red}
2 changes: 0 additions & 2 deletions crates/swc_css_codegen/tests/fixture/qualified_rule/recovery/input.css
View file
Open in desktop
Expand Up @@ -17,8 +17,6 @@ $bad foo { color: red }

$bad: rule;

/* TODO: FIX ME */
/* a {}; b {}; */

a { div.major { color: blue } color: red }
a { div:hover { color: blue } color: red }
Expand Down
5 changes: 3 additions & 2 deletions crates/swc_css_codegen/tests/fixture/qualified_rule/recovery/output.css
View file
Open in desktop
Expand Up @@ -18,9 +18,10 @@ $bad foo {
color: red;
}
$bad: rule;


a {
div.major { color: blue }
color: red }
div.major { color: blue } color: red }
a {
div: hover {color:blue} color:red;
}
Expand Down
6 changes: 4 additions & 2 deletions crates/swc_css_codegen/tests/fixture/qualified_rule/recovery/output.min.css
View file
Open in desktop
@@ -1,2 +1,4 @@
{}{color:red}#broken# {color:red}$bad{color:red}$bad {color:red}$bad foo{color:red}$bad foo {color:red}$bad: rule;a{div.major { color: blue }color: red }
a {div:hover{color:blue}color:red}a{div:hover{color:blue};color:red}
{}{color:red}#broken# {color:red}$bad{color:red}$bad {color:red}$bad foo{color:red}$bad foo {color:red}$bad: rule;


a {div.major { color: blue } color: red }a{div:hover{color:blue}color:red}a{div:hover{color:blue};color:red}
20 changes: 16 additions & 4 deletions crates/swc_css_minifier/tests/fixture/compress-at-rule/layer/input.css
View file
Open in desktop
Expand Up @@ -31,18 +31,30 @@

@layer {
@layer foo {
color: red;
.class {
color: red;
}
}
@layer foo {
color: red;
.class {
color: red;
}
}
}

@layer {
@layer foo { color: red; }
@layer foo {
.class {
color: red;
}
}
}
@layer {
@layer foo { color: red; }
@layer foo {
.class {
color: red;
}
}
}

@layer framework {
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_minifier/tests/fixture/compress-at-rule/layer/output.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 20 additions & 17 deletions crates/swc_css_parser/src/parser/at_rules/mod.rs
View file
Open in desktop
Expand Up @@ -171,7 +171,7 @@ where
parser.input.skip_ws();

let prelude = if is!(parser, Ident) {
let mut name_list = vec![];
let mut name_list: Vec<LayerName> = vec![];

while is!(parser, Ident) {
name_list.push(parser.parse()?);
Expand All @@ -185,23 +185,26 @@ where
}
}

match name_list.len() == 1 {
// Block
true => Some(AtRulePrelude::LayerPrelude(LayerPrelude::Name(
name_list.remove(0),
))),
// Statement
false => {
let first = name_list[0].span;
let last = name_list[name_list.len() - 1].span;

Some(AtRulePrelude::LayerPrelude(LayerPrelude::NameList(
LayerNameList {
name_list,
span: Span::new(first.lo, last.hi, Default::default()),
},
)))
if is!(parser, ";") {
let first = name_list[0].span;
let last = name_list[name_list.len() - 1].span;

Some(AtRulePrelude::LayerPrelude(LayerPrelude::NameList(
LayerNameList {
name_list,
span: Span::new(first.lo, last.hi, Default::default()),
},
)))
} else {
if name_list.len() > 1 {
let span = parser.input.cur_span();

return Err(Error::new(span, ErrorKind::Expected("';' token")));
}

Some(AtRulePrelude::LayerPrelude(LayerPrelude::Name(
name_list.remove(0),
)))
}
} else {
None
Expand Down