From 20f86795e5d86cee2d5da0ea0601c920a6de0f34 Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Wed, 7 Nov 2018 13:39:01 -0800
Subject: [PATCH] Avoid stripping escapes in more places

---
 doc-src/SASS_CHANGELOG.md         |  2 +-
 lib/sass/scss/css_parser.rb       |  7 ++++++-
 lib/sass/scss/parser.rb           |  5 +++--
 lib/sass/selector/pseudo.rb       |  2 +-
 lib/sass/tree/rule_node.rb        |  3 ++-
 lib/sass/tree/visitors/perform.rb |  2 +-
 lib/sass/tree/visitors/to_css.rb  |  2 +-
 lib/sass/util.rb                  | 26 ++++++++++++++++++++++----
 8 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
index f65a85e37..739fb0a99 100644
--- a/doc-src/SASS_CHANGELOG.md
+++ b/doc-src/SASS_CHANGELOG.md
@@ -5,7 +5,7 @@
 
 ## 3.7.2 (Unreleased)
 
-* Fix another escaped-whitespace edge case.
+* Fix more escaped-whitespace edge cases.
 
 ## 3.7.1 (7 November 2018)
 
diff --git a/lib/sass/scss/css_parser.rb b/lib/sass/scss/css_parser.rb
index f4592ea74..69890ff86 100644
--- a/lib/sass/scss/css_parser.rb
+++ b/lib/sass/scss/css_parser.rb
@@ -47,7 +47,12 @@ def ruleset
       def keyframes_ruleset
         start_pos = source_position
         return unless (selector = keyframes_selector)
-        block(node(Sass::Tree::KeyframeRuleNode.new(selector.strip), start_pos), :ruleset)
+        block(
+          node(
+            Sass::Tree::KeyframeRuleNode.new(
+              Sass::Util.strip_except_escapes(selector)),
+            start_pos),
+          :ruleset)
       end
 
       @sass_script_parser = Sass::Script::CssParser
diff --git a/lib/sass/scss/parser.rb b/lib/sass/scss/parser.rb
index 74214741e..55d1e1b73 100644
--- a/lib/sass/scss/parser.rb
+++ b/lib/sass/scss/parser.rb
@@ -992,8 +992,9 @@ def 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))
+          str = Sass::Script::Tree::Literal.new(
+            Sass::Script::Value::String.new(
+              Sass::Util.strip_except_escapes(val)))
           str.line = start_pos.line
           str.source_range = range(start_pos)
           return str
diff --git a/lib/sass/selector/pseudo.rb b/lib/sass/selector/pseudo.rb
index 5d9f301fc..2893d7d3d 100644
--- a/lib/sass/selector/pseudo.rb
+++ b/lib/sass/selector/pseudo.rb
@@ -134,7 +134,7 @@ def to_s(opts = {})
         res = (syntactic_type == :class ? ":" : "::") + @name
         if @arg || @selector
           res << "("
-          res << @arg.strip if @arg
+          res << Sass::Util.strip_except_escapes(@arg) if @arg
           res << " " if @arg && @selector
           res << @selector.to_s(opts) if @selector
           res << ")"
diff --git a/lib/sass/tree/rule_node.rb b/lib/sass/tree/rule_node.rb
index 417cf799a..e621939a8 100644
--- a/lib/sass/tree/rule_node.rb
+++ b/lib/sass/tree/rule_node.rb
@@ -140,7 +140,8 @@ def try_to_parse_non_interpolated_rules
       # When we get it, we'll set it on the parsed rules if possible.
       parser = nil
       warnings = Sass.logger.capture do
-        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
+        parser = Sass::SCSS::StaticParser.new(
+          Sass::Util.strip_except_escapes(@rule.join), nil, nil, 1)
         @parsed_rules = parser.parse_selector rescue nil
       end
 
diff --git a/lib/sass/tree/visitors/perform.rb b/lib/sass/tree/visitors/perform.rb
index e6db68e5d..c99701426 100644
--- a/lib/sass/tree/visitors/perform.rb
+++ b/lib/sass/tree/visitors/perform.rb
@@ -553,7 +553,7 @@ def run_interp_no_strip(text)
   end
 
   def run_interp(text)
-    run_interp_no_strip(text).strip
+    Sass::Util.strip_except_escapes(run_interp_no_strip(text))
   end
 
   def handle_import_loop!(node)
diff --git a/lib/sass/tree/visitors/to_css.rb b/lib/sass/tree/visitors/to_css.rb
index 483375cd1..29ec285e1 100644
--- a/lib/sass/tree/visitors/to_css.rb
+++ b/lib/sass/tree/visitors/to_css.rb
@@ -298,7 +298,7 @@ def visit_rule(node)
           rule_part.gsub!(/nth([^( ]*)\(([^)]*)\)/m) do |match|
             match.tr(" \t\n", "")
           end
-          rule_part.strip!
+          rule_part = Sass::Util.strip_except_escapes(rule_part)
         end
         rule_part
       end.compact.join(rule_separator)
diff --git a/lib/sass/util.rb b/lib/sass/util.rb
index b01153f33..6213ee51a 100644
--- a/lib/sass/util.rb
+++ b/lib/sass/util.rb
@@ -246,15 +246,15 @@ def substitute(ary, from, to)
       res
     end
 
-    # Destructively strips whitespace from the beginning and end
-    # of the first and last elements, respectively,
-    # in the array (if those elements are strings).
+    # Destructively strips whitespace from the beginning and end of the first
+    # and last elements, respectively, in the array (if those elements are
+    # strings). Preserves CSS escapes at the end of the array.
     #
     # @param arr [Array]
     # @return [Array] `arr`
     def strip_string_array(arr)
       arr.first.lstrip! if arr.first.is_a?(String)
-      arr.last.rstrip! if arr.last.is_a?(String)
+      arr[-1] = Sass::Util.rstrip_except_escapes(arr[-1]) if arr.last.is_a?(String)
       arr
     end
 
@@ -289,6 +289,24 @@ def escaped_char(escape)
       end
     end
 
+    # Like [String#strip], but preserves escaped whitespace at the end of the
+    # string.
+    #
+    # @param string [String]
+    # @return [String]
+    def strip_except_escapes(string)
+      rstrip_except_escapes(string.lstrip)
+    end
+
+    # Like [String#rstrip], but preserves escaped whitespace at the end of the
+    # string.
+    #
+    # @param string [String]
+    # @return [String]
+    def rstrip_except_escapes(string)
+      string.sub(/(?<!\\)\s+$/, '')
+    end
+
     # Return an array of all possible paths through the given arrays.
     #
     # @param arrs [Array<Array>]