Add support for var() with an empty fallback argument (#1723)

Closes sass/sass#3245
sass · Jun 21, 2022 · c5e1f0b · c5e1f0b
1 parent 8705c06
commit c5e1f0b
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
-## 1.52.4
+## 1.53.0
+
+* Add support for calling `var()` with an empty second argument, such as
+  `var(--side, )`.
 
 ### JS API
 

diff --git a/lib/src/parse/css.dart b/lib/src/parse/css.dart
@@ -107,17 +107,26 @@ class CssParser extends ScssParser {
     var identifier = interpolatedIdentifier();
     var plain = identifier.asPlain!; // CSS doesn't allow non-plain identifiers
 
-    var specialFunction = trySpecialFunction(plain.toLowerCase(), start);
+    var lower = plain.toLowerCase();
+    var specialFunction = trySpecialFunction(lower, start);
     if (specialFunction != null) return specialFunction;
 
     var beforeArguments = scanner.state;
     if (!scanner.scanChar($lparen)) return StringExpression(identifier);
 
+    var allowEmptySecondArg = lower == 'var';
     var arguments = <Expression>[];
     if (!scanner.scanChar($rparen)) {
       do {
         whitespace();
-        arguments.add(expression(singleEquals: true));
+        if (allowEmptySecondArg &&
+            arguments.length == 1 &&
+            scanner.peekChar() == $rparen) {
+          arguments.add(StringExpression.plain('', scanner.emptySpan));
+          break;
+        }
+
+        arguments.add(expressionUntilComma(singleEquals: true));
         whitespace();
       } while (scanner.scanChar($comma));
       scanner.expectChar($rparen);