Add parenthesis in operations to keep order

sass · Dec 9, 2023 · a74a811 · a74a811
1 parent 0852083
commit a74a811
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/lib/src/migrators/calc_interpolation.dart b/lib/src/migrators/calc_interpolation.dart
@@ -36,12 +36,16 @@ class _CalculationInterpolationVisitor extends MigrationVisitor {
   void visitCalculationExpression(CalculationExpression node) {
     const calcFunctions = ['calc', 'clamp', 'min', 'max'];
     final interpolation = RegExp(r'\#{\s*[^}]+\s*}');
+    final hasOperation = RegExp(r'[-+*/]+');
     if (calcFunctions.contains(node.name)) {
       for (var arg in node.arguments) {
         var newArg = arg.toString();
         for (var match in interpolation.allMatches(arg.toString())) {
           var noInterpolation =
               match[0].toString().substring(2, match[0].toString().length - 1);
+          if (hasOperation.hasMatch(noInterpolation)) {
+            noInterpolation = '(' + noInterpolation + ')';
+          }
           newArg = newArg
               .toString()
               .replaceAll(match[0].toString(), noInterpolation);

diff --git a/test/migrators/calc_interpolation/calc_remove_interpolation.hrx b/test/migrators/calc_interpolation/calc_remove_interpolation.hrx
@@ -2,10 +2,14 @@
 $b: 10;
 $c: 1;
 $d: 5;
-.a { .b: calc($b - #{$c + 1}); }
+//Single interpolation
+.a { .b: calc($b * #{$c + 1}); }
 
 // More than one interpolations
-.a { .b: calc($b - #{$c + 1} + #{$d}); }
+.a { 
+    .b: calc($b - #{$c + 1} + #{$d}); 
+    .c: calc(100% - #{$table_title_height + 2px});
+}
 
 // Nested
 .a { .b: calc(3 + max(#{$c, 2})); }
@@ -17,10 +21,14 @@ $d: 5;
 $b: 10;
 $c: 1;
 $d: 5;
-.a { .b: calc($b - $c + 1); }
+//Single interpolation
+.a { .b: calc($b * ($c + 1)); }
 
 // More than one interpolations
-.a { .b: calc($b - $c + 1 + $d); }
+.a { 
+    .b: calc($b - ($c + 1) + $d); 
+    .c: calc(100% - ($table-title-height + 2px));
+}
 
 // Nested
 .a { .b: calc(3 + max($c, 2)); }