sass 3.4.24 → 3.4.25

data/lib/sass/script/value/base.rb

@@ -27,7 +27,7 @@ module Sass::Script::Value
 
     # Sets the options hash for this node,
     # as well as for all child nodes.
-    # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     #
     # @param options [{Symbol => Object}] The options
     attr_writer :options

data/lib/sass/script/value/string.rb

@@ -2,6 +2,8 @@
 module Sass::Script::Value
   # A SassScript object representing a CSS string *or* a CSS identifier.
   class String < Base
+    @@interpolation_deprecation = Sass::Deprecation.new
+
     # The Ruby value of the string.
     #
     # @return [String]
@@ -121,18 +123,9 @@ module Sass::Script::Value
     def check_deprecated_interp
       return unless @deprecated_interp_equivalent
 
-      # rubocop:disable GlobalVars
-      $_sass_deprecated_interp_warnings ||= Set.new
-      key = [source_range.start_pos.line, source_range.file, @deprecated_interp_equivalent]
-      return if $_sass_deprecated_interp_warnings.include?(key)
-      $_sass_deprecated_interp_warnings << key
-      # rubocop:enable GlobalVars
-
-      location = "on line #{source_range.start_pos.line}"
-      location << " of #{source_range.file}" if source_range.file
-      Sass::Util.sass_warn <<WARNING
-DEPRECATION WARNING #{location}: \#{} interpolation near operators will be simplified
-in a future version of Sass. To preserve the current behavior, use quotes:
+      @@interpolation_deprecation.warn(source_range.file, source_range.start_pos.line, <<WARNING)
+\#{} interpolation near operators will be simplified in a future version of Sass.
+To preserve the current behavior, use quotes:
 
   #{@deprecated_interp_equivalent}
 WARNING

data/lib/sass/scss/static_parser.rb

@@ -144,6 +144,13 @@ MESSAGE
         ns, name = expr!(:qualified_name)
         res << ns << '|' if ns
         res << name << tok!(%r{/})
+
+        location = " of #{@filename}" if @filename
+        Sass::Util.sass_warn <<MESSAGE
+DEPRECATION WARNING on line #{@line}, column #{@offset}#{location}:
+The reference combinator #{res} is deprecated and will be removed in a future release.
+MESSAGE
+
         res
       end
 

data/lib/sass/selector/comma_sequence.rb

@@ -2,6 +2,8 @@ module Sass
   module Selector
     # A comma-separated sequence of selectors.
     class CommaSequence < AbstractSequence
+      @@compound_extend_deprecation = Sass::Deprecation.new
+
       # The comma-separated selector sequences
       # represented by this class.
       #
@@ -96,8 +98,11 @@ module Sass
       #   The node that caused this extension.
       # @param parent_directives [Array<Sass::Tree::DirectiveNode>]
       #   The parent directives containing `extend_node`.
+      # @param allow_compound_target [Boolean]
+      #   Whether `extendee` is allowed to contain compound selectors.
       # @raise [Sass::SyntaxError] if this extension is invalid.
-      def populate_extends(extends, extendee, extend_node = nil, parent_directives = [])
+      def populate_extends(extends, extendee, extend_node = nil, parent_directives = [],
+          allow_compound_target = false)
         extendee.members.each do |seq|
           if seq.members.size > 1
             raise Sass::SyntaxError.new("Can't extend #{seq}: can't extend nested selectors")
@@ -111,6 +116,13 @@ module Sass
           end
 
           sel = sseq.members
+          if !allow_compound_target && sel.length > 1
+            @@compound_extend_deprecation.warn(sseq.filename, sseq.line, <<WARNING)
+Extending a compound selector, #{sseq}, is deprecated and will not be supported in a future release.
+See https://github.com/sass/sass/issues/1599 for details.
+WARNING
+          end
+
           members.each do |member|
             unless member.members.last.is_a?(Sass::Selector::SimpleSequence)
               raise Sass::SyntaxError.new("#{member} can't extend: invalid selector")

data/lib/sass/selector/simple.rb

@@ -72,6 +72,7 @@ module Sass
       #   by the time extension and unification happen,
       #   this exception will only ever be raised as a result of programmer error
       def unify(sels)
+        return sels.first.unify([self]) if sels.length == 1 && sels.first.is_a?(Universal)
         return sels if sels.any? {|sel2| eql?(sel2)}
         sels_with_ix = Sass::Util.enum_with_index(sels)
         if !is_a?(Pseudo) || (sels.last.is_a?(Pseudo) && sels.last.type == :element)

data/lib/sass/tree/node.rb

@@ -83,7 +83,7 @@ module Sass
       attr_writer :filename
 
       # The options hash for the node.
-      # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+      # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
       #
       # @return [{Symbol => Object}]
       attr_reader :options
@@ -151,7 +151,7 @@ module Sass
       # @return [Boolean]
       def invisible?; false; end
 
