Exclude var() support

stylelint · Apr 26, 2024 · 7ab186d · 7ab186d
1 parent 47ddc79
commit 7ab186d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/lib/rules/shorthand-property-no-redundant-values/__tests__/index.mjs b/lib/rules/shorthand-property-no-redundant-values/__tests__/index.mjs
@@ -85,6 +85,10 @@ testRule({
 			code: 'a { border-radius: 1px 1px / 1px; }',
 			description: 'ignore ellipse',
 		},
+		{
+			code: 'a { margin: var(--margin) var(--margin); }',
+			description: 'ignore variables',
+		},
 		{
 			code: 'a { border-color: #FFFFFF transparent transparent; }',
 			description: 'ignore upper case value',
@@ -373,13 +377,6 @@ testRule({
 			line: 1,
 			column: 5,
 		},
-		{
-			code: 'a { margin: var(--margin) var(--margin); }',
-			fixed: 'a { margin: var(--margin); }',
-			message: messages.rejected('var(--margin) var(--margin)', 'var(--margin)'),
-			line: 1,
-			column: 5,
-		},
 		{
 			code: 'a { margin: calc(1px + 1px) calc(1px + 1px); }',
 			fixed: 'a { margin: calc(1px + 1px); }',

diff --git a/lib/rules/shorthand-property-no-redundant-values/index.cjs b/lib/rules/shorthand-property-no-redundant-values/index.cjs
@@ -140,6 +140,16 @@ const rule = (primary, _secondaryOptions, context) => {
 					break;
 				}
 
+				// `var()` should be ignored. E.g.
+				//
+				//   --padding: 20px 5px;
+				//   padding: 0 var(--padding) 0;
+				//
+				if (typeGuards.isValueFunction(valueNode) && valueNode.value.toLowerCase() === 'var') {
+					shouldIgnore = true;
+					break;
+				}
+
 				if (typeGuards.isValueWord(valueNode) || typeGuards.isValueFunction(valueNode)) {
 					valuesToShorthand.push(valueParser.stringify(valueNode));
 				}

diff --git a/lib/rules/shorthand-property-no-redundant-values/index.mjs b/lib/rules/shorthand-property-no-redundant-values/index.mjs
@@ -138,6 +138,16 @@ const rule = (primary, _secondaryOptions, context) => {
 					break;
 				}
 
+				// `var()` should be ignored. E.g.
+				//
+				//   --padding: 20px 5px;
+				//   padding: 0 var(--padding) 0;
+				//
+				if (isValueFunction(valueNode) && valueNode.value.toLowerCase() === 'var') {
+					shouldIgnore = true;
+					break;
+				}
+
 				if (isValueWord(valueNode) || isValueFunction(valueNode)) {
 					valuesToShorthand.push(valueParser.stringify(valueNode));
 				}