From f022e02bc5dfcd918a8c4dde7b2ac086bbd6557b Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Fri, 3 Mar 2023 15:07:15 -0800
Subject: [PATCH] Improve errors for invalid CSS values passed to CSS functions
 (#1901)

Closes #1769
---
 CHANGELOG.md                        |  2 ++
 lib/src/visitor/async_evaluate.dart | 38 +++++++++++++++++----------
 lib/src/visitor/evaluate.dart       | 40 ++++++++++++++++++-----------
 3 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81814ec23..bc6ef13e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 * Pull `@font-face` to the root rather than bubbling the style rule selector
   inwards.
 
+* Improve error messages for invalid CSS values passed to plain CSS functions.
+
 ### Embedded Sass
 
 * Improve the performance of starting up a compilation.
diff --git a/lib/src/visitor/async_evaluate.dart b/lib/src/visitor/async_evaluate.dart
index 38c1c1b23..11d1356e2 100644
--- a/lib/src/visitor/async_evaluate.dart
+++ b/lib/src/visitor/async_evaluate.dart
@@ -2622,22 +2622,32 @@ class _EvaluateVisitor
       }
 
       var buffer = StringBuffer("${callable.name}(");
-      var first = true;
-      for (var argument in arguments.positional) {
-        if (first) {
-          first = false;
-        } else {
-          buffer.write(", ");
-        }
+      try {
+        var first = true;
+        for (var argument in arguments.positional) {
+          if (first) {
+            first = false;
+          } else {
+            buffer.write(", ");
+          }
 
-        buffer.write(await _evaluateToCss(argument));
-      }
+          buffer.write(await _evaluateToCss(argument));
+        }
 
-      var restArg = arguments.rest;
-      if (restArg != null) {
-        var rest = await restArg.accept(this);
-        if (!first) buffer.write(", ");
-        buffer.write(_serialize(rest, restArg));
+        var restArg = arguments.rest;
+        if (restArg != null) {
+          var rest = await restArg.accept(this);
+          if (!first) buffer.write(", ");
+          buffer.write(_serialize(rest, restArg));
+        }
+      } on SassRuntimeException catch (error) {
+        if (!error.message.endsWith("isn't a valid CSS value.")) rethrow;
+        throw MultiSpanSassRuntimeException(
+            error.message,
+            error.span,
+            "value",
+            {nodeWithSpan.span: "unknown function treated as plain CSS"},
+            error.trace);
       }
       buffer.writeCharCode($rparen);
 
diff --git a/lib/src/visitor/evaluate.dart b/lib/src/visitor/evaluate.dart
index d9e6dbf21..83ae6dfd8 100644
--- 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: 73b7fb0f310d090dee2b3383f7b08c095e5fb1c0
+// Checksum: 4cdc21090d758118f0250f6efb2e6bdb0df5f337
 //
 // ignore_for_file: unused_import
 
@@ -2605,22 +2605,32 @@ class _EvaluateVisitor
       }
 
       var buffer = StringBuffer("${callable.name}(");
-      var first = true;
-      for (var argument in arguments.positional) {
-        if (first) {
-          first = false;
-        } else {
-          buffer.write(", ");
-        }
+      try {
+        var first = true;
+        for (var argument in arguments.positional) {
+          if (first) {
+            first = false;
+          } else {
+            buffer.write(", ");
+          }
 
-        buffer.write(_evaluateToCss(argument));
-      }
+          buffer.write(_evaluateToCss(argument));
+        }
 
-      var restArg = arguments.rest;
-      if (restArg != null) {
-        var rest = restArg.accept(this);
-        if (!first) buffer.write(", ");
-        buffer.write(_serialize(rest, restArg));
+        var restArg = arguments.rest;
+        if (restArg != null) {
+          var rest = restArg.accept(this);
+          if (!first) buffer.write(", ");
+          buffer.write(_serialize(rest, restArg));
+        }
+      } on SassRuntimeException catch (error) {
+        if (!error.message.endsWith("isn't a valid CSS value.")) rethrow;
+        throw MultiSpanSassRuntimeException(
+            error.message,
+            error.span,
+            "value",
+            {nodeWithSpan.span: "unknown function treated as plain CSS"},
+            error.trace);
       }
       buffer.writeCharCode($rparen);