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): many fixes #6281

Merged
merged 13 commits into from
Oct 28, 2022
Merged

refactor(css/parser): many fixes #6281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
136ad3b
refactor(css/parser): refactor
alexander-akait Oct 27, 2022
0a9c5a6
fix: error repoting
alexander-akait Oct 27, 2022
4da55b5
fix: error reporting
alexander-akait Oct 27, 2022
64bf9b2
fix: error reporting
alexander-akait Oct 27, 2022
3202c0e
refactor: declaration parsing
alexander-akait Oct 28, 2022
061bca7
fix: prefixer
alexander-akait Oct 28, 2022
0dc04ee
fix: avoid parsing broken functions
alexander-akait Oct 28, 2022
ceb7d9c
fix: codegen
alexander-akait Oct 28, 2022
3bb2cb4
fix: report
alexander-akait Oct 28, 2022
83e459c
fix: report
alexander-akait Oct 28, 2022
729109b
fix: clippy
alexander-akait Oct 28, 2022
b807239
fix: clippy
alexander-akait Oct 28, 2022
6368fe5
Merge branch 'main' into refactor-parser
swc-bot Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion crates/swc_css_codegen/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,11 @@ where
}

if is_custom_property {
self.emit_list(&n.value, ListFormat::NotDelimited)?;
self.with_ctx(Ctx {
in_list_of_component_values: true,
..self.ctx
})
.emit_list(&n.value, ListFormat::NotDelimited)?;
} else {
self.emit_list_of_component_values_inner(
&n.value,
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/at-rules/supports/3/output.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@supports (--x: y , z ) {
@supports (--x: y , z) {
a {
color: red;
}
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/at-rules/supports/3/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.

18 changes: 9 additions & 9 deletions crates/swc_css_codegen/tests/fixture/declaration/custom-properties/output.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
div {
--y: ;
--x: var(--y) ;
--x: var(--y);
--z: 0px;
--foo: if(x > 5) this.width = 10;
--bar: ;
--bar2: ;
--yz: foo !important;
--yz: foo!important;
}
div {
width: var(--a,);
Expand Down Expand Up @@ -59,10 +59,10 @@ div {
--x: y;
}
* {
--x: y ;
--x: y;
}
* {
--x: y, ;
--x: y,;
}
* {
--x: var(y,);
Expand All @@ -74,7 +74,7 @@ div {
--x: (y);
}
* {
--x: (y) ;
--x: (y);
}
* {
--x: (y);
Expand All @@ -89,7 +89,7 @@ div {
--x: f(y);
}
* {
--x: f(y) ;
--x: f(y);
}
* {
--x: f(y);
Expand All @@ -104,7 +104,7 @@ div {
--x: [y];
}
* {
--x: [y] ;
--x: [y];
}
* {
--x: [y];
Expand All @@ -119,7 +119,7 @@ div {
--x: {y};
}
* {
--x: {y} ;
--x: {y};
}
* {
--x: {y};
Expand All @@ -130,7 +130,7 @@ div {
* {
--x: { y};
}
@supports (--x: y , z ) {
@supports (--x: y , z) {
a {
color: red;
}
Expand Down
4 changes: 2 additions & 2 deletions crates/swc_css_codegen/tests/fixture/declaration/custom-properties/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.

5 changes: 3 additions & 2 deletions crates/swc_css_codegen/tests/fixture/declaration/important/output.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:root {
--foo: red !important;
--foo: red!important;
--foo: red!important;
}
div {
Expand All @@ -24,7 +24,8 @@ a {
}
}
.foo {
color: red !ie;}
color: red !ie;
}
* {
--x: !important;
}
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/declaration/important/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.

12 changes: 6 additions & 6 deletions crates/swc_css_codegen/tests/fixture/preserved-token/custom-properties/output.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
--x: y;
}
* {
--x: y ;
--x: y;
}
* {
--x: y, ;
--x: y,;
}
* {
--x: var(y,);
Expand All @@ -29,7 +29,7 @@
--x: (y);
}
* {
--x: (y) ;
--x: (y);
}
* {
--x: (y);
Expand All @@ -44,7 +44,7 @@
--x: f(y);
}
* {
--x: f(y) ;
--x: f(y);
}
* {
--x: f(y);
Expand All @@ -59,7 +59,7 @@
--x: [y];
}
* {
--x: [y] ;
--x: [y];
}
* {
--x: [y];
Expand All @@ -74,7 +74,7 @@
--x: {y};
}
* {
--x: {y} ;
--x: {y};
}
* {
--x: {y};
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/preserved-token/custom-properties/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.

2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/qualified_rule/recovery/output.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $bad: rule;
a {
div.major { color: blue } color: red }
a {
div: hover { color: blue } color:red;
div: hover { color: blue } color: red;
}
a {
div: hover { color: blue };
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/qualified_rule/recovery/output.min.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +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}
a {div.major { color: blue } color: red }a{div:hover { color: blue } color: red}a{div:hover{ color: blue };color:red}
3 changes: 2 additions & 1 deletion crates/swc_css_codegen/tests/fixture/style-blocks-contents/hacks/output.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ body:first-of-type .selector {}
|property: value;color: red;
}
.selector {
property: value !ie;}
property: value !ie;
}
@media screen\9 {}
@media \0screen\,screen\9 {}
@media \0screen {}
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/style-blocks-contents/hacks/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.

3 changes: 2 additions & 1 deletion crates/swc_css_codegen/tests/fixture/values/url/1/output.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ div {
background: url('\"foo\"');
}
.bar {
background: url(http://example.com/image.svg param(--color var(--primary-color)));}
background: url(http://example.com/image.svg param(--color var(--primary-color);
}
.baz {
background: url("http://example.com/image.svg" param(--color var(--primary-color)));
}
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/values/url/1/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.

17 changes: 17 additions & 0 deletions crates/swc_css_lints/src/rules/unit_no_unknown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,21 @@ impl Visit for UnitNoUnknown {

unknown_dimension.visit_children_with(self);
}

fn visit_component_value(&mut self, component_value: &ComponentValue) {
if let ComponentValue::PreservedToken(
token_and_span @ TokenAndSpan {
token: Token::Dimension { unit, .. },
..
},
) = component_value
{
if self.ignored_units.iter().all(|item| !item.is_match(unit)) {
let message = format!("Unexpected unknown unit \"{}\".", unit);
self.ctx.report(token_and_span, message);
}
}

component_value.visit_children_with(self);
}
}
2 changes: 1 addition & 1 deletion crates/swc_css_lints/tests/rules/fail/unit-no-unknown/default/output.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
x Unexpected unknown unit "pix".
,-[$DIR/tests/rules/fail/unit-no-unknown/default/input.css:5:1]
5 | a { color: rgb(255pix, 0, 51); }
: ^^^
: ^^^^^^
`----

x Unexpected unknown unit "pix".
Expand Down
Loading