Fix at-function-pattern end positions (#900)

stylelint-scss · Dec 11, 2023 · 94f64c4 · 94f64c4
1 parent 62139e4
commit 94f64c4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 47 deletions.
diff --git a/src/rules/at-function-pattern/__tests__/index.js b/src/rules/at-function-pattern/__tests__/index.js
@@ -79,9 +79,9 @@ testRule({
       }
     `,
       line: 2,
-      column: 7,
-      endLine: 3,
-      endColumn: 0,
+      column: 17,
+      endLine: 2,
+      endColumn: 21,
       message: messages.expected,
       description: "Regexp: sequence part. Example: symbol in between."
     }
@@ -125,9 +125,9 @@ testRule({
       }
     `,
       line: 2,
-      column: 7,
-      endLine: 3,
-      endColumn: 0,
+      column: 17,
+      endLine: 2,
+      endColumn: 21,
       message: messages.expected,
       description: "String: sequence part. Example: symbol in between."
     },
@@ -137,9 +137,9 @@ testRule({
       }
     `,
       line: 2,
-      column: 7,
-      endLine: 3,
-      endColumn: 0,
+      column: 17,
+      endLine: 2,
+      endColumn: 19,
       message: messages.expected,
       description: "String: sequence part. Example: not a full sequence."
     }
@@ -202,9 +202,9 @@ testRule({
       }
     `,
       line: 2,
-      column: 7,
-      endLine: 3,
-      endColumn: 0,
+      column: 17,
+      endLine: 2,
+      endColumn: 21,
       message: messages.expected,
       description: "Regexp: strict match. Example: matches at the end."
     },
@@ -214,9 +214,9 @@ testRule({
       }
     `,
       line: 2,
-      column: 7,
-      endLine: 3,
-      endColumn: 0,
+      column: 17,
+      endLine: 2,
+      endColumn: 21,
       message: messages.expected,
       description: "Regexp: strict match. Example: matches at the beginning."
     },
@@ -226,9 +226,9 @@ testRule({
       }
     `,
       line: 2,
-      column: 7,
-      endLine: 3,
-      endColumn: 0,
+      column: 17,
+      endLine: 2,
+      endColumn: 21,
       message: messages.expected,
       description: "Regexp: strict match. Example: symbol in between."
     },
@@ -240,9 +240,9 @@ testRule({
       }
     `,
       line: 2,
-      column: 7,
+      column: 17,
       endLine: 3,
-      endColumn: 0,
+      endColumn: 10,
       message: messages.expected,
       description:
         "Regexp: strict match. Example: function name divided by newlines."
@@ -281,9 +281,9 @@ testRule({
       }
     `,
       line: 2,
-      column: 7,
-      endLine: 3,
-      endColumn: 0,
+      column: 17,
+      endLine: 2,
+      endColumn: 21,
       message: messages.expected,
       description:
         "Regexp: pattern at the beginning. Example: matches at the end."
@@ -294,9 +294,9 @@ testRule({
       }
     `,
       line: 2,
-      column: 7,
-      endLine: 3,
-      endColumn: 0,
+      column: 17,
+      endLine: 2,
+      endColumn: 21,
       message: messages.expected,
       description:
         "Regexp: pattern at the beginning. Example: symbol in between."
@@ -325,28 +325,28 @@ testRule({
     {
       code: "@function boo-Foo-bar ( $p) {}",
       line: 1,
-      column: 1,
-      endLine: 2,
-      endColumn: 0,
+      column: 11,
+      endLine: 1,
+      endColumn: 22,
       message: messages.expected,
       description:
         "Regexp: SUIT component. Example: starts with lowercase, two elements"
     },
     {
       code: "@function foo-bar ($p) {}",
       line: 1,
-      column: 1,
-      endLine: 2,
-      endColumn: 0,
+      column: 11,
+      endLine: 1,
+      endColumn: 18,
       message: messages.expected,
       description: "Regexp: SUIT component. Example: starts with lowercase"
     },
     {
       code: "@function Foo-Bar ($p) {}",
       line: 1,
-      column: 1,
-      endLine: 2,
-      endColumn: 0,
+      column: 11,
+      endLine: 1,
+      endColumn: 18,
       message: messages.expected,
       description:
         "Regexp: SUIT component. Example: element starts with uppercase"

diff --git a/src/rules/at-function-pattern/index.js b/src/rules/at-function-pattern/index.js
@@ -28,28 +28,20 @@ function rule(pattern) {
 
     const regexpPattern = isString(pattern) ? new RegExp(pattern) : pattern;
 
-    root.walkAtRules(decl => {
-      if (decl.name !== "function") {
-        return;
-      }
-
+    root.walkAtRules("function", atRule => {
       // Stripping the function of its arguments
-      const funcName = decl.params.replace(/(\s*)\([\s\S]*\)/g, "");
+      const funcName = atRule.params.replace(/(\s*)\([\s\S]*\)/g, "");
 
       if (regexpPattern.test(funcName)) {
         return;
       }
 
-      const funcTopLine = Object.assign({}, decl.source.start);
-      funcTopLine.line += 1;
-      funcTopLine.column = 0;
-
       utils.report({
         message: messages.expected,
-        node: decl,
+        node: atRule,
         result,
         ruleName,
-        end: funcTopLine
+        word: funcName
       });
     });
   };