From cd680487b55c3bc7269a7e90ca26f8bb92dd80c2 Mon Sep 17 00:00:00 2001
From: Masafumi Koba <473530+ybiquitous@users.noreply.github.com>
Date: Wed, 17 Aug 2022 09:16:26 +0900
Subject: [PATCH] Fix `selector-pseudo-element-{allowed,disallowed}-list` end
 positions and message (#6270)

---
 .../__tests__/index.js                        | 26 +++++++++++------
 .../index.js                                  |  5 ++--
 .../__tests__/index.js                        | 28 ++++++++++++++-----
 .../index.js                                  |  5 ++--
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/lib/rules/selector-pseudo-element-allowed-list/__tests__/index.js b/lib/rules/selector-pseudo-element-allowed-list/__tests__/index.js
index b7854fc39b..54bd92e902 100644
--- a/lib/rules/selector-pseudo-element-allowed-list/__tests__/index.js
+++ b/lib/rules/selector-pseudo-element-allowed-list/__tests__/index.js
@@ -36,33 +36,43 @@ testRule({
 	reject: [
 		{
 			code: 'a::BEFORE {}',
-			message: messages.rejected('BEFORE'),
+			message: messages.rejected('::BEFORE'),
 			line: 1,
 			column: 2,
+			endLine: 1,
+			endColumn: 10,
 		},
 		{
 			code: 'a::after {}',
-			message: messages.rejected('after'),
+			message: messages.rejected('::after'),
 			line: 1,
 			column: 2,
+			endLine: 1,
+			endColumn: 9,
 		},
 		{
 			code: 'a::AFTER {}',
-			message: messages.rejected('AFTER'),
+			message: messages.rejected('::AFTER'),
 			line: 1,
 			column: 2,
+			endLine: 1,
+			endColumn: 9,
 		},
 		{
 			code: 'a,\nb::after {}',
-			message: messages.rejected('after'),
+			message: messages.rejected('::after'),
 			line: 2,
 			column: 2,
+			endLine: 2,
+			endColumn: 9,
 		},
 		{
 			code: 'a::not-my-pseudo-element {}',
-			message: messages.rejected('not-my-pseudo-element'),
+			message: messages.rejected('::not-my-pseudo-element'),
 			line: 1,
 			column: 2,
+			endLine: 1,
+			endColumn: 25,
 		},
 	],
 });
@@ -82,13 +92,13 @@ testRule({
 	reject: [
 		{
 			code: 'a::after {}',
-			message: messages.rejected('after'),
+			message: messages.rejected('::after'),
 			line: 1,
 			column: 2,
 		},
 		{
 			code: 'a::not-before {}',
-			message: messages.rejected('not-before'),
+			message: messages.rejected('::not-before'),
 			line: 1,
 			column: 2,
 		},
@@ -114,7 +124,7 @@ testRule({
 	reject: [
 		{
 			code: 'a::after {}',
-			message: messages.rejected('after'),
+			message: messages.rejected('::after'),
 			line: 1,
 			column: 2,
 		},
diff --git a/lib/rules/selector-pseudo-element-allowed-list/index.js b/lib/rules/selector-pseudo-element-allowed-list/index.js
index 7221e87360..d50222caed 100644
--- a/lib/rules/selector-pseudo-element-allowed-list/index.js
+++ b/lib/rules/selector-pseudo-element-allowed-list/index.js
@@ -47,7 +47,7 @@ const rule = (primary) => {
 					const value = pseudoNode.value;
 
 					// Ignore pseudo-classes
-					if (value[1] !== ':') {
+					if (value.charAt(1) !== ':') {
 						return;
 					}
 
@@ -59,8 +59,9 @@ const rule = (primary) => {
 
 					report({
 						index: pseudoNode.sourceIndex,
-						message: messages.rejected(name),
+						message: messages.rejected(value),
 						node: ruleNode,
+						word: value,
 						result,
 						ruleName,
 					});
diff --git a/lib/rules/selector-pseudo-element-disallowed-list/__tests__/index.js b/lib/rules/selector-pseudo-element-disallowed-list/__tests__/index.js
index 2f45ec208b..57fb817b2e 100644
--- a/lib/rules/selector-pseudo-element-disallowed-list/__tests__/index.js
+++ b/lib/rules/selector-pseudo-element-disallowed-list/__tests__/index.js
@@ -39,45 +39,59 @@ testRule({
 	reject: [
 		{
 			code: 'a::before {}',
-			message: messages.rejected('before'),
+			message: messages.rejected('::before'),
 			line: 1,
 			column: 2,
+			endLine: 1,
+			endColumn: 10,
 		},
 		{
 			code: 'a,\nb::before {}',
-			message: messages.rejected('before'),
+			message: messages.rejected('::before'),
 			line: 2,
 			column: 2,
+			endLine: 2,
+			endColumn: 10,
 		},
 		{
 			code: '::selection {}',
-			message: messages.rejected('selection'),
+			message: messages.rejected('::selection'),
 			line: 1,
 			column: 1,
+			endLine: 1,
+			endColumn: 12,
 		},
 		{
 			code: '::-webkit-selection {}',
-			message: messages.rejected('-webkit-selection'),
+			message: messages.rejected('::-webkit-selection'),
 			line: 1,
 			column: 1,
+			endLine: 1,
+			endColumn: 20,
 		},
 		{
 			code: 'a:not(::selection) {}',
-			message: messages.rejected('selection'),
+			message: messages.rejected('::selection'),
 			line: 1,
 			column: 7,
+			endLine: 1,
+			endColumn: 18,
 		},
 		{
 			code: 'a::my-pseudo-element {}',
-			message: messages.rejected('my-pseudo-element'),
+			message: messages.rejected('::my-pseudo-element'),
 			line: 1,
 			column: 2,
+			endLine: 1,
+			endColumn: 21,
 		},
 		{
 			code: 'a::MY-OTHER-pseudo-element {}',
-			message: messages.rejected('MY-OTHER-pseudo-element'),
+			message: messages.rejected('::MY-OTHER-pseudo-element'),
 			line: 1,
 			column: 2,
+			endLine: 1,
+			endColumn: 27,
 		},
 	],
 });
diff --git a/lib/rules/selector-pseudo-element-disallowed-list/index.js b/lib/rules/selector-pseudo-element-disallowed-list/index.js
index a2b8afaa62..e9d9b43612 100644
--- a/lib/rules/selector-pseudo-element-disallowed-list/index.js
+++ b/lib/rules/selector-pseudo-element-disallowed-list/index.js
@@ -47,7 +47,7 @@ const rule = (primary) => {
 					const value = pseudoNode.value;
 
 					// Ignore pseudo-classes
-					if (value[1] !== ':') {
+					if (value.charAt(1) !== ':') {
 						return;
 					}
 
@@ -59,8 +59,9 @@ const rule = (primary) => {
 
 					report({
 						index: pseudoNode.sourceIndex,
-						message: messages.rejected(name),
+						message: messages.rejected(value),
 						node: ruleNode,
+						word: value,
 						result,
 						ruleName,
 					});