fix(css/codegen): Fix codegen of pseudo class selectors (#6186)

swc-project · Oct 18, 2022 · 4fba0db · 4fba0db · github-actions · Oct 18, 2022
1 parent e303166
commit 4fba0db
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/crates/swc_css_codegen/src/lib.rs b/crates/swc_css_codegen/src/lib.rs
@@ -2486,7 +2486,17 @@ where
                         formatting_space!(self);
                     }
                     _ => {
-                        space!(self)
+                        let next = nodes.get(idx + 1);
+
+                        match next {
+                            Some(PseudoClassSelectorChildren::Delimiter(Delimiter {
+                                value: DelimiterValue::Comma,
+                                ..
+                            })) => {}
+                            _ => {
+                                space!(self)
+                            }
+                        }
                     }
                 }
             }

diff --git a/crates/swc_css_codegen/tests/fixture/selectors/pseudo-class/lang/input.css b/crates/swc_css_codegen/tests/fixture/selectors/pseudo-class/lang/input.css
@@ -5,3 +5,5 @@ html:lang(de) {}
 html:lang(de, fr) {}
 :lang(fr-be) > q {}
 :lang(de) > q {}
+:lang(zh, "*-hant") {}
+:lang("*-hant", zh) {}
diff --git a/crates/swc_css_codegen/tests/fixture/selectors/pseudo-class/lang/output.css b/crates/swc_css_codegen/tests/fixture/selectors/pseudo-class/lang/output.css
@@ -2,6 +2,8 @@
 :lang("*-Latn") {}
 html:lang(fr-be) {}
 html:lang(de) {}
-html:lang(de , fr) {}
+html:lang(de, fr) {}
 :lang(fr-be) > q {}
 :lang(de) > q {}
+:lang(zh, "*-hant") {}
+:lang("*-hant", zh) {}
diff --git a/crates/swc_css_codegen/tests/fixture/selectors/pseudo-class/lang/output.min.css b/crates/swc_css_codegen/tests/fixture/selectors/pseudo-class/lang/output.min.css
@@ -1 +1 @@
-:lang(\*-Latn){}:lang("*-Latn"){}html:lang(fr-be){}html:lang(de){}html:lang(de ,fr){}:lang(fr-be)>q{}:lang(de)>q{}
+:lang(\*-Latn){}:lang("*-Latn"){}html:lang(fr-be){}html:lang(de){}html:lang(de,fr){}:lang(fr-be)>q{}:lang(de)>q{}:lang(zh,"*-hant"){}:lang("*-hant",zh){}
Benchmark suite	Current: `4fba0db`	Previous: `f2e8f98`	Ratio
`es/full/minify/libraries/antd`	`2485867065` ns/iter (`± 159117675`)	`1878700661` ns/iter (`± 89805750`)	`1.32`
`es/full/minify/libraries/d3`	`516855354` ns/iter (`± 47232410`)	`387487549` ns/iter (`± 24752631`)	`1.33`
`es/full/minify/libraries/echarts`	`2099595453` ns/iter (`± 417552009`)	`1534913531` ns/iter (`± 23733877`)	`1.37`
`es/full/minify/libraries/jquery`	`162413743` ns/iter (`± 19707900`)	`97368465` ns/iter (`± 4243973`)	`1.67`
`es/full/minify/libraries/lodash`	`230163549` ns/iter (`± 790197817`)	`110894793` ns/iter (`± 3372872`)	`2.08`
`es/full/minify/libraries/moment`	`82876284` ns/iter (`± 26986994`)	`56580540` ns/iter (`± 3591013`)	`1.46`
`es/full/minify/libraries/react`	`26866982` ns/iter (`± 3402301`)	`19357482` ns/iter (`± 323906`)	`1.39`
`es/full/minify/libraries/terser`	`463832480` ns/iter (`± 277141856`)	`286703973` ns/iter (`± 16566817`)	`1.62`
`es/full/minify/libraries/three`	`747342130` ns/iter (`± 1147585187`)	`531278510` ns/iter (`± 14165660`)	`1.41`
`es/full/minify/libraries/typescript`	`4534278015` ns/iter (`± 553923193`)	`3328557689` ns/iter (`± 802979766`)	`1.36`
`es/full/minify/libraries/victory`	`1032825615` ns/iter (`± 114218453`)	`810374802` ns/iter (`± 38787730`)	`1.27`
`es/full/minify/libraries/vue`	`233975306` ns/iter (`± 21828558`)	`154479912` ns/iter (`± 20640614`)	`1.51`
`es/full/codegen/es3`	`51360` ns/iter (`± 7187`)	`34519` ns/iter (`± 7662`)	`1.49`
`es/full/codegen/es5`	`48971` ns/iter (`± 13859`)	`34840` ns/iter (`± 4451`)	`1.41`
`es/full/codegen/es2015`	`41280` ns/iter (`± 6505`)	`34445` ns/iter (`± 851`)	`1.20`
`es/full/codegen/es2016`	`43398` ns/iter (`± 6710`)	`34412` ns/iter (`± 1871`)	`1.26`
`es/full/codegen/es2017`	`49587` ns/iter (`± 16148`)	`34578` ns/iter (`± 3276`)	`1.43`
`es/full/codegen/es2018`	`56675` ns/iter (`± 20585`)	`34526` ns/iter (`± 2179`)	`1.64`
`es/full/codegen/es2019`	`55821` ns/iter (`± 141062`)	`34694` ns/iter (`± 3055`)	`1.61`
`es/full/codegen/es2020`	`49395` ns/iter (`± 10632`)	`34937` ns/iter (`± 3651`)	`1.41`
`es/full/all/es3`	`328661105` ns/iter (`± 926742030`)	`197446931` ns/iter (`± 17107172`)	`1.66`
`es/full/all/es5`	`279355594` ns/iter (`± 114340260`)	`190941508` ns/iter (`± 19185265`)	`1.46`
`es/full/all/es2015`	`252875509` ns/iter (`± 327975522`)	`152983063` ns/iter (`± 18275554`)	`1.65`
`es/full/all/es2016`	`227626657` ns/iter (`± 34693216`)	`168569463` ns/iter (`± 26540963`)	`1.35`
`es/full/all/es2017`	`201369801` ns/iter (`± 25238879`)	`169171930` ns/iter (`± 10811784`)	`1.19`
`es/full/all/es2018`	`172894782` ns/iter (`± 22920134`)	`162416804` ns/iter (`± 23845745`)	`1.06`
`es/full/all/es2019`	`194881428` ns/iter (`± 31590823`)	`166985384` ns/iter (`± 21256315`)	`1.17`
`es/full/all/es2020`	`199988019` ns/iter (`± 40526358`)	`161254477` ns/iter (`± 13654138`)	`1.24`
`es/full/parser`	`1108369` ns/iter (`± 292773`)	`749744` ns/iter (`± 66676`)	`1.48`
`es/full/base/fixer`	`35748` ns/iter (`± 5385`)	`27050` ns/iter (`± 1496`)	`1.32`
`es/full/base/resolver_and_hygiene`	`122014` ns/iter (`± 17063`)	`97024` ns/iter (`± 3363`)	`1.26`
`serialization of ast node`	`276` ns/iter (`± 43`)	`212` ns/iter (`± 10`)	`1.30`
`serialization of serde`	`312` ns/iter (`± 52`)	`212` ns/iter (`± 17`)	`1.47`