Don't evaluate if() values if the condition doesn't match (#2707)

See sass/sass#3886 (comment)

Author: nex3

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.97.1
+
+* Fix a bug with the new CSS-style `if()` syntax where values would be evaluated
+  even if their conditions didn't match.
+
 ## 1.97.0
 
 * Add support for the `display-p3-linear` color space.

lib/src/visitor/async_evaluate.dart

@@ -2839,17 +2839,16 @@ final class _EvaluateVisitor
     List<(String, Value)>? results;
     for (var (condition, expression) in node.branches) {
       var result = await condition?.accept(this) ?? true;
-      var value = await expression.accept(this);
       switch (result) {
         case String condition:
           results ??= [];
-          results.add((condition, value));
+          results.add((condition, await expression.accept(this)));
 
         case true when results != null:
-          results.add(('else', value));
+          results.add(('else', await expression.accept(this)));
 
         case true:
-          return value;
+          return await expression.accept(this);
       }
     }
 

lib/src/visitor/evaluate.dart

@@ -5,7 +5,7 @@
 // DO NOT EDIT. This file was generated from async_evaluate.dart.
 // See tool/grind/synchronize.dart for details.
 //
-// Checksum: aa53924147f65640b94768e22bb339b0d5c5714a
+// Checksum: 72b4168ae534c17a0a5f083209fddab3646dc6b7
 //
 // ignore_for_file: unused_import
 
@@ -2842,17 +2842,16 @@ final class _EvaluateVisitor
     List<(String, Value)>? results;
     for (var (condition, expression) in node.branches) {
       var result = condition?.accept(this) ?? true;
-      var value = expression.accept(this);
       switch (result) {
         case String condition:
           results ??= [];
-          results.add((condition, value));
+          results.add((condition, expression.accept(this)));
 
         case true when results != null:
-          results.add(('else', value));
+          results.add(('else', expression.accept(this)));
 
         case true:
-          return value;
+          return expression.accept(this);
       }
     }
 

pkg/sass-parser/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.40
+
+* No user-visible changes.
+
 ## 0.4.39
 
 * No user-visible changes.

pkg/sass-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-parser",
-  "version": "0.4.39",
+  "version": "0.4.40",
   "description": "A PostCSS-compatible wrapper of the official Sass parser",
   "repository": "sass/dart-sass",
   "author": "Google Inc.",

pkg/sass_api/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 17.3.1
+
+* No user-visible changes.
+
 ## 17.3.0
 
 * Add the `SassColor.displayP3Linear` constructor.

pkg/sass_api/pubspec.yaml

@@ -2,15 +2,15 @@ name: sass_api
 # Note: Every time we add a new Sass AST node, we need to bump the *major*
 # version because it's a breaking change for anyone who's implementing the
 # visitor interface(s).
-version: 17.3.0
+version: 17.3.1
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=3.6.0 <4.0.0"
 
 dependencies:
-  sass: 1.97.0
+  sass: 1.97.1
 
 dev_dependencies:
   dartdoc: ">=8.0.14 <10.0.0"

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.97.0
+version: 1.97.1
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass