Fix at-extend-no-missing-placeholder end positions (stylelint-scss#899

)
ybiquitous · Dec 11, 2023 · 62139e4 · 62139e4
1 parent 620dbd2
commit 62139e4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/rules/at-extend-no-missing-placeholder/__tests__/index.js b/src/rules/at-extend-no-missing-placeholder/__tests__/index.js
@@ -43,6 +43,9 @@ testRule({
       }
     `,
       line: 3,
+      column: 17,
+      endLine: 3,
+      endColumn: 21,
       message: messages.rejected,
       description: "when extending with an element"
     },

diff --git a/src/rules/at-extend-no-missing-placeholder/index.js b/src/rules/at-extend-no-missing-placeholder/index.js
@@ -15,6 +15,8 @@ const meta = {
   url: ruleUrl(ruleName)
 };
 
+const INTERPOLATION_PATTERN = /^#{.+}/;
+
 function rule(actual) {
   return (root, result) => {
     const validOptions = utils.validateOptions(result, ruleName, { actual });
@@ -24,17 +26,20 @@ function rule(actual) {
     }
 
     root.walkAtRules("extend", atrule => {
-      const isPlaceholder = atrule.params.trim()[0] === "%";
-      const isInterpolation = /^#{.+}/.test(atrule.params.trim());
-
-      if (!isPlaceholder && !isInterpolation) {
-        utils.report({
-          ruleName,
-          result,
-          node: atrule,
-          message: messages.rejected
-        });
-      }
+      const param = atrule.params.trim();
+
+      // Placeholder
+      if (param.startsWith("%")) return;
+
+      if (INTERPOLATION_PATTERN.test(param)) return;
+
+      utils.report({
+        ruleName,
+        result,
+        node: atrule,
+        message: messages.rejected,
+        word: param
+      });
     });
   };
 }