-      # The output style. See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+      # The output style. See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
       #
       # @return [Symbol]
       def style

data/lib/sass/tree/rule_node.rb

@@ -137,10 +137,19 @@ module Sass::Tree
 
       # We don't use real filename/line info because we don't have it yet.
       # When we get it, we'll set it on the parsed rules if possible.
-      parser = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
-      # rubocop:disable RescueModifier
-      @parsed_rules = parser.parse_selector rescue nil
-      # rubocop:enable RescueModifier
+      parser = nil
+      warnings = Sass::Util.silence_warnings do
+        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
+        # rubocop:disable RescueModifier
+        @parsed_rules = parser.parse_selector rescue nil
+        # rubocop:enable RescueModifier
+
+        $stderr.string
+      end
+
+      # If parsing produces a warning, throw away the result so we can parse
+      # later with the real filename info.
+      @parsed_rules = nil unless warnings.empty?
     end
   end
 end

data/lib/sass/tree/visitors/deep_copy.rb

@@ -55,7 +55,7 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
 
   def visit_mixin(node)
     node.args = node.args.map {|a| a.deep_copy}
-    node.keywords = Hash[node.keywords.map {|k, v| [k, v.deep_copy]}]
+    node.keywords = Sass::Util::NormalizedMap.new(Hash[node.keywords.map {|k, v| [k, v.deep_copy]}])
     yield
   end
 

data/lib/sass/tree/visitors/perform.rb

@@ -1,5 +1,7 @@
 # A visitor for converting a dynamic Sass tree into a static Sass tree.
 class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
+  @@function_name_deprecation = Sass::Deprecation.new
+
   class << self
     # @param root [Tree::Node] The root node of the tree to visit.
     # @param environment [Sass::Environment] The lexical environment.
@@ -280,8 +282,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
     if node.normalized_name == 'calc' || node.normalized_name == 'element' ||
         node.name == 'expression' || node.name == 'url'
-      Sass::Util.sass_warn <<WARNING
-DEPRECATION WARNING on line #{node.line}#{" of #{node.filename}" if node.filename}:
+      @@function_name_deprecation.warn(node.filename, node.line, <<WARNING)
 Naming a function "#{node.name}" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
 WARNING

data/test/sass/conversion_test.rb

@@ -13,7 +13,7 @@ foo bar {
   bip: bop;
 }
 SCSS
-    assert_renders <<SASS, <<SCSS, :old => true
+    silence_warnings {assert_renders <<SASS, <<SCSS, :old => true}
 foo bar
   :baz bang
   :bip bop
@@ -183,7 +183,7 @@ SCSS
   end
 
   def test_dynamic_properties_with_old
-    assert_renders <<SASS, <<SCSS, :old => true
+    silence_warnings {assert_renders <<SASS, <<SCSS, :old => true}
 foo bar
   :baz 12 $bang "bip"
 SASS
@@ -1436,7 +1436,7 @@ SCSS
   end
 
   def test_old_declaration_hacks
-    assert_renders <<SASS, <<SCSS, :old => true
+    silence_warnings {assert_renders <<SASS, <<SCSS, :old => true}
 foo
   :_name val
   :*name val

data/test/sass/css2sass_test.rb

@@ -14,7 +14,7 @@ CSS
 h1
   color: red
 SASS
-    assert_equal(<<SASS, css2sass(css, :old => true))
+    silence_warnings {assert_equal(<<SASS, css2sass(css, :old => true))}
 h1
   :color red
 SASS

data/test/sass/engine_test.rb

@@ -288,10 +288,10 @@ ERROR
   def test_exception_line
     to_render = <<SASS
 rule
-  :prop val
+  prop: val
   // comment!
 
-  :broken
+  broken:
 SASS
     begin
       Sass::Engine.new(to_render).render
@@ -305,10 +305,10 @@ SASS
   def test_exception_location
     to_render = <<SASS
 rule
-  :prop val
+  prop: val
   // comment!
 
-  :broken
+  broken:
 SASS
     begin
       Sass::Engine.new(to_render, :filename => FAKE_FILE_NAME, :line => (__LINE__-7)).render
@@ -749,22 +749,22 @@ SASS
 
   def test_basic_multiline_selector
     assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
-                 render("#foo #bar,\n#baz #boom\n  :foo bar"))
+                 render("#foo #bar,\n#baz #boom\n  foo: bar"))
     assert_equal("#foo #bar,\n#foo #baz {\n  foo: bar; }\n",
-                 render("#foo\n  #bar,\n  #baz\n    :foo bar"))
+                 render("#foo\n  #bar,\n  #baz\n    foo: bar"))
     assert_equal("#foo,\n#bar {\n  foo: bar; }\n  #foo #baz,\n  #bar #baz {\n    foo: bar; }\n",
-                 render("#foo,\n#bar\n  :foo bar\n  #baz\n    :foo bar"))
+                 render("#foo,\n#bar\n  foo: bar\n  #baz\n    foo: bar"))
     assert_equal("#foo #bar, #baz #boom { foo: bar; }\n",
-                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compact))
+                 render("#foo #bar,\n#baz #boom\n  foo: bar", :style => :compact))
                  
     assert_equal("#foo #bar,#baz #boom{foo:bar}\n",
-                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compressed))
+                 render("#foo #bar,\n#baz #boom\n  foo: bar", :style => :compressed))
 
     assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
-                 render("#foo #bar,,\n,#baz #boom,\n  :foo bar"))
+                 render("#foo #bar,,\n,#baz #boom,\n  foo: bar"))
 
     assert_equal("#bip #bop {\n  foo: bar; }\n",
-                 render("#bip #bop,, ,\n  :foo bar"))
+                 render("#bip #bop,, ,\n  foo: bar"))
   end
 
   def test_complex_multiline_selector
@@ -783,7 +783,7 @@ SASS
     end
 
     begin
-      render("a\n  :b c", :property_syntax => :new)
+      silence_warnings {render("a\n  :b c", :property_syntax => :new)}
       assert_equal(2, e.sass_line)
     rescue Sass::SyntaxError => e
       assert_equal("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.",
@@ -806,53 +806,53 @@ SASS
   def test_directive
     assert_equal("@a b;\n", render("@a b"))
 
-    assert_equal("@a {\n  b: c; }\n", render("@a\n  :b c"))
-    assert_equal("@a { b: c; }\n", render("@a\n  :b c", :style => :compact))
-    assert_equal("@a {\n  b: c;\n}\n", render("@a\n  :b c", :style => :expanded))
-    assert_equal("@a{b:c}\n", render("@a\n  :b c", :style => :compressed))
+    assert_equal("@a {\n  b: c; }\n", render("@a\n  b: c"))
+    assert_equal("@a { b: c; }\n", render("@a\n  b: c", :style => :compact))
+    assert_equal("@a {\n  b: c;\n}\n", render("@a\n  b: c", :style => :expanded))
+    assert_equal("@a{b:c}\n", render("@a\n  b: c", :style => :compressed))
 
     assert_equal("@a {\n  b: c;\n  d: e; }\n",
-                 render("@a\n  :b c\n  :d e"))
+                 render("@a\n  b: c\n  d: e"))
     assert_equal("@a { b: c; d: e; }\n",
-                 render("@a\n  :b c\n  :d e", :style => :compact))
+                 render("@a\n  b: c\n  d: e", :style => :compact))
     assert_equal("@a {\n  b: c;\n  d: e;\n}\n",
-                 render("@a\n  :b c\n  :d e", :style => :expanded))
+                 render("@a\n  b: c\n  d: e", :style => :expanded))
     assert_equal("@a{b:c;d:e}\n",
-                 render("@a\n  :b c\n  :d e", :style => :compressed))
+                 render("@a\n  b: c\n  d: e", :style => :compressed))
 
     assert_equal("@a {\n  #b {\n    c: d; } }\n",
-                 render("@a\n  #b\n    :c d"))
+                 render("@a\n  #b\n    c: d"))
     assert_equal("@a { #b { c: d; } }\n",
-                 render("@a\n  #b\n    :c d", :style => :compact))
+                 render("@a\n  #b\n    c: d", :style => :compact))
     assert_equal("@a {\n  #b {\n    c: d;\n  }\n}\n",
-                 render("@a\n  #b\n    :c d", :style => :expanded))
+                 render("@a\n  #b\n    c: d", :style => :expanded))
     assert_equal("@a{#b{c:d}}\n",
-                 render("@a\n  #b\n    :c d", :style => :compressed))
+                 render("@a\n  #b\n    c: d", :style => :compressed))
 
     assert_equal("@a {\n  #b {\n    a: b; }\n    #b #c {\n      d: e; } }\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e"))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e"))
     assert_equal("@a { #b { a: b; }\n  #b #c { d: e; } }\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compact))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :compact))
     assert_equal("@a {\n  #b {\n    a: b;\n  }\n  #b #c {\n    d: e;\n  }\n}\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :expanded))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :expanded))
     assert_equal("@a{#b{a:b}#b #c{d:e}}\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compressed))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :compressed))
                  
     assert_equal("@a {\n  #foo,\n  #bar {\n    b: c; } }\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c"))
+                 render("@a\n  #foo, \n  #bar\n    b: c"))
     assert_equal("@a { #foo, #bar { b: c; } }\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compact))
+                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :compact))
     assert_equal("@a {\n  #foo,\n  #bar {\n    b: c;\n  }\n}\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :expanded))
+                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :expanded))
     assert_equal("@a{#foo,#bar{b:c}}\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compressed))
+                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :compressed))
 
     to_render = <<END
 @a
-  :b c
+  b: c
   #d
-    :e f
-  :g h
+    e: f
+  g: h
 END
     rendered = <<END
 @a { b: c;
@@ -1141,7 +1141,7 @@ black {
   color: #000; }
 CSS
 =foo($a: #FFF)
-  :color $a
+  color: $a
 white
   +foo
 black
@@ -1165,9 +1165,9 @@ three {
 CSS
 $a: 5px
 =foo($a, $b: 1px, $c: 3px + $b)
-  :color $a
-  :padding $b
-  :margin $c
+  color: $a
+  padding: $b
+  margin: $c
 one
   +foo(#fff)
 two
@@ -2598,29 +2598,29 @@ SASS
   border-style: solid; }
 RESULT
 .box
-  :border
-    //:color black
-    :style solid
+  border:
+    //color: black
+    style: solid
 SOURCE
 
     assert_equal(<<RESULT, render(<<SOURCE))
 .box {
-  /* :color black */
+  /* color: black */
   border-style: solid; }
 RESULT
 .box
-  :border
-    /* :color black
-    :style solid
+  border:
+    /* color: black
+    style: solid
 SOURCE
 
     assert_equal(<<RESULT, render(<<SOURCE, :style => :compressed))
 .box{border-style:solid}
 RESULT
 .box
-  :border
-    /*:color black
-    :style solid
+  border:
+    /*color: black
+    style: solid
 SOURCE
   end
 
@@ -3394,7 +3394,13 @@ SASS
   private
 
   def assert_hash_has(hash, expected)
-    expected.each {|k, v| assert_equal(v, hash[k])}
+    expected.each do |k, v|
+      if v.nil?
+        assert_nil(hash[k])
+      else
+        assert_equal(v, hash[k])
+      end
+    end
   end
 
   def assert_renders_encoded(css, sass)

data/test/sass/extend_test.rb

@@ -573,21 +573,27 @@ SCSS
   ## Long Extendees
 
   def test_long_extendee
-    assert_extends '.foo.bar', '.baz {@extend .foo.bar}', '.foo.bar, .baz'
+    assert_warning(<<WARNING) {assert_extends '.foo.bar', '.baz {@extend .foo.bar}', '.foo.bar, .baz'}
+DEPRECATION WARNING on line 2 of test_long_extendee_inline.scss:
+Extending a compound selector, .foo.bar, is deprecated and will not be supported in a future release.
+See https://github.com/sass/sass/issues/1599 for details.
+WARNING
   end
 
   def test_long_extendee_requires_all_selectors
-    assert_extend_doesnt_match('.baz', '.foo.bar', :not_found, 2) do
-      render_extends '.foo', '.baz {@extend .foo.bar}'
+    silence_warnings do
+      assert_extend_doesnt_match('.baz', '.foo.bar', :not_found, 2) do
+        render_extends '.foo', '.baz {@extend .foo.bar}'
+      end
     end
   end
 
   def test_long_extendee_matches_supersets
-    assert_extends '.foo.bar.bap', '.baz {@extend .foo.bar}', '.foo.bar.bap, .bap.baz'
+    silence_warnings {assert_extends '.foo.bar.bap', '.baz {@extend .foo.bar}', '.foo.bar.bap, .bap.baz'}
   end
 
   def test_long_extendee_runs_unification
-    assert_extends 'ns|*.foo.bar', '*|a.baz {@extend .foo.bar}', 'ns|*.foo.bar, ns|a.baz'
+    silence_warnings {assert_extends 'ns|*.foo.bar', '*|a.baz {@extend .foo.bar}', 'ns|*.foo.bar, ns|a.baz'}
   end
 
   ## Long Extenders
@@ -683,9 +689,9 @@ SCSS
   end
 
   def test_nested_extender_doesnt_find_common_selectors_around_reference_selector
-    assert_extends 'a /for/ b c .c1', 'a c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b a c .c2, a a /for/ b c .c2'
-    assert_extends 'a /for/ b c .c1', 'a b .c2 {@extend .c1}', 'a /for/ b c .c1, a a /for/ b c .c2'
-    assert_extends 'a /for/ b c .c1', 'b c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b c .c2'
+    silence_warnings {assert_extends 'a /for/ b c .c1', 'a c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b a c .c2, a a /for/ b c .c2'}
+    silence_warnings {assert_extends 'a /for/ b c .c1', 'a b .c2 {@extend .c1}', 'a /for/ b c .c1, a a /for/ b c .c2'}
+    silence_warnings {assert_extends 'a /for/ b c .c1', 'b c .c2 {@extend .c1}', 'a /for/ b c .c1, a /for/ b c .c2'}
   end
 
   def test_nested_extender_with_early_child_selectors_doesnt_subseq_them