Fix column position for declaration-property-value-*-list (#5926)

stylelint · Feb 21, 2022 · 012870f · 012870f
1 parent 63b22e0
commit 012870f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/lib/rules/declaration-property-value-allowed-list/__tests__/index.js b/lib/rules/declaration-property-value-allowed-list/__tests__/index.js
@@ -36,31 +36,31 @@ testRule({
 			code: 'div { whitespace: pre; }',
 			message: messages.rejected('whitespace', 'pre'),
 			line: 1,
-			column: 7,
+			column: 19,
 		},
 		{
 			code: 'a { transform: translate(1, 1); }',
 			message: messages.rejected('transform', 'translate(1, 1)'),
 			line: 1,
-			column: 5,
+			column: 16,
 		},
 		{
 			code: 'a { -webkit-transform: translate(1, 1); }',
 			message: messages.rejected('-webkit-transform', 'translate(1, 1)'),
 			line: 1,
-			column: 5,
+			column: 24,
 		},
 		{
 			code: 'a { color: pink; }',
 			message: messages.rejected('color', 'pink'),
 			line: 1,
-			column: 5,
+			column: 12,
 		},
 		{
 			code: 'a { background-color: pink; }',
 			message: messages.rejected('background-color', 'pink'),
 			line: 1,
-			column: 5,
+			column: 23,
 		},
 	],
 });

diff --git a/lib/rules/declaration-property-value-allowed-list/index.js b/lib/rules/declaration-property-value-allowed-list/index.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const declarationValueIndex = require('../../utils/declarationValueIndex');
 const matchesStringOrRegExp = require('../../utils/matchesStringOrRegExp');
 const optionsMatches = require('../../utils/optionsMatches');
 const report = require('../../utils/report');
@@ -51,6 +52,7 @@ const rule = (primary) => {
 			report({
 				message: messages.rejected(prop, value),
 				node: decl,
+				index: declarationValueIndex(decl),
 				result,
 				ruleName,
 			});

diff --git a/lib/rules/declaration-property-value-disallowed-list/__tests__/index.js b/lib/rules/declaration-property-value-disallowed-list/__tests__/index.js
@@ -58,35 +58,35 @@ testRule({
 			code: 'a { color: red; }',
 			message: messages.rejected('color', 'red'),
 			line: 1,
-			column: 5,
+			column: 12,
 		},
 		{
 			code: 'a { color: green }',
 			message: messages.rejected('color', 'green'),
 			line: 1,
-			column: 5,
+			column: 12,
 		},
 		{
 			code: 'a { text-transform: uppercase; }',
 			message: messages.rejected('text-transform', 'uppercase'),
 			line: 1,
-			column: 5,
+			column: 21,
 		},
 		{
 			code: 'a { transform: scale3d(1, 2, 3) }',
 			message: messages.rejected('transform', 'scale3d(1, 2, 3)'),
 			line: 1,
-			column: 5,
+			column: 16,
 		},
 		{
 			code: 'a { -webkit-transform: scale3d(1, 2, 3) }',
 			message: messages.rejected('-webkit-transform', 'scale3d(1, 2, 3)'),
-			column: 5,
+			column: 24,
 		},
 		{
 			code: 'a { color: seagreen }',
 			message: messages.rejected('color', 'seagreen'),
-			column: 5,
+			column: 12,
 		},
 	],
 });

diff --git a/lib/rules/declaration-property-value-disallowed-list/index.js b/lib/rules/declaration-property-value-disallowed-list/index.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const declarationValueIndex = require('../../utils/declarationValueIndex');
 const matchesStringOrRegExp = require('../../utils/matchesStringOrRegExp');
 const optionsMatches = require('../../utils/optionsMatches');
 const report = require('../../utils/report');
@@ -51,6 +52,7 @@ const rule = (primary) => {
 			report({
 				message: messages.rejected(prop, value),
 				node: decl,
+				index: declarationValueIndex(decl),
 				result,
 				ruleName,
 			});