sass 3.4.19 → 3.4.20

data/test/sass/engine_test.rb

@@ -3322,6 +3322,34 @@ CSS
 SASS
   end
 
+  def test_compressed_output_of_nth_selectors
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+:nth-of-type(2n-1),:nth-of-type(2n-1),:nth-of-type(2n-1),:nth-of-type(2n-1),:nth-of-type(2n-1){color:red}:nth-of-type(2n+1),:nth-of-type(2n+1),:nth-of-type(2n+1),:nth-of-type(2n+1),:nth-of-type(2n+1){color:red}
+CSS
+:nth-of-type(2n-1), :nth-of-type(2n-  1), :nth-of-type(2n  -1), :nth-of-type(2n  -  1), :nth-of-type( 2n  -  1 ) {
+  color: red }
+:nth-of-type(2n+1), :nth-of-type(2n+  1), :nth-of-type(2n  +1), :nth-of-type(2n  +  1), :nth-of-type( 2n  +  1 ) {
+  color: red }
+SASS
+  end
+
+  def test_import_with_supports_clause_interp
+    assert_equal(<<CSS, render(<<'SASS', :style => :compressed))
+@import url("fallback-layout.css") supports(not (display: flex))
+CSS
+$display-type: flex
+@import url("fallback-layout.css") supports(not (display: #{$display-type}))
+SASS
+  end
+
+  def test_import_with_supports_clause
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@import url("fallback-layout.css") supports(not (display: flex))
+CSS
+@import url("fallback-layout.css") supports(not (display: flex))
+SASS
+  end
+
   private
 
   def assert_hash_has(hash, expected)

data/test/sass/functions_test.rb

@@ -154,6 +154,7 @@ WARNING
     assert_equal("5px", evaluate("round(4.8px)"))
     assert_equal("5px", evaluate("round(5.49px)"))
     assert_equal("5px", evaluate("round($number: 5.49px)"))
+    assert_equal("-6", evaluate("round(-5.5)"))
   end
 
   def test_round_checks_types
@@ -197,6 +198,7 @@ WARNING
     assert_equal("1", evaluate("min(3px, 2px, 1)"))
     assert_equal("4em", evaluate("min(4em)"))
     assert_equal("10cm", evaluate("min(10cm, 6in)"))
+    assert_equal("1q", evaluate("min(1cm, 1q)"))
 
     assert_error_message("#aaaaaa is not a number for `min'", "min(#aaa)")
     assert_error_message("Incompatible units: 'px' and 'em'.", "min(3em, 4em, 1px)")
@@ -207,6 +209,7 @@ WARNING
     assert_equal("3", evaluate("max(3, 2px, 1px)"))
     assert_equal("4em", evaluate("max(4em)"))
     assert_equal("6in", evaluate("max(10cm, 6in)"))
+    assert_equal("11mm", evaluate("max(11mm, 10q)"))
 
     assert_error_message("#aaaaaa is not a number for `max'", "max(#aaa)")
     assert_error_message("Incompatible units: 'px' and 'em'.", "max(3em, 4em, 1px)")

data/test/sass/script_conversion_test.rb

@@ -264,20 +264,21 @@ RUBY
   end
 
   def test_interpolation
-    assert_renders "$foo\#{$bar}$baz"
-    assert_renders "$foo\#{$bar} $baz"
-    assert_renders "$foo \#{$bar}$baz"
+    assert_equal 'unquote("#{$foo}#{$bar}#{$baz}")', render("$foo\#{$bar}$baz")
+    assert_equal 'unquote("#{$foo}#{$bar} #{$baz}")', render("$foo\#{$bar} $baz")
+    assert_equal 'unquote("#{$foo} #{$bar}#{$baz}")', render("$foo \#{$bar}$baz")
     assert_renders "$foo \#{$bar} $baz"
     assert_renders "$foo \#{$bar}\#{$bang} $baz"
     assert_renders "$foo \#{$bar} \#{$bang} $baz"
-    assert_renders "\#{$bar}$baz"
-    assert_renders "$foo\#{$bar}"
+    assert_equal 'unquote("#{$bar}#{$baz}")', render("\#{$bar}$baz")
+    assert_equal 'unquote("#{$foo}#{$bar}")', render("$foo\#{$bar}")
     assert_renders "\#{$bar}"
   end
 
   def test_interpolation_in_function
     assert_renders 'flabnabbit(#{1 + "foo"})'
-    assert_renders 'flabnabbit($foo #{1 + "foo"}$baz)'
+    assert_equal 'flabnabbit(unquote("#{$foo} #{1 + "foo"}#{$baz}"))',
+                 render('flabnabbit($foo #{1 + "foo"}$baz)')
     assert_renders 'flabnabbit($foo #{1 + "foo"}#{2 + "bar"} $baz)'
   end
 
@@ -299,30 +300,30 @@ RUBY
     assert_renders '3/ #{3 + 4}'
     assert_renders '3/#{3 + 4}'
 
-    assert_renders '#{1 + 2} * 7'
-    assert_renders '#{1 + 2}* 7'
-    assert_renders '#{1 + 2} *7'
-    assert_renders '#{1 + 2}*7'
+    assert_equal 'unquote("#{1 + 2} * 7")', render('#{1 + 2} * 7')
+    assert_equal 'unquote("#{1 + 2}* 7")', render('#{1 + 2}* 7')
+    assert_equal 'unquote("#{1 + 2} *7")', render('#{1 + 2} *7')
+    assert_equal 'unquote("#{1 + 2}*7")', render('#{1 + 2}*7')
 
     assert_renders '-#{1 + 2}'
-    assert_renders '- #{1 + 2}'
+    assert_equal 'unquote("- #{1 + 2}")', render('- #{1 + 2}')
 
-    assert_renders '5 + #{1 + 2} * #{3 + 4}'
-    assert_renders '5 +#{1 + 2} * #{3 + 4}'
-    assert_renders '5+#{1 + 2} * #{3 + 4}'
-    assert_renders '#{1 + 2} * #{3 + 4} + 5'
-    assert_renders '#{1 + 2} * #{3 + 4}+ 5'
-    assert_renders '#{1 + 2} * #{3 + 4}+5'
+    assert_equal 'unquote("5 + #{1 + 2} * #{3 + 4}")', render('5 + #{1 + 2} * #{3 + 4}')
+    assert_equal 'unquote("5 +#{1 + 2} * #{3 + 4}")', render('5 +#{1 + 2} * #{3 + 4}')
+    assert_equal 'unquote("5+#{1 + 2} * #{3 + 4}")', render('5+#{1 + 2} * #{3 + 4}')
+    assert_equal 'unquote("#{1 + 2} * #{3 + 4} + 5")', render('#{1 + 2} * #{3 + 4} + 5')
+    assert_equal 'unquote("#{1 + 2} * #{3 + 4}+ 5")', render('#{1 + 2} * #{3 + 4}+ 5')
+    assert_equal 'unquote("#{1 + 2} * #{3 + 4}+5")', render('#{1 + 2} * #{3 + 4}+5')
 
-    assert_equal '5 / #{1 + 2} + #{3 + 4}', render('5 / (#{1 + 2} + #{3 + 4})')
-    assert_equal '5 / #{1 + 2} + #{3 + 4}', render('5 /(#{1 + 2} + #{3 + 4})')
-    assert_equal '5 / #{1 + 2} + #{3 + 4}', render('5 /( #{1 + 2} + #{3 + 4} )')
-    assert_equal '#{1 + 2} + #{3 + 4} / 5', render('(#{1 + 2} + #{3 + 4}) / 5')
-    assert_equal '#{1 + 2} + #{3 + 4} / 5', render('(#{1 + 2} + #{3 + 4})/ 5')
-    assert_equal '#{1 + 2} + #{3 + 4} / 5', render('( #{1 + 2} + #{3 + 4} )/ 5')
+    assert_equal '5 / unquote("#{1 + 2} + #{3 + 4}")', render('5 / (#{1 + 2} + #{3 + 4})')
+    assert_equal '5 / unquote("#{1 + 2} + #{3 + 4}")', render('5 /(#{1 + 2} + #{3 + 4})')
+    assert_equal '5 / unquote("#{1 + 2} + #{3 + 4}")', render('5 /( #{1 + 2} + #{3 + 4} )')
+    assert_equal 'unquote("#{1 + 2} + #{3 + 4}") / 5', render('(#{1 + 2} + #{3 + 4}) / 5')
+    assert_equal 'unquote("#{1 + 2} + #{3 + 4}") / 5', render('(#{1 + 2} + #{3 + 4})/ 5')
+    assert_equal 'unquote("#{1 + 2} + #{3 + 4}") / 5', render('( #{1 + 2} + #{3 + 4} )/ 5')
 
-    assert_renders '#{1 + 2} + 2 + 3'
-    assert_renders '#{1 + 2} +2 + 3'
+    assert_equal 'unquote("#{1 + 2} + #{2 + 3}")', render('#{1 + 2} + 2 + 3')
+    assert_equal 'unquote("#{1 + 2} +#{2 + 3}")', render('#{1 + 2} +2 + 3')
   end
 
   def test_string_interpolation
@@ -350,7 +351,7 @@ RUBY
 
   def render(script, options = {})
     munge_filename(options)
-    node = Sass::Script.parse(script, 1, 0, options)
+    node = Sass::Script.parse(script, 1, 0, options.merge(:_convert => true))
     node.to_sass
   end
 end

data/test/sass/script_test.rb

@@ -191,43 +191,45 @@ class SassScriptTest < MiniTest::Test
   end
 
   def test_interpolation_near_operators
-    assert_equal '3 , 7', resolve('#{1 + 2} , #{3 + 4}')
-    assert_equal '3, 7', resolve('#{1 + 2}, #{3 + 4}')
-    assert_equal '3 ,7', resolve('#{1 + 2} ,#{3 + 4}')
-    assert_equal '3,7', resolve('#{1 + 2},#{3 + 4}')
-    assert_equal '3, 7, 11', resolve('#{1 + 2}, #{3 + 4}, #{5 + 6}')
-    assert_equal '3, 7, 11', resolve('3, #{3 + 4}, 11')
-    assert_equal '3, 7, 11', resolve('3, 7, #{5 + 6}')
-
-    assert_equal '3 / 7', resolve('3 / #{3 + 4}')
-    assert_equal '3 /7', resolve('3 /#{3 + 4}')
-    assert_equal '3/ 7', resolve('3/ #{3 + 4}')
-    assert_equal '3/7', resolve('3/#{3 + 4}')
-
-    assert_equal '3 * 7', resolve('#{1 + 2} * 7')
-    assert_equal '3* 7', resolve('#{1 + 2}* 7')
-    assert_equal '3 *7', resolve('#{1 + 2} *7')
-    assert_equal '3*7', resolve('#{1 + 2}*7')
-
-    assert_equal '-3', resolve('-#{1 + 2}')
-    assert_equal '- 3', resolve('- #{1 + 2}')
-
-    assert_equal '5 + 3 * 7', resolve('5 + #{1 + 2} * #{3 + 4}')
-    assert_equal '5 +3 * 7', resolve('5 +#{1 + 2} * #{3 + 4}')
-    assert_equal '5+3 * 7', resolve('5+#{1 + 2} * #{3 + 4}')
-    assert_equal '3 * 7 + 5', resolve('#{1 + 2} * #{3 + 4} + 5')
-    assert_equal '3 * 7+ 5', resolve('#{1 + 2} * #{3 + 4}+ 5')
-    assert_equal '3 * 7+5', resolve('#{1 + 2} * #{3 + 4}+5')
-
-    assert_equal '5/3 + 7', resolve('5 / (#{1 + 2} + #{3 + 4})')
-    assert_equal '5/3 + 7', resolve('5 /(#{1 + 2} + #{3 + 4})')
-    assert_equal '5/3 + 7', resolve('5 /( #{1 + 2} + #{3 + 4} )')
-    assert_equal '3 + 7/5', resolve('(#{1 + 2} + #{3 + 4}) / 5')
-    assert_equal '3 + 7/5', resolve('(#{1 + 2} + #{3 + 4})/ 5')
-    assert_equal '3 + 7/5', resolve('( #{1 + 2} + #{3 + 4} )/ 5')
-
-    assert_equal '3 + 5', resolve('#{1 + 2} + 2 + 3')
-    assert_equal '3 +5', resolve('#{1 + 2} +2 + 3')
+    silence_warnings do
+      assert_equal '3 , 7', resolve('#{1 + 2} , #{3 + 4}')
+      assert_equal '3, 7', resolve('#{1 + 2}, #{3 + 4}')
+      assert_equal '3 ,7', resolve('#{1 + 2} ,#{3 + 4}')
+      assert_equal '3,7', resolve('#{1 + 2},#{3 + 4}')
+      assert_equal '3, 7, 11', resolve('#{1 + 2}, #{3 + 4}, #{5 + 6}')
+      assert_equal '3, 7, 11', resolve('3, #{3 + 4}, 11')
+      assert_equal '3, 7, 11', resolve('3, 7, #{5 + 6}')
+
+      assert_equal '3 / 7', resolve('3 / #{3 + 4}')
+      assert_equal '3 /7', resolve('3 /#{3 + 4}')
+      assert_equal '3/ 7', resolve('3/ #{3 + 4}')
+      assert_equal '3/7', resolve('3/#{3 + 4}')
+
+      assert_equal '3 * 7', resolve('#{1 + 2} * 7')
+      assert_equal '3* 7', resolve('#{1 + 2}* 7')
+      assert_equal '3 *7', resolve('#{1 + 2} *7')
+      assert_equal '3*7', resolve('#{1 + 2}*7')
+
+      assert_equal '-3', resolve('-#{1 + 2}')
+      assert_equal '- 3', resolve('- #{1 + 2}')
+
+      assert_equal '5 + 3 * 7', resolve('5 + #{1 + 2} * #{3 + 4}')
+      assert_equal '5 +3 * 7', resolve('5 +#{1 + 2} * #{3 + 4}')
+      assert_equal '5+3 * 7', resolve('5+#{1 + 2} * #{3 + 4}')
+      assert_equal '3 * 7 + 5', resolve('#{1 + 2} * #{3 + 4} + 5')
+      assert_equal '3 * 7+ 5', resolve('#{1 + 2} * #{3 + 4}+ 5')
+      assert_equal '3 * 7+5', resolve('#{1 + 2} * #{3 + 4}+5')
+
+      assert_equal '5/3 + 7', resolve('5 / (#{1 + 2} + #{3 + 4})')
+      assert_equal '5/3 + 7', resolve('5 /(#{1 + 2} + #{3 + 4})')
+      assert_equal '5/3 + 7', resolve('5 /( #{1 + 2} + #{3 + 4} )')
+      assert_equal '3 + 7/5', resolve('(#{1 + 2} + #{3 + 4}) / 5')
+      assert_equal '3 + 7/5', resolve('(#{1 + 2} + #{3 + 4})/ 5')
+      assert_equal '3 + 7/5', resolve('( #{1 + 2} + #{3 + 4} )/ 5')
+
+      assert_equal '3 + 5', resolve('#{1 + 2} + 2 + 3')
+      assert_equal '3 +5', resolve('#{1 + 2} +2 + 3')
+    end
   end
 
   def test_string_interpolation
@@ -496,10 +498,14 @@ SASS
 
   def test_operator_unit_conversion
     assert_equal "1.1cm", resolve("1cm + 1mm")
+    assert_equal "8q", resolve("4q + 1mm")
+    assert_equal "40.025cm", resolve("40cm + 1q")
     assert_equal "2in", resolve("1in + 96px")
     assert_equal "true", resolve("2mm < 1cm")
     assert_equal "true", resolve("10mm == 1cm")
     assert_equal "true", resolve("1.1cm == 11mm")
+    assert_equal "true", resolve("2mm == 8q")
+    assert_equal "false", resolve("2px > 3q")
 
     assert_warning(<<WARNING) {assert_equal "true", resolve("1 == 1cm")}
 DEPRECATION WARNING on line 1 of test_operator_unit_conversion_inline.sass:
@@ -521,6 +527,8 @@ WARNING
     assert_equal "2.83465", resolve("(1mm/1pt)")
     assert_equal "1.33333", resolve("(1pt/1px)")
     assert_equal "0.01042", resolve("(1px/1in)")
+    assert_equal "1.05833", resolve("(1px/1q)")
+    assert_equal "0.05906", resolve("(1q/1pc)")
   end
 
   def test_angle_units
@@ -1171,12 +1179,164 @@ SASS
     assert_equal "true", resolve("29 == (29 / 7 * 7)")
   end
 
+  def test_compressed_output_of_numbers_with_leading_zeros
+    assert_equal "1.5", resolve("1.5", :style => :compressed)
+    assert_equal ".5", resolve("0.5", :style => :compressed)
+    assert_equal "-.5", resolve("-0.5", :style => :compressed)
+    assert_equal "0.5", resolve("0.5", :style => :compact)
+  end
+
+  def test_interpolation_without_deprecation_warning
+    assert_no_warning {assert_equal "a", resolve('#{a}')}
+    assert_no_warning {assert_equal "abc", resolve('a#{b}c')}
+    assert_no_warning {assert_equal "+ a", resolve('+ #{a}')}
+    assert_no_warning {assert_equal "/ a", resolve('/ #{a}')}
+    assert_no_warning {assert_equal "1 / a", resolve('1 / #{a}')}
+    assert_no_warning {assert_equal "a / b", resolve('#{a} / #{b}')}
+    assert_no_warning {assert_equal "foo(1 = a)", resolve('foo(1 = #{a})')}
+    assert_no_warning {assert_equal "foo(a = b)", resolve('foo(#{a} = #{b})')}
+    assert_no_warning {assert_equal "-a", resolve('-#{a}')}
+    assert_no_warning {assert_equal "1-a", resolve('1-#{a}')}
+    assert_no_warning {assert_equal "a- 1", resolve('#{a}- 1')}
+    assert_no_warning {assert_equal "a-1", resolve('#{a}-1')}
+    assert_no_warning {assert_equal "a-b", resolve('#{a}-#{b}')}
+    assert_no_warning {assert_equal "a1", resolve('#{a}1')}
+    assert_no_warning {assert_equal "ab", resolve('#{a}b')}
+    assert_no_warning {assert_equal "1a", resolve('1#{a}')}
+    assert_no_warning {assert_equal "ba", resolve('b#{a}')}
+  end
+
+  def test_leading_interpolation_with_deprecation_warning
+    assert_equal "ab == 1", resolve_with_interp_warning('#{a + b} == 1')
+    assert_equal "ab != 1", resolve_with_interp_warning('#{a + b} != 1')
+    assert_equal "ab > 1", resolve_with_interp_warning('#{a + b} > 1')
+    assert_equal "ab >= 1", resolve_with_interp_warning('#{a + b} >= 1')
+    assert_equal "ab < 1", resolve_with_interp_warning('#{a + b} < 1')
+    assert_equal "ab <= 1", resolve_with_interp_warning('#{a + b} <= 1')
+    assert_equal "ab + 1", resolve_with_interp_warning('#{a + b} + 1')
+    assert_equal "ab * 1", resolve_with_interp_warning('#{a + b} * 1')
+    assert_equal "ab - 1", resolve_with_interp_warning('#{a + b} - 1')
+    assert_equal "ab % 1", resolve_with_interp_warning('#{a + b} % 1')
+    assert_equal(
+      "abvar",
+      resolve_with_interp_warning(
+        '#{a + b}$var', '"#{a + b}#{$var}"',
+        env('var' => Sass::Script::Value::String.new("var"))))
+    assert_equal(
+      "varab",
+      resolve_with_interp_warning(
+        '$var#{a + b}', '"#{$var}#{a + b}"',
+        env('var' => Sass::Script::Value::String.new("var"))))
+    assert_equal "ab1", resolve_with_interp_warning('#{a + b}(1)', '"#{a + b}1"')
+    assert_equal "1ab", resolve_with_interp_warning('(1)#{a + b}', '"1#{a + b}"')
+  end
+
+  def test_trailing_interpolation_with_deprecation_warning
+    assert_equal "not ab", resolve_with_interp_warning('not #{a + b}')
+    assert_equal "1 and ab", resolve_with_interp_warning('1 and #{a + b}')
+    assert_equal "1 or ab", resolve_with_interp_warning('1 or #{a + b}')
+    assert_equal "1 == ab", resolve_with_interp_warning('1 == #{a + b}')
+    assert_equal "1 != ab", resolve_with_interp_warning('1 != #{a + b}')
+    assert_equal "1 > ab", resolve_with_interp_warning('1 > #{a + b}')
+    assert_equal "1 >= ab", resolve_with_interp_warning('1 >= #{a + b}')
+    assert_equal "1 < ab", resolve_with_interp_warning('1 < #{a + b}')
+    assert_equal "1 <= ab", resolve_with_interp_warning('1 <= #{a + b}')
+    assert_equal "1 + ab", resolve_with_interp_warning('1 + #{a + b}')
+    assert_equal "1 * ab", resolve_with_interp_warning('1 * #{a + b}')
+    assert_equal "1 - ab", resolve_with_interp_warning('1 - #{a + b}')
+    assert_equal "1 % ab", resolve_with_interp_warning('1 % #{a + b}')
+    assert_equal "- ab", resolve_with_interp_warning('- #{a + b}')
+    assert_equal "1- ab", resolve_with_interp_warning('1- #{a + b}')
+    assert_equal "- ab 2 3", resolve_with_interp_warning('- #{a + b} 2 3', '"- #{a + b} #{2 3}"')
+  end
+
+  def test_brackteing_interpolation_with_deprecation_warning
+    assert_equal "ab == cd", resolve_with_interp_warning('#{a + b} == #{c + d}')
+    assert_equal "ab != cd", resolve_with_interp_warning('#{a + b} != #{c + d}')
+    assert_equal "ab > cd", resolve_with_interp_warning('#{a + b} > #{c + d}')
+    assert_equal "ab >= cd", resolve_with_interp_warning('#{a + b} >= #{c + d}')
+    assert_equal "ab < cd", resolve_with_interp_warning('#{a + b} < #{c + d}')
+    assert_equal "ab <= cd", resolve_with_interp_warning('#{a + b} <= #{c + d}')
+    assert_equal "ab + cd", resolve_with_interp_warning('#{a + b} + #{c + d}')
+    assert_equal "ab * cd", resolve_with_interp_warning('#{a + b} * #{c + d}')
+    assert_equal "ab - cd", resolve_with_interp_warning('#{a + b} - #{c + d}')
+    assert_equal "ab % cd", resolve_with_interp_warning('#{a + b} % #{c + d}')
+  end
+
+  def test_interp_warning_formatting
+    resolve_with_interp_warning('#{1} + 1', '"1 + 1"')
+    resolve_with_interp_warning('#{1} + "foo"', '\'1 + "foo"\'')
+    resolve_with_interp_warning('#{1} + \'foo\'', '\'1 + "foo"\'')
+
+    resolve_with_interp_warning('#{1} + "#{a + b}"', '\'1 + "#{a + b}"\'')
+    resolve_with_interp_warning('"#{a + b}" + #{1}', '\'"#{a + b}" + 1\'')
+    resolve_with_interp_warning('"#{a + b}" + #{1} + "#{c + d}"', '\'"#{a + b}" + 1 + "#{c + d}"\'')
+
+    resolve_with_interp_warning('#{1} + "\'"', '"1 + \\"\'\\""')
+    resolve_with_interp_warning('#{1} + \'"\'', '"1 + \'\\"\'"')
+    resolve_with_interp_warning('#{1} + "\'\\""', '"1 + \\"\'\\\\\\"\\""')
+  end
+
+  def test_inactive_lazy_interpolation_deprecation_warning
+    assert_equal '1, 2, 3', assert_no_warning {resolve('1, #{2}, 3')}
+    assert_equal '1, 2, 3', assert_no_warning {resolve('1, 2, #{3}')}
+    assert_equal '1,2,3', assert_no_warning {resolve('1,#{2},3')}
+    assert_equal '1 2 3', assert_no_warning {resolve('#{1} 2 3')}
+    assert_equal '1 2 3', assert_no_warning {resolve('1 #{2} 3')}
+    assert_equal '1 2 3', assert_no_warning {resolve('1 2 #{3}')}
+
+    assert_equal '+1 2 3', assert_no_warning {resolve('+#{1} 2 3')}
+    assert_equal '-1 2 3', assert_no_warning {resolve('-#{1} 2 3')}
+    assert_equal '/1 2 3', assert_no_warning {resolve('/#{1} 2 3')}
+
+    assert_equal '1, 2, 31', assert_no_warning {resolve('(1, #{2}, 3) + 1')}
+    assert_equal '11, 2, 3', assert_no_warning {resolve('1 + (1, #{2}, 3)')}
+
+    assert_equal 'a, b, c', assert_no_warning {resolve('selector-parse((a, #{b}, c))')}
+  end
+
+  def test_active_lazy_interpolation_deprecation_warning
+    assert_equal "1, 2, 3", resolve_with_lazy_interp_warning('quote((1, #{2}, 3))', '"1, 2, 3"')
+    assert_equal "1", resolve_with_lazy_interp_warning('length((1, #{2}, 3))', '"1, 2, 3"')
+    assert_equal "1, 2, 3", resolve_with_lazy_interp_warning('inspect((1, #{2}, 3))', '"1, 2, 3"')
+    assert_equal "string", resolve_with_lazy_interp_warning('type-of((1, #{2}, 3))', '"1, 2, 3"')
+
+    assert_equal "+1 2 3", resolve_with_lazy_interp_warning('quote((+#{1} 2 3))', '"+1 #{2 3}"')
+    assert_equal "/1 2 3", resolve_with_lazy_interp_warning('quote((/#{1} 2 3))', '"/1 #{2 3}"')
+    assert_equal "-1 2 3", resolve_with_lazy_interp_warning('quote((-#{1} 2 3))', '"-1 #{2 3}"')
+  end
+
   private
 
+  def resolve_with_lazy_interp_warning(str, contents = nil, environment = env)
+    contents ||= "\"#{str}\""
+    result = assert_warning(<<WARNING) {resolve(str, {}, environment)}
+DEPRECATION WARNING on line 1 of #{filename_for_test}: \#{} interpolation near operators will be simplified
+in a future version of Sass. To preserve the current behavior, use quotes:
+
+  unquote(#{contents})
+WARNING
+    $_sass_deprecated_interp_warnings = nil
+    result
+  end
+
+  def resolve_with_interp_warning(str, contents = nil, environment = env)
+    contents ||= "\"#{str}\""
+    assert_warning(<<WARNING) {resolve(str, {}, environment)}
+DEPRECATION WARNING on line 1 of #{filename_for_test}: \#{} interpolation near operators will be simplified
+in a future version of Sass. To preserve the current behavior, use quotes:
+
+  unquote(#{contents})
+
+You can use the sass-convert command to automatically fix most cases.
+WARNING
+  end
+
   def resolve(str, opts = {}, environment = env)
     munge_filename opts
     val = eval(str, opts, environment)
     assert_kind_of Sass::Script::Value::Base, val
+    val.options = opts
     val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s
   end
 

data/test/sass/scss/scss_test.rb

@@ -4125,4 +4125,23 @@ CSS
 }
 SCSS
   end
+
+  def test_import_with_supports_clause_interp
+    assert_equal(<<CSS, render(<<'SASS', :style => :compressed))
+@import url("fallback-layout.css") supports(not (display: flex))
+CSS
+$display-type: flex;
+@import url("fallback-layout.css") supports(not (display: #{$display-type}));
+SASS
+  end
+
+  def test_import_with_supports_clause
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@import url("fallback-layout.css") supports(not (display: flex));.foo{bar:baz}
+CSS
+@import url("fallback-layout.css") supports(not (display: flex));
+.foo { bar: baz; }
+SASS
+  end
+
 end

data/test/sass/source_map_test.rb

@@ -28,7 +28,7 @@ a {
 CSS
 {
 "version": 3,
-"mappings": "AAAA,CAAE;EACA,GAAG,EAAE,GAAG;;EAER,SAAS,EAAE,IAAI",
+"mappings": "AAAA,CAAE;EACA,GAAG,EAAE,GAAG;EACV,kBAAkB;EAChB,SAAS,EAAE,IAAI",
 "sources": ["test_simple_mapping_scss_inline.scss"],
 "names": [],
 "file": "test.css"
@@ -78,7 +78,7 @@ a {
 CSS
 {
 "version": 3,
-"mappings": "AAAA,CAAE;EACA,GAAG,EAAE,GAAG;;EAER,SAAS,EAAE,IAAI",
+"mappings": "AAAA,CAAE;EACA,GAAG,EAAE,GAAG;EACV,kBAAkB;EAChB,SAAS,EAAE,IAAI",
 "sources": ["#{uri}"],
 "names": [],
 "file": "test.css"
@@ -104,7 +104,7 @@ a {
 CSS
 {
 "version": 3,
-"mappings": "AAAA,CAAE;EACA,GAAG,EAAE,GAAG;;EAER,SAAS,EAAE,IAAI",
+"mappings": "AAAA,CAAE;EACA,GAAG,EAAE,GAAG;EACV,kBAAkB;EAChB,SAAS,EAAE,IAAI",
 "sources": ["../scss/style.scss"],
 "names": [],
 "file": "style.css"
@@ -350,44 +350,44 @@ CSS
 $width: 2px;
 $translucent-red: rgba(255, 0, 0, 0.5);
 {{1}}a {{/1}}{
-  {{8}}.special {{/8}}{
-    {{9}}color{{/9}}: {{10}}red{{/10}};
-    {{11}}&:hover {{/11}}{
-      {{12}}foo{{/12}}: {{13}}bar{{/13}};
-      {{14}}cursor{{/14}}: {{15}}e + -resize{{/15}};
-      {{16}}color{{/16}}: {{17}}opacify($translucent-red, 0.3){{/17}};
+  {{9}}.special {{/9}}{
+    {{10}}color{{/10}}: {{11}}red{{/11}};
+    {{12}}&:hover {{/12}}{
+      {{13}}foo{{/13}}: {{14}}bar{{/14}};
+      {{15}}cursor{{/15}}: {{16}}e + -resize{{/16}};
+      {{17}}color{{/17}}: {{18}}opacify($translucent-red, 0.3){{/18}};
     }
-    {{18}}&:after {{/18}}{
-      {{19}}content{{/19}}: {{20}}"I ate #{5 + 10} pies #{$width} thick!"{{/20}};
+    {{19}}&:after {{/19}}{
+      {{20}}content{{/20}}: {{21}}"I ate #{5 + 10} pies #{$width} thick!"{{/21}};
     }
   }
-  {{21}}&:active {{/21}}{
-    {{22}}color{{/22}}: {{23}}#010203 + #040506{{/23}};
-    {{24}}border{{/24}}: {{25}}$width solid black{{/25}};
+  {{22}}&:active {{/22}}{
+    {{23}}color{{/23}}: {{24}}#010203 + #040506{{/24}};
+    {{25}}border{{/25}}: {{26}}$width solid black{{/26}};
   }
-/* SOME COMMENT */
-  {{2}}font{{/2}}: {{3}}2px/3px {{/3}}{
-    {{4}}family{{/4}}: {{5}}fantasy{{/5}};
-    {{6}}size{{/6}}: {{7}}1em + (2em * 3){{/7}};
+{{2}}/* SOME COMMENT */{{/2}}
+  {{3}}font{{/3}}: {{4}}2px/3px {{/4}}{
+    {{5}}family{{/5}}: {{6}}fantasy{{/6}};
+    {{7}}size{{/7}}: {{8}}1em + (2em * 3){{/8}};
   }
 }
 SCSS
 {{1}}a{{/1}} {
-  /* SOME COMMENT */
-  {{2}}font{{/2}}: {{3}}2px/3px{{/3}};
-    {{4}}font-family{{/4}}: {{5}}fantasy{{/5}};
-    {{6}}font-size{{/6}}: {{7}}7em{{/7}}; }
-  {{8}}a .special{{/8}} {
-    {{9}}color{{/9}}: {{10}}red{{/10}}; }
-    {{11}}a .special:hover{{/11}} {
-      {{12}}foo{{/12}}: {{13}}bar{{/13}};
-      {{14}}cursor{{/14}}: {{15}}e-resize{{/15}};
-      {{16}}color{{/16}}: {{17}}rgba(255, 0, 0, 0.8){{/17}}; }
-    {{18}}a .special:after{{/18}} {
-      {{19}}content{{/19}}: {{20}}"I ate 15 pies 2px thick!"{{/20}}; }
-  {{21}}a:active{{/21}} {
-    {{22}}color{{/22}}: {{23}}#050709{{/23}};
-    {{24}}border{{/24}}: {{25}}2px solid black{{/25}}; }
+  {{2}}/* SOME COMMENT */{{/2}}
+  {{3}}font{{/3}}: {{4}}2px/3px{{/4}};
+    {{5}}font-family{{/5}}: {{6}}fantasy{{/6}};
+    {{7}}font-size{{/7}}: {{8}}7em{{/8}}; }
+  {{9}}a .special{{/9}} {
+    {{10}}color{{/10}}: {{11}}red{{/11}}; }
+    {{12}}a .special:hover{{/12}} {
+      {{13}}foo{{/13}}: {{14}}bar{{/14}};
+      {{15}}cursor{{/15}}: {{16}}e-resize{{/16}};
+      {{17}}color{{/17}}: {{18}}rgba(255, 0, 0, 0.8){{/18}}; }
+    {{19}}a .special:after{{/19}} {
+      {{20}}content{{/20}}: {{21}}"I ate 15 pies 2px thick!"{{/21}}; }
+  {{22}}a:active{{/22}} {
+    {{23}}color{{/23}}: {{24}}#050709{{/24}};
+    {{25}}border{{/25}}: {{26}}2px solid black{{/26}}; }
 
 /*# sourceMappingURL=test.css.map */
 CSS
@@ -398,39 +398,39 @@ CSS
 $width: 2px
 $translucent-red: rgba(255, 0, 0, 0.5)
 {{1}}a{{/1}}
-  {{8}}.special{{/8}}
-    {{9}}color{{/9}}: {{10}}red{{/10}}
-    {{11}}&:hover{{/11}}
-      {{12}}foo{{/12}}: {{13}}bar{{/13}}
-      {{14}}cursor{{/14}}: {{15}}e + -resize{{/15}}
-      {{16}}color{{/16}}: {{17}}opacify($translucent-red, 0.3){{/17}}
-    {{18}}&:after{{/18}}
-      {{19}}content{{/19}}: {{20}}"I ate #{5 + 10} pies #{$width} thick!"{{/20}}
-  {{21}}&:active{{/21}}
-    {{22}}color{{/22}}: {{23}}#010203 + #040506{{/23}}
-    {{24}}border{{/24}}: {{25}}$width solid black{{/25}}
-
-  /* SOME COMMENT */
-  {{2}}font{{/2}}: {{3}}2px/3px{{/3}}
-    {{4}}family{{/4}}: {{5}}fantasy{{/5}}
-    {{6}}size{{/6}}: {{7}}1em + (2em * 3){{/7}}
+  {{9}}.special{{/9}}
+    {{10}}color{{/10}}: {{11}}red{{/11}}
+    {{12}}&:hover{{/12}}
+      {{13}}foo{{/13}}: {{14}}bar{{/14}}
+      {{15}}cursor{{/15}}: {{16}}e + -resize{{/16}}
+      {{17}}color{{/17}}: {{18}}opacify($translucent-red, 0.3){{/18}}
+    {{19}}&:after{{/19}}
+      {{20}}content{{/20}}: {{21}}"I ate #{5 + 10} pies #{$width} thick!"{{/21}}
+  {{22}}&:active{{/22}}
+    {{23}}color{{/23}}: {{24}}#010203 + #040506{{/24}}
+    {{25}}border{{/25}}: {{26}}$width solid black{{/26}}
+
+  {{2}}/* SOME COMMENT */{{/2}}
+  {{3}}font{{/3}}: {{4}}2px/3px{{/4}}
+    {{5}}family{{/5}}: {{6}}fantasy{{/6}}
+    {{7}}size{{/7}}: {{8}}1em + (2em * 3){{/8}}
 SASS
 {{1}}a{{/1}} {
-  /* SOME COMMENT */
-  {{2}}font{{/2}}: {{3}}2px/3px{{/3}};
-    {{4}}font-family{{/4}}: {{5}}fantasy{{/5}};
-    {{6}}font-size{{/6}}: {{7}}7em{{/7}}; }
-  {{8}}a .special{{/8}} {
-    {{9}}color{{/9}}: {{10}}red{{/10}}; }
-    {{11}}a .special:hover{{/11}} {
-      {{12}}foo{{/12}}: {{13}}bar{{/13}};
-      {{14}}cursor{{/14}}: {{15}}e-resize{{/15}};
-      {{16}}color{{/16}}: {{17}}rgba(255, 0, 0, 0.8){{/17}}; }
-    {{18}}a .special:after{{/18}} {
-      {{19}}content{{/19}}: {{20}}"I ate 15 pies 2px thick!"{{/20}}; }
-  {{21}}a:active{{/21}} {
-    {{22}}color{{/22}}: {{23}}#050709{{/23}};
-    {{24}}border{{/24}}: {{25}}2px solid black{{/25}}; }
+  {{2}}/* SOME COMMENT */{{/2}}
+  {{3}}font{{/3}}: {{4}}2px/3px{{/4}};
+    {{5}}font-family{{/5}}: {{6}}fantasy{{/6}};
+    {{7}}font-size{{/7}}: {{8}}7em{{/8}}; }
+  {{9}}a .special{{/9}} {
+    {{10}}color{{/10}}: {{11}}red{{/11}}; }
+    {{12}}a .special:hover{{/12}} {
+      {{13}}foo{{/13}}: {{14}}bar{{/14}};
+      {{15}}cursor{{/15}}: {{16}}e-resize{{/16}};
+      {{17}}color{{/17}}: {{18}}rgba(255, 0, 0, 0.8){{/18}}; }
+    {{19}}a .special:after{{/19}} {
+      {{20}}content{{/20}}: {{21}}"I ate 15 pies 2px thick!"{{/21}}; }
+  {{22}}a:active{{/22}} {
+    {{23}}color{{/23}}: {{24}}#050709{{/24}};
+    {{25}}border{{/25}}: {{26}}2px solid black{{/26}}; }
 
 /*# sourceMappingURL=test.css.map */
 CSS
@@ -846,6 +846,72 @@ SCSS
 JSON
   end
 
+  def test_scss_comment_source_range
+    assert_parses_with_mapping <<SCSS, <<CSS, :syntax => :scss
+$var: val; {{1}}/* text */{{/1}}
+
+{{2}}/* multiline
+   comment */{{/2}}
+SCSS
+{{1}}/* text */{{/1}}
+{{2}}/* multiline
+   comment */{{/2}}
+
+/*# sourceMappingURL=test.css.map */
+CSS
+  end
+
+  def test_sass_comment_source_range
+    assert_parses_with_mapping <<SASS, <<CSS, :syntax => :sass
+{{1}}body{{/1}}
+  {{2}}/* text */{{/2}}
+
+{{3}}/* multiline
+   comment */{{/3}}
+SASS
+{{1}}body{{/1}} {
+  {{2}}/* text */{{/2}} }
+
+{{3}}/* multiline
+ * comment */{{/3}}
+
+/*# sourceMappingURL=test.css.map */
+CSS
+  end
+
+  def test_scss_comment_interpolation_source_range
+    assert_parses_with_mapping <<SCSS, <<CSS, :syntax => :scss
+$var: 2; {{1}}/* two \#{$var} and four \#{2 * $var} */{{/1}}
+
+{{2}}/* multiline
+   comment \#{ 2 + 2 } and \#{ 2 +
+   2 } */{{/2}}
+SCSS
+{{1}}/* two 2 and four 4 */{{/1}}
+{{2}}/* multiline
+   comment 4 and 4 */{{/2}}
+
+/*# sourceMappingURL=test.css.map */
+CSS
+  end
+
+  def test_sass_comment_interpolation_source_range
+    assert_parses_with_mapping <<SASS, <<CSS, :syntax => :sass
+$var: 2
+{{1}}/* two \#{$var} and four \#{2 * $var} */{{/1}}
+
+{{2}}/* multiline
+   comment \#{ 2 + 2 } and \#{ 2 +
+   2 } */{{/2}}
+SASS
+{{1}}/* two 2 and four 4 */{{/1}}
+{{2}}/* multiline
+ * comment 4 and 4 */{{/2}}
+
+/*# sourceMappingURL=test.css.map */
+CSS
+  end
+
   private
 
   ANNOTATION_REGEX = /\{\{(\/?)([^}]+)\}\}/