Fix source span for calculation deprecation warnings (#2084)

Co-authored-by: Natalie Weizenbaum <nweiz@google.com>
sass · Sep 15, 2023 · 37e0ed5 · 37e0ed5
1 parent 7370d6a
commit 37e0ed5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.67.1
+
+* Fix the source spans associated with the `abs-percent` deprecation.
+
 ## 1.67.0
 
 * All functions defined in CSS Values and Units 4 are now once again parsed as

diff --git a/lib/src/visitor/async_evaluate.dart b/lib/src/visitor/async_evaluate.dart
@@ -2431,6 +2431,9 @@ final class _EvaluateVisitor
       return SassCalculation.unsimplified(node.name, arguments);
     }
 
+    var oldCallableNode = _callableNode;
+    _callableNode = node;
+
     try {
       return switch (node.name.toLowerCase()) {
         "calc" => SassCalculation.calc(arguments[0]),
@@ -2471,6 +2474,8 @@ final class _EvaluateVisitor
         _verifyCompatibleNumbers(arguments, node.arguments.positional);
       }
       throwWithTrace(_exception(error.message, node.span), error, stackTrace);
+    } finally {
+      _callableNode = oldCallableNode;
     }
   }
 

diff --git a/lib/src/visitor/evaluate.dart b/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: ccd4ec1a65cfc2487fccd30481d427086f5c76cc
+// Checksum: 7669de19668af665d1a9a60cf67e53e071bf415e
 //
 // ignore_for_file: unused_import
 
@@ -2411,6 +2411,9 @@ final class _EvaluateVisitor
       return SassCalculation.unsimplified(node.name, arguments);
     }
 
+    var oldCallableNode = _callableNode;
+    _callableNode = node;
+
     try {
       return switch (node.name.toLowerCase()) {
         "calc" => SassCalculation.calc(arguments[0]),
@@ -2451,6 +2454,8 @@ final class _EvaluateVisitor
         _verifyCompatibleNumbers(arguments, node.arguments.positional);
       }
       throwWithTrace(_exception(error.message, node.span), error, stackTrace);
+    } finally {
+      _callableNode = oldCallableNode;
     }
   }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: sass
-version: 1.67.0
+version: 1.67.1-dev
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass