Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Jun 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion 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, )`.

### Embedded Sass

Expand Down
13 changes: 11 additions & 2 deletions lib/src/parse/css.dart
Expand Up @@ -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);
Expand Down