From 2962bd76460335b093e74163813a8ab0ca72f0f6 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Sun, 24 Apr 2022 06:44:35 -0700 Subject: [PATCH] Fix end positions for `at-rule-*-list` (#6032) Co-authored-by: Masafumi Koba <473530+ybiquitous@users.noreply.github.com> --- lib/rules/at-rule-allowed-list/__tests__/index.js | 8 ++++++++ lib/rules/at-rule-allowed-list/index.js | 1 + lib/rules/at-rule-disallowed-list/__tests__/index.js | 7 +++++++ lib/rules/at-rule-disallowed-list/index.js | 1 + 4 files changed, 17 insertions(+) diff --git a/lib/rules/at-rule-allowed-list/__tests__/index.js b/lib/rules/at-rule-allowed-list/__tests__/index.js index 89e98c19c5..8e720e9f74 100644 --- a/lib/rules/at-rule-allowed-list/__tests__/index.js +++ b/lib/rules/at-rule-allowed-list/__tests__/index.js @@ -70,6 +70,8 @@ testRule({ `, line: 2, column: 7, + endLine: 2, + endColumn: 13, message: messages.rejected('mixin'), description: '@rule not from an allowed list; independent rule.', }, @@ -128,6 +130,8 @@ testRule({ message: messages.rejected('mixin'), line: 2, column: 7, + endLine: 2, + endColumn: 13, description: '@rule not from an allowed list.', }, { @@ -135,6 +139,8 @@ testRule({ message: messages.rejected('import'), line: 1, column: 1, + endLine: 1, + endColumn: 8, description: '@rule not from an allowed list.', }, { @@ -142,6 +148,8 @@ testRule({ message: messages.rejected('media'), line: 1, column: 1, + endLine: 1, + endColumn: 7, description: '@rule not from an allowed list.', }, ], diff --git a/lib/rules/at-rule-allowed-list/index.js b/lib/rules/at-rule-allowed-list/index.js index 963a675055..e2d4e16fa4 100644 --- a/lib/rules/at-rule-allowed-list/index.js +++ b/lib/rules/at-rule-allowed-list/index.js @@ -47,6 +47,7 @@ const rule = (primary) => { node: atRule, result, ruleName, + word: `@${name}`, }); }); }; diff --git a/lib/rules/at-rule-disallowed-list/__tests__/index.js b/lib/rules/at-rule-disallowed-list/__tests__/index.js index d2f325ee4e..5d3f0f0474 100644 --- a/lib/rules/at-rule-disallowed-list/__tests__/index.js +++ b/lib/rules/at-rule-disallowed-list/__tests__/index.js @@ -24,6 +24,8 @@ testRule({ message: messages.rejected('extend'), line: 1, column: 5, + endLine: 1, + endColumn: 12, description: '@rule from a disallowed list, is a Sass directive.', }, { @@ -36,6 +38,8 @@ testRule({ message: messages.rejected('extend'), line: 3, column: 9, + endLine: 3, + endColumn: 16, description: '@rule from a disallowed list; newline after its name.', }, { @@ -47,6 +51,9 @@ testRule({ `, message: messages.rejected('keyframes'), line: 2, + column: 7, + endLine: 2, + endColumn: 17, description: '@rule from a disallowed list; independent rule.', }, { diff --git a/lib/rules/at-rule-disallowed-list/index.js b/lib/rules/at-rule-disallowed-list/index.js index 0722de0e50..9437edbf10 100644 --- a/lib/rules/at-rule-disallowed-list/index.js +++ b/lib/rules/at-rule-disallowed-list/index.js @@ -47,6 +47,7 @@ const rule = (primary) => { node: atRule, result, ruleName, + word: `@${atRule.name}`, }); }); };