Fix backslash-escapes in url()s (#1429)

Closes #1399
sass · Aug 11, 2021 · 5f4994e · 5f4994e
1 parent 54d16c0
commit 5f4994e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 * Allow `if` to be used as an unquoted string.
 
+* Properly parse backslash escapes within `url()` expressions.
+
 ### Command Line Interface
 
 * Strip CRLF newlines from snippets of the original stylesheet that are included

diff --git a/lib/src/parse/parser.dart b/lib/src/parse/parser.dart
@@ -395,14 +395,14 @@ class Parser {
       var next = scanner.peekChar();
       if (next == null) {
         break;
+      } else if (next == $backslash) {
+        buffer.write(escape());
       } else if (next == $percent ||
           next == $ampersand ||
           next == $hash ||
           (next >= $asterisk && next <= $tilde) ||
           next >= 0x0080) {
         buffer.writeCharCode(scanner.readChar());
-      } else if (next == $backslash) {
-        buffer.write(escape());
       } else if (isWhitespace(next)) {
         whitespace();
         if (scanner.peekChar() != $rparen) break;

diff --git a/lib/src/parse/stylesheet.dart b/lib/src/parse/stylesheet.dart
@@ -2911,14 +2911,14 @@ abstract class StylesheetParser extends Parser {
       var next = scanner.peekChar();
       if (next == null) {
         break;
+      } else if (next == $backslash) {
+        buffer.write(escape());
       } else if (next == $exclamation ||
           next == $percent ||
           next == $ampersand ||
           (next >= $asterisk && next <= $tilde) ||
           next >= 0x0080) {
         buffer.writeCharCode(scanner.readChar());
-      } else if (next == $backslash) {
-        buffer.write(escape());
       } else if (next == $hash) {
         if (scanner.peekChar(1) == $lbrace) {
           buffer.add(singleInterpolation());