refactor(css/parser): Use new approach for parsing invalid tokens (#6224

)

Co-authored-by: Donny/강동윤 <kdy1997.dev@gmail.com>

crates/swc_css_codegen/tests/fixture/qualified_rule/recovery-1/input.css

@@ -0,0 +1,7 @@
+a {};
+
+b {};
+
+c { }
+
+c {color: red;  }

crates/swc_css_codegen/tests/fixture/qualified_rule/recovery-1/output.css

@@ -0,0 +1,10 @@
+a {}
+;
+
+b {}
+;
+
+c {}
+c {
+  color: red;
+}

crates/swc_css_codegen/tests/fixture/qualified_rule/recovery-1/output.min.css

@@ -0,0 +1,5 @@
+a{};
+
+b {};
+
+c {}c{color:red}

crates/swc_css_codegen/tests/fixture/qualified_rule/recovery/input.css

@@ -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 }

crates/swc_css_codegen/tests/fixture/qualified_rule/recovery/output.css

@@ -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;
 }

crates/swc_css_codegen/tests/fixture/qualified_rule/recovery/output.min.css

@@ -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}

crates/swc_css_minifier/tests/fixture/compress-at-rule/layer/input.css

@@ -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 {

crates/swc_css_parser/src/parser/at_rules/mod.rs

@@ -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()?);
@@ -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