From b2b80e05c3062a7797519d9e6440b2466502cb2d Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Wed, 7 Nov 2018 11:36:48 -0800
Subject: [PATCH] Properly handle escaped tabs (#95)

Closes #94
---
 doc-src/SASS_CHANGELOG.md | 4 ++++
 lib/sass/scss/parser.rb   | 2 ++
 lib/sass/scss/rx.rb       | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
index 733a53a21..df107205b 100644
--- a/doc-src/SASS_CHANGELOG.md
+++ b/doc-src/SASS_CHANGELOG.md
@@ -3,6 +3,10 @@
 * Table of contents
 {:toc}
 
+## 3.7.1 (Unreleased)
+
+* Properly handle escaped whitespace and other unusual characters.
+
 ## 3.7.0 (6 November 2018)
 
 * Add support for CSS's `min()` and `max()` [math functions][]. A `min()` and
diff --git a/lib/sass/scss/parser.rb b/lib/sass/scss/parser.rb
index 43ab5d2a6..5331747a7 100644
--- a/lib/sass/scss/parser.rb
+++ b/lib/sass/scss/parser.rb
@@ -991,6 +991,8 @@ def value!
         # containing the value.
         # This results in a dramatic speed increase.
         if (val = tok(STATIC_VALUE))
+          # If val ends with escaped whitespace, leave it be.
+          val = val.lstrip.sub(/(?<!\\)\s*$/, '\1')
           str = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(val.strip))
           str.line = start_pos.line
           str.source_range = range(start_pos)
diff --git a/lib/sass/scss/rx.rb b/lib/sass/scss/rx.rb
index 16963d1ed..bfb3e4a89 100644
--- a/lib/sass/scss/rx.rb
+++ b/lib/sass/scss/rx.rb
@@ -52,7 +52,7 @@ def self.quote(str, flags = 0)
       UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/
       s = '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
       NONASCII = /[#{s}]/
-      ESCAPE   = /#{UNICODE}|\\[ -~#{s}]/
+      ESCAPE   = /#{UNICODE}|\\[^0-9a-fA-F\r\n\f]/
       NMSTART  = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/
       NMCHAR   = /[a-zA-Z0-9_-]|#{NONASCII}|#{ESCAPE}/
       STRING1  = /\"((?:[^\n\r\f\\"]|\\#{NL}|#{ESCAPE})*)\"/