Merge branch 'stylelint-scss:master' into risky-parent-selectors

package.json

@@ -27,12 +27,12 @@
     "jest": "^29.7.0",
     "jest-preset-stylelint": "^7.0.0",
     "lint-staged": "^14.0.1",
-    "np": "^10.0.2",
+    "np": "^10.0.5",
     "postcss": "^8.4.35",
     "postcss-less": "^6.0.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.2.5",
-    "stylelint": "^16.3.1"
+    "stylelint": "^16.4.0"
   },
   "files": [
     "src/**/*.js",

src/rules/no-global-function-names/__tests__/index.js

@@ -290,6 +290,26 @@ testRule({
       @debug string.unique-id()
       `,
       description: "string.unique-id"
+    },
+    {
+      code: `
+      @use "sass:meta"
+      @function is-number($value) {
+        @return meta.type-of($value) == 'number'
+      }
+      `,
+      description: "Allowed non-global function in @return"
+    },
+    {
+      code: `
+      @use "sass:meta"
+      @mixin foo($name) {
+        @if meta.type-of($name) != 'string' {
+          @error 'name must be a string, but was ' + meta.type-of($name)
+        }
+      }
+      `,
+      description: "Allowed non-global function in @if and @error"
     }
   ],
 
@@ -491,6 +511,41 @@ testRule({
         "Expected color.adjust($color, $lightness: $amount) instead of lighten($color, $amount)"
       ),
       description: "lighten"
+    },
+    {
+      code: `
+      @function is-number($value) {
+        @return type-of($value) == 'number'
+      }
+      `,
+      line: 3,
+      column: 17,
+      message: messages.rejected("type-of"),
+      description: "Global function in @return"
+    },
+    {
+      code: `
+      @mixin foo($name) {
+        @if type-of($name) != 'string' {
+          @error 'name must be a test(string), but was' + type-of($name)
+        }
+      }
+      `,
+      warnings: [
+        {
+          line: 3,
+          column: 13,
+          message: messages.rejected("type-of"),
+          description: "Global function in @if"
+        },
+        {
+          line: 4,
+          column: 59,
+          message: messages.rejected("type-of"),
+          description: "Global function in @error"
+        }
+      ],
+      description: "Global function in @if and @error"
     }
   ]
 });

src/rules/no-global-function-names/index.js

@@ -2,6 +2,7 @@
 
 const valueParser = require("postcss-value-parser");
 const { utils } = require("stylelint");
+const getAtRuleParams = require("../../utils/getAtRuleParams");
 const namespace = require("../../utils/namespace");
 const ruleUrl = require("../../utils/ruleUrl");
 
@@ -173,7 +174,15 @@ function rule(value) {
     }
 
     root.walkDecls(decl => {
-      valueParser(decl.value).walk(node => {
+      checkValue(decl, decl.value);
+    });
+    root.walkAtRules(atRule => {
+      const params = getAtRuleParams(atRule);
+      checkValue(atRule, params);
+    });
+
+    function checkValue(parentNode, value) {
+      valueParser(value).walk(node => {
         const cleanValue = node.value.replace(interpolationPrefix, "");
 
         // Verify that we're only looking at functions.
@@ -184,14 +193,14 @@ function rule(value) {
         if (rules[cleanValue]) {
           utils.report({
             message: messages.rejected(cleanValue),
-            node: decl,
+            node: parentNode,
             word: cleanValue,
             result,
             ruleName
           });
         }
       });
-    });
+    }
   };
 }