From d5872783c8786ba70c0c1e668c9bf8931d8bfe09 Mon Sep 17 00:00:00 2001 From: Masafumi Koba <473530+ybiquitous@users.noreply.github.com> Date: Sat, 13 Aug 2022 18:49:47 +0900 Subject: [PATCH] Fix `selector-pseudo-class-disallowed-list` end positions and message --- .../__tests__/index.js | 56 ++++++++++++++----- .../index.js | 5 +- 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/lib/rules/selector-pseudo-class-disallowed-list/__tests__/index.js b/lib/rules/selector-pseudo-class-disallowed-list/__tests__/index.js index ba3f9dbc73..781aa83ad6 100644 --- a/lib/rules/selector-pseudo-class-disallowed-list/__tests__/index.js +++ b/lib/rules/selector-pseudo-class-disallowed-list/__tests__/index.js @@ -64,33 +64,43 @@ testRule({ reject: [ { code: 'a:focus {}', - message: messages.rejected('focus'), + message: messages.rejected(':focus'), line: 1, column: 2, + endLine: 1, + endColumn: 8, }, { code: 'a,\n:global {}', - message: messages.rejected('global'), + message: messages.rejected(':global'), line: 2, column: 1, + endLine: 2, + endColumn: 8, }, { code: 'input:-ms-input-placeholder {}', - message: messages.rejected('-ms-input-placeholder'), + message: messages.rejected(':-ms-input-placeholder'), line: 1, column: 6, + endLine: 1, + endColumn: 28, }, { code: 'a:not(::selection) {}', - message: messages.rejected('not'), + message: messages.rejected(':not'), line: 1, column: 2, + endLine: 1, + endColumn: 6, }, { code: 'a:has(> img) {}', - message: messages.rejected('has'), + message: messages.rejected(':has'), line: 1, column: 2, + endLine: 1, + endColumn: 6, }, ], }); @@ -114,15 +124,19 @@ testRule({ reject: [ { code: 'a:last-child {}', - message: messages.rejected('last-child'), + message: messages.rejected(':last-child'), line: 1, column: 2, + endLine: 1, + endColumn: 13, }, { code: 'a:last-of-child {}', - message: messages.rejected('last-of-child'), + message: messages.rejected(':last-of-child'), line: 1, column: 2, + endLine: 1, + endColumn: 16, }, ], }); @@ -140,9 +154,11 @@ testRule({ reject: [ { code: 'a:last-child {}', - message: messages.rejected('last-child'), + message: messages.rejected(':last-child'), line: 1, column: 2, + endLine: 1, + endColumn: 13, }, ], }); @@ -160,42 +176,54 @@ testRule({ reject: [ { code: 'a:not() {}', - message: messages.rejected('not'), + message: messages.rejected(':not'), line: 1, column: 2, + endLine: 1, + endColumn: 6, }, { code: 'body:not(div):has(span) {}', warnings: [ { - message: messages.rejected('not'), + message: messages.rejected(':not'), line: 1, column: 5, + endLine: 1, + endColumn: 9, }, { - message: messages.rejected('has'), + message: messages.rejected(':has'), line: 1, column: 14, + endLine: 1, + endColumn: 18, }, ], }, { code: 'body:nt(div):not(span) {}', - message: messages.rejected('not'), + message: messages.rejected(':not'), line: 1, column: 13, + endLine: 1, + endColumn: 17, }, { code: 'a:has() {}', - message: messages.rejected('has'), + message: messages.rejected(':has'), line: 1, column: 2, + endLine: 1, + endColumn: 6, }, { code: 'a:matches() {}', - message: messages.rejected('matches'), + message: messages.rejected(':matches'), line: 1, column: 2, + endLine: 1, + endColumn: 10, }, ], }); diff --git a/lib/rules/selector-pseudo-class-disallowed-list/index.js b/lib/rules/selector-pseudo-class-disallowed-list/index.js index 994547b83d..02dc6391b6 100644 --- a/lib/rules/selector-pseudo-class-disallowed-list/index.js +++ b/lib/rules/selector-pseudo-class-disallowed-list/index.js @@ -47,7 +47,6 @@ const rule = (primary) => { const value = pseudoNode.value; // Ignore pseudo-elements - if (value.slice(0, 2) === '::') { return; } @@ -59,8 +58,8 @@ const rule = (primary) => { } report({ - index: pseudoNode.sourceIndex, - message: messages.rejected(name), + word: value, + message: messages.rejected(value), node: ruleNode, result, ruleName,