Fix declaration-block-no-shorthand-property-overrides false negativ…

…es for `border` (#7585) Co-authored-by: Masafumi Koba <473530+ybiquitous@users.noreply.github.com>
stylelint · Mar 30, 2024 · e872ac1 · e872ac1
1 parent a5965a0
commit e872ac1
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 4 deletions.
diff --git a/.changeset/mighty-cows-behave.md b/.changeset/mighty-cows-behave.md
@@ -0,0 +1,5 @@
+---
+"stylelint": minor
+---
+
+Fixed: `declaration-block-no-shorthand-property-overrides` false negatives for `border`
diff --git a/lib/reference/properties.cjs b/lib/reference/properties.cjs
@@ -62,6 +62,9 @@ const longhandSubPropertiesOfShorthandProperties = new Map([
 			'border-right-color',
 			'border-bottom-color',
 			'border-left-color',
+			'border-width',
+			'border-style',
+			'border-color',
 		]),
 	],
 	[

diff --git a/lib/reference/properties.mjs b/lib/reference/properties.mjs
@@ -58,6 +58,9 @@ export const longhandSubPropertiesOfShorthandProperties = new Map([
 			'border-right-color',
 			'border-bottom-color',
 			'border-left-color',
+			'border-width',
+			'border-style',
+			'border-color',
 		]),
 	],
 	[

diff --git a/lib/rules/declaration-block-no-shorthand-property-overrides/__tests__/index.mjs b/lib/rules/declaration-block-no-shorthand-property-overrides/__tests__/index.mjs
@@ -36,6 +36,15 @@ testRule({
 		{
 			code: 'a { transition-property: opacity; -webkit-transition: opacity 1s linear; }',
 		},
+		{
+			code: 'a { border-block: 1px solid; border: 20px dashed black; }',
+		},
+		{
+			code: 'a { border-block-end: 1px solid; border: 20px dashed black; }',
+		},
+		{
+			code: 'a { border-block-start: 1px solid; border: 20px dashed black; }',
+		},
 	],
 
 	reject: [
@@ -47,6 +56,30 @@ testRule({
 			endLine: 1,
 			endColumn: 32,
 		},
+		{
+			code: 'a { border-width: 20px; border: 1px solid black; }',
+			message: messages.rejected('border', 'border-width'),
+			line: 1,
+			column: 25,
+			endLine: 1,
+			endColumn: 31,
+		},
+		{
+			code: 'a { border-color: red; border: 1px solid black; }',
+			message: messages.rejected('border', 'border-color'),
+			line: 1,
+			column: 24,
+			endLine: 1,
+			endColumn: 30,
+		},
+		{
+			code: 'a { border-style: dotted; border: 1px solid black; }',
+			message: messages.rejected('border', 'border-style'),
+			line: 1,
+			column: 27,
+			endLine: 1,
+			endColumn: 33,
+		},
 		{
 			code: 'a { pAdDiNg-lEfT: 10Px; pAdDiNg: 20Px; }',
 			message: messages.rejected('pAdDiNg', 'pAdDiNg-lEfT'),

diff --git a/lib/rules/declaration-block-no-shorthand-property-overrides/index.cjs b/lib/rules/declaration-block-no-shorthand-property-overrides/index.cjs
@@ -41,9 +41,9 @@ const rule = (primary) => {
 					properties.longhandSubPropertiesOfShorthandProperties
 				).get(unprefixedProp);
 
-				if (!overrideables) {
-					declarations.set(prop.toLowerCase(), prop);
+				declarations.set(prop.toLowerCase(), prop);
 
+				if (!overrideables) {
 					return;
 				}
 

diff --git a/lib/rules/declaration-block-no-shorthand-property-overrides/index.mjs b/lib/rules/declaration-block-no-shorthand-property-overrides/index.mjs
@@ -37,9 +37,9 @@ const rule = (primary) => {
 					longhandSubPropertiesOfShorthandProperties
 				).get(unprefixedProp);
 
-				if (!overrideables) {
-					declarations.set(prop.toLowerCase(), prop);
+				declarations.set(prop.toLowerCase(), prop);
 
+				if (!overrideables) {
 					return;
 				}