Fix selector-pseudo-element-{allowed,disallowed}-list end positions…

… and message (#6270)
stylelint · Aug 17, 2022 · cd68048 · cd68048
1 parent df98339
commit cd68048
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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,
 					});