Round accepting fake units fix

sass · Jul 31, 2023 · 8fdd53e · 8fdd53e
1 parent 1ebfd09
commit 8fdd53e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/lib/src/js/value/calculation.dart b/lib/src/js/value/calculation.dart
@@ -93,7 +93,7 @@ final JSClass calculationOperationClass = () {
     _assertCalculationValue(left);
     _assertCalculationValue(right);
     return SassCalculation.operateInternal(operator, left, right,
-        inMinMax: false, simplify: false);
+        inLegacySassFunction: false, simplify: false);
   });
 
   jsClass.defineMethods({
@@ -109,7 +109,7 @@ final JSClass calculationOperationClass = () {
 
   getJSClass(SassCalculation.operateInternal(
           CalculationOperator.plus, SassNumber(1), SassNumber(1),
-          inMinMax: false, simplify: false))
+          inLegacySassFunction: false, simplify: false))
       .injectSuperclass(jsClass);
   return jsClass;
 }();

diff --git a/lib/src/value/calculation.dart b/lib/src/value/calculation.dart
@@ -299,8 +299,9 @@ class SassCalculation extends Value {
   static Value sign(Object argument) {
     argument = _simplify(argument);
     return switch (argument) {
-      SassNumber(value: double(isNaN: true) || 0) => SassNumber(argument.value),
-      SassNumber arg when !arg.hasUnit('%') => SassNumber(arg.value.sign),
+      SassNumber(value: double(isNaN: true) || 0) => argument,
+      SassNumber arg when !arg.hasUnit('%') =>
+        SassNumber(arg.value.sign).coerceToMatch(argument),
       _ => SassCalculation._("sign", [argument]),
     };
   }
@@ -452,7 +453,7 @@ class SassCalculation extends Value {
       if (result.value == 0) {
         return result.unaryMinus();
       }
-      return result.minus(dividend);
+      return result.minus(modulus);
     }
     return result;
   }
@@ -506,10 +507,25 @@ class SassCalculation extends Value {
       case (SassNumber number, null, null):
         return _matchUnits(number.value.round().toDouble(), number);
 
+      case (SassNumber number, SassNumber step, null)
+          when !number.hasCompatibleUnits(step):
+        _verifyCompatibleNumbers([number, step]);
+        return SassCalculation._("round", [number, step]);
+
       case (SassNumber number, SassNumber step, null):
         _verifyCompatibleNumbers([number, step]);
         return _roundWithStep('nearest', number, step);
 
+      case (
+            SassString(text: 'nearest' || 'up' || 'down' || 'to-zero') &&
+                var strategy,
+            SassNumber number,
+            SassNumber step
+          )
+          when !number.hasCompatibleUnits(step):
+        _verifyCompatibleNumbers([number, step]);
+        return SassCalculation._("round", [strategy, number, step]);
+
       case (
           SassString(text: 'nearest' || 'up' || 'down' || 'to-zero') &&
               var strategy,