fix(issue:4258) variable interpolation after math (#4292)

puckowski · web-flow · commit 304c3106d826 · 2024-12-08T07:51:12.000-05:00
* fix(issue:4258) variable interpolation after math * Fixes variable interpolation issue after previous variable addition. * chore: fix rebase issue * Fix rebase issue for fix for issue #4258.
diff --git a/packages/less/src/less/parser/parser.js b/packages/less/src/less/parser/parser.js
@@ -1731,7 +1731,9 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                             }
                             // Treat like quoted values, but replace vars like unquoted expressions
                             const quote = new tree.Quoted('\'', item, true, index, fileInfo);
-                            quote.variableRegex = /@([\w-]+)/g;
+                            if (!item.startsWith('@{')) {
+                                quote.variableRegex = /@([\w-]+)/g;
+                            }
                             quote.propRegex = /\$([\w-]+)/g;
                             result.push(quote);
                         }
diff --git a/packages/test-data/css/_main/variables.css b/packages/test-data/css/_main/variables.css
@@ -77,3 +77,6 @@
   --tw-pinch-zoom: ;
   --tw-scroll-snap-strictness: proximity;
 }
+.radio_checked {
+  border-color: #fff;
+}
diff --git a/packages/test-data/less/_main/variables.less b/packages/test-data/less/_main/variables.less
@@ -132,3 +132,14 @@
 	--tw-pinch-zoom:  ;
 	--tw-scroll-snap-strictness: proximity;
 }
+
+@a1: 1px;
+@b2: 2px;
+@c3: @a1 + @b2;
+
+@radio-cls: radio;
+@radio-cls-checked: @{radio-cls}_checked;
+
+.@{radio-cls-checked} {
+  border-color: #fff;
+}

Original file line number	Diff line number	Diff line change
`@@ -1731,7 +1731,9 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {`
`1731`	`1731`	`}`
`1732`	`1732`	`// Treat like quoted values, but replace vars like unquoted expressions`
`1733`	`1733`	`const quote = new tree.Quoted('\'', item, true, index, fileInfo);`
`1734`		`- quote.variableRegex = /@([\w-]+)/g;`
	`1734`	`+ if (!item.startsWith('@{')) {`
	`1735`	`+ quote.variableRegex = /@([\w-]+)/g;`
	`1736`	`+ }`
`1735`	`1737`	`quote.propRegex = /\$([\w-]+)/g;`
`1736`	`1738`	`result.push(quote);`
`1737`	`1739`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,3 +77,6 @@`
`77`	`77`	`--tw-pinch-zoom: ;`
`78`	`78`	`--tw-scroll-snap-strictness: proximity;`
`79`	`79`	`}`
	`80`	`+.radio_checked {`
	`81`	`+ border-color: #fff;`
	`82`	`+}`