More special cases for invalid rules.

kaj · Jun 12, 2022 · 321cd58 · 321cd58
1 parent b9e8c19
commit 321cd58
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 19 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -155,6 +155,10 @@ pub enum Invalid {
     FunctionName,
     /// This at rule is not allowed here.
     AtRule,
+    /// Mixins may not contain mixin declarations.
+    MixinInMixin,
+    /// "Mixins may not contain function declarations.
+    FunctionInMixin,
     /// An `@error` reached.
     AtError(String),
 }
@@ -178,6 +182,12 @@ impl fmt::Display for Invalid {
             }
             Invalid::FunctionName => "Invalid function name.".fmt(out),
             Invalid::AtRule => "This at-rule is not allowed here.".fmt(out),
+            Invalid::MixinInMixin => {
+                "Mixins may not contain mixin declarations.".fmt(out)
+            }
+            Invalid::FunctionInMixin => {
+                "Mixins may not contain function declarations.".fmt(out)
+            }
             Invalid::AtError(msg) => msg.fmt(out),
         }
     }

diff --git a/src/output/transform.rs b/src/output/transform.rs
@@ -322,7 +322,7 @@ fn handle_item(
                 let p = pos.clone().opt_back("@function ");
                 return Err(Invalid::FunctionName.at(p));
             }
-            check_body(body, true, false)?;
+            check_body(body, BodyContext::Function)?;
             scope.define_function(
                 name.into(),
                 Function::closure(
@@ -338,7 +338,7 @@ fn handle_item(
         }
 
         Item::MixinDeclaration(ref name, ref args, ref body, ref pos) => {
-            check_body(body, true, true)?;
+            check_body(body, BodyContext::Mixin)?;
             scope.define_mixin(
                 name.into(),
                 MixinDecl::new(args, &scope, body, pos),
@@ -407,7 +407,7 @@ fn handle_item(
             handle_body(items, head, rule, buf, scope, file_context)?;
         }
         Item::Each(ref names, ref values, ref body) => {
-            check_body(body, true, true)?;
+            check_body(body, BodyContext::Each)?;
             let mut rule = rule;
             let pushed = scope.store_local_values(names);
             for value in values.evaluate(scope.clone())?.iter_items() {
@@ -478,7 +478,7 @@ fn handle_item(
         }
 
         Item::Rule(ref selectors, ref body) => {
-            check_body(body, false, true)?;
+            check_body(body, BodyContext::Rule)?;
             if rule.is_none() {
                 buf.do_separate();
             }
@@ -526,7 +526,7 @@ fn handle_item(
         }
         Item::NamespaceRule(ref name, ref value, ref body) => {
             if let Some(rule) = rule {
-                check_body(body, true, true)?;
+                check_body(body, BodyContext::NsRule)?;
                 let value = value.evaluate(scope.clone())?;
                 let name = name.evaluate(scope.clone())?;
                 if !value.is_null() {
@@ -579,11 +579,17 @@ fn handle_item(
     Ok(())
 }
 
-fn check_body(
-    body: &[Item],
-    forbid_unknown: bool,
-    forbid_return: bool,
-) -> Result<(), Error> {
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum BodyContext {
+    Mixin,
+    Function,
+    Each,
+    Rule,
+    NsRule,
+}
+
+fn check_body(body: &[Item], context: BodyContext) -> Result<(), Error> {
+    let forbid_unknown = context != BodyContext::Rule;
     for item in body {
         match item {
             Item::Forward(_, _, _, _, pos) => {
@@ -593,14 +599,31 @@ fn check_body(
                 return Err(Invalid::AtRule.at(pos.clone()));
             }
             Item::MixinDeclaration(.., ref pos) if forbid_unknown => {
-                return Err(Invalid::AtRule
-                    .at(pos.clone().opt_trail_ws().opt_back("@mixin ")));
+                if context == BodyContext::Mixin {
+                    return Err(
+                        Invalid::MixinInMixin //  AtRule
+                            .at(pos
+                                .clone()
+                                .opt_trail_ws()
+                                .opt_back("@mixin ")),
+                    );
+                } else {
+                    return Err(Invalid::AtRule
+                        .at(pos.clone().opt_trail_ws().opt_back("@mixin ")));
+                }
             }
             Item::FunctionDeclaration(_, _, ref pos, _) if forbid_unknown => {
-                return Err(Invalid::AtRule
-                    .at(pos.clone().opt_trail_ws().opt_back("@function ")));
+                if context == BodyContext::Mixin {
+                    return Err(Invalid::FunctionInMixin
+                        .at(pos.clone().opt_back("@function ")));
+                } else {
+                    return Err(Invalid::AtRule.at(pos
+                        .clone()
+                        .opt_trail_ws()
+                        .opt_back("@function ")));
+                }
             }
-            Item::Return(_, ref pos) if forbid_return => {
+            Item::Return(_, ref pos) if context != BodyContext::Function => {
                 return Err(Invalid::AtRule.at(pos.clone()));
             }
             Item::AtRule {

diff --git a/tests/spec/libsass_closed_issues/issue_1550/mixin_embedded.rs b/tests/spec/libsass_closed_issues/issue_1550/mixin_embedded.rs
@@ -6,7 +6,6 @@ fn runner() -> crate::TestRunner {
 }
 
 #[test]
-#[ignore] // wrong error
 fn test() {
     assert_eq!(
         runner().err(

diff --git a/tests/spec/libsass_closed_issues/issue_1941/mixin_function.rs b/tests/spec/libsass_closed_issues/issue_1941/mixin_function.rs
@@ -6,7 +6,6 @@ fn runner() -> crate::TestRunner {
 }
 
 #[test]
-#[ignore] // wrong error
 fn test() {
     assert_eq!(
         runner().err(

diff --git a/tests/spec/libsass_closed_issues/issue_1941/mixin_mixin.rs b/tests/spec/libsass_closed_issues/issue_1941/mixin_mixin.rs
@@ -6,7 +6,6 @@ fn runner() -> crate::TestRunner {
 }
 
 #[test]
-#[ignore] // wrong error
 fn test() {
     assert_eq!(
         runner().err(

diff --git a/tests/spec/non_conformant/errors/invalid_parent/function_in_mixin.rs b/tests/spec/non_conformant/errors/invalid_parent/function_in_mixin.rs
@@ -6,7 +6,6 @@ fn runner() -> crate::TestRunner {
 }
 
 #[test]
-#[ignore] // wrong error
 fn test() {
     assert_eq!(
         runner().err(