Fix declaration-block-no-shorthand-property-overrides false negatives for border

lib/reference/properties.cjs

@@ -62,6 +62,11 @@ const longhandSubPropertiesOfShorthandProperties = new Map([
 			'border-right-color',
 			'border-bottom-color',
 			'border-left-color',
+			'border-color',
+			'border-style',
+			'border-block',
+			'border-block-end',
+			'border-block-start',
 		]),
 	],
 	[

lib/reference/properties.mjs

@@ -58,6 +58,11 @@ export const longhandSubPropertiesOfShorthandProperties = new Map([
 			'border-right-color',
 			'border-bottom-color',
 			'border-left-color',
+			'border-color',
+			'border-style',
+			'border-block',
+			'border-block-end',
+			'border-block-start',
 		]),
 	],
 	[

lib/rules/declaration-block-no-shorthand-property-overrides/__tests__/index.mjs

@@ -47,6 +47,46 @@ testRule({
 			endLine: 1,
 			endColumn: 32,
 		},
+		{
+			code: 'a { border-block: 1px solid; border: 20px dashed black; }',
+			message: messages.rejected('border', 'border-block'),
+			line: 1,
+			column: 30,
+			endLine: 1,
+			endColumn: 36,
+		},
+		{
+			code: 'a { border-block-end: 1px solid; border: 20px dashed black; }',
+			message: messages.rejected('border', 'border-block-end'),
+			line: 1,
+			column: 34,
+			endLine: 1,
+			endColumn: 40,
+		},
+		{
+			code: 'a { border-block-start: 1px solid; border: 20px dashed black; }',
+			message: messages.rejected('border', 'border-block-start'),
+			line: 1,
+			column: 36,
+			endLine: 1,
+			endColumn: 42,
+		},
+		{
+			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'),

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;
 				}
 

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;
 				}