sass 3.4.25 → 3.7.4

data/lib/sass/scss/rx.rb

@@ -32,7 +32,7 @@ module Sass
       # @return [String] The escaped character
       # @private
       def self.escape_char(c)
-        return "\\%06x" % (Sass::Util.ord(c)) unless c =~ %r{[ -/:-~]}
+        return "\\%06x" % c.ord unless c =~ %r{[ -/:-~]}
         "\\#{c}"
       end
 
@@ -50,15 +50,9 @@ module Sass
       H        = /[0-9a-fA-F]/
       NL       = /\n|\r\n|\r|\f/
       UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/
-      s = if Sass::Util.ruby1_8?
-            '\200-\377'
-          elsif Sass::Util.macruby?
-            '\u0080-\uD7FF\uE000-\uFFFD\U00010000-\U0010FFFF'
-          else
-            '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
-          end
+      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})*)\"/
@@ -127,13 +121,13 @@ module Sass
       OPTIONAL = /!#{W}optional/i
       IDENT_START = /-|#{NMSTART}/
 
-      IDENT_HYPHEN_INTERP = /-(#\{)/
+      IDENT_HYPHEN_INTERP = /-+(?=#\{)/
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|#{ESCAPE})*)\'/
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
 
       STATIC_COMPONENT = /#{IDENT}|#{STRING_NOINTERP}|#{HEXCOLOR}|[+-]?#{NUMBER}|\!important/i
-      STATIC_VALUE = %r(#{STATIC_COMPONENT}(\s*[\s,/]\s*#{STATIC_COMPONENT})*([;}]))i
+      STATIC_VALUE = %r(#{STATIC_COMPONENT}(\s*[\s,\/]\s*#{STATIC_COMPONENT})*(?=[;}]))i
       STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){1,50}([{])/i
     end
   end

data/lib/sass/scss/static_parser.rb

@@ -51,10 +51,7 @@ module Sass
       # @see Parser#initialize
       # @param allow_parent_ref [Boolean] Whether to allow the
       #   parent-reference selector, `&`, when parsing the document.
-      # @comment
-      #   rubocop:disable ParameterLists
       def initialize(str, filename, importer, line = 1, offset = 1, allow_parent_ref = true)
-        # rubocop:enable ParameterLists
         super(str, filename, importer, line, offset)
         @allow_parent_ref = allow_parent_ref
       end
@@ -74,7 +71,7 @@ module Sass
       def var_expr; nil; end
       def interp_string; (s = tok(STRING)) && [s]; end
       def interp_uri; (s = tok(URI)) && [s]; end
-      def interp_ident(ident = IDENT); (s = tok(ident)) && [s]; end
+      def interp_ident; (s = ident) && [s]; end
       def use_css_import?; true; end
 
       def special_directive(name, start_pos)
@@ -188,25 +185,25 @@ MESSAGE
 
       def parent_selector
         return unless @allow_parent_ref && tok(/&/)
-        Selector::Parent.new(tok(NAME))
+        Selector::Parent.new(name)
       end
 
       def class_selector
         return unless tok(/\./)
         @expected = "class name"
-        Selector::Class.new(tok!(IDENT))
+        Selector::Class.new(ident!)
       end
 
       def id_selector
         return unless tok(/#(?!\{)/)
         @expected = "id name"
-        Selector::Id.new(tok!(NAME))
+        Selector::Id.new(name!)
       end
 
       def placeholder_selector
         return unless tok(/%/)
         @expected = "placeholder name"
-        Selector::Placeholder.new(tok!(IDENT))
+        Selector::Placeholder.new(ident!)
       end
 
       def element_name
@@ -221,13 +218,13 @@ MESSAGE
       end
 
       def qualified_name(allow_star_name = false)
-        name = tok(IDENT) || tok(/\*/) || (tok?(/\|/) && "")
+        name = ident || tok(/\*/) || (tok?(/\|/) && "")
         return unless name
         return nil, name unless tok(/\|/)
 
-        return name, tok!(IDENT) unless allow_star_name
+        return name, ident! unless allow_star_name
         @expected = "identifier or *"
-        return name, tok(IDENT) || tok!(/\*/)
+        return name, ident || tok!(/\*/)
       end
 
       def attrib
@@ -245,21 +242,21 @@ MESSAGE
         if op
           @expected = "identifier or string"
           ss
-          val = tok(IDENT) || tok!(STRING)
+          val = ident || tok!(STRING)
           ss
         end
-        flags = tok(IDENT) || tok(STRING)
+        flags = ident || tok(STRING)
         tok!(/\]/)
 
         Selector::Attribute.new(name, ns, op, val, flags)
       end
 
       def attrib_name!
-        if (name_or_ns = tok(IDENT))
+        if (name_or_ns = ident)
           # E, E|E
           if tok(/\|(?!=)/)
             ns = name_or_ns
-            name = tok(IDENT)
+            name = ident
           else
             name = name_or_ns
           end
@@ -267,7 +264,7 @@ MESSAGE
           # *|E or |E
           ns = tok(/\*/) || ""
           tok!(/\|/)
-          name = tok!(IDENT)
+          name = ident!
         end
         return ns, name
       end
@@ -276,11 +273,13 @@ MESSAGE
 
       PREFIXED_SELECTOR_PSEUDO_CLASSES = %w(nth-child nth-last-child).to_set
 
+      SELECTOR_PSEUDO_ELEMENTS = %w(slotted).to_set
+
       def pseudo
         s = tok(/::?/)
         return unless s
         @expected = "pseudoclass or pseudoelement"
-        name = tok!(IDENT)
+        name = ident!
         if tok(/\(/)
           ss
           deprefixed = deprefix(name)
@@ -288,8 +287,10 @@ MESSAGE
             sel = selector_comma_sequence
           elsif s == ':' && PREFIXED_SELECTOR_PSEUDO_CLASSES.include?(deprefixed)
             arg, sel = prefixed_selector_pseudo
+          elsif s == '::' && SELECTOR_PSEUDO_ELEMENTS.include?(deprefixed)
+            sel = selector_comma_sequence
           else
-            arg = expr!(:pseudo_args)
+            arg = expr!(:declaration_value).join
           end
 
           tok!(/\)/)
@@ -297,29 +298,6 @@ MESSAGE
         Selector::Pseudo.new(s == ':' ? :class : :element, name, arg, sel)
       end
 
-      def pseudo_args
-        arg = expr!(:pseudo_expr)
-        while tok(/,/)
-          arg << ',' << str {ss}
-          arg.concat expr!(:pseudo_expr)
-        end
-        arg
-      end
-
-      def pseudo_expr
-        res = pseudo_expr_token
-        return unless res
-        res << str {ss}
-        while (e = pseudo_expr_token)
-          res << e << str {ss}
-        end
-        res
-      end
-
-      def pseudo_expr_token
-        tok(PLUS) || tok(/[-*]/) || tok(NUMBER) || tok(STRING) || tok(IDENT)
-      end
-
       def prefixed_selector_pseudo
         prefix = str do
           expr = str {expr!(:a_n_plus_b)}
@@ -364,7 +342,7 @@ MESSAGE
       end
 
       def keyframes_selector_component
-        tok(IDENT) || tok(PERCENTAGE)
+        ident || tok(PERCENTAGE)
       end
 
       @sass_script_parser = Class.new(Sass::Script::CssParser)

data/lib/sass/selector.rb

@@ -87,6 +87,10 @@ module Sass
         @name = name
       end
 
+      def unique?
+        true
+      end
+
       # @see Selector#to_s
       def to_s(opts = {})
         "#" + @name

data/lib/sass/selector/abstract_sequence.rb

@@ -59,12 +59,11 @@ module Sass
       end
       alias_method :==, :eql?
 
-      # Whether or not this selector sequence contains a placeholder selector.
-      # Checks recursively.
-      def has_placeholder?
-        @has_placeholder ||= members.any? do |m|
-          next m.has_placeholder? if m.is_a?(AbstractSequence)
-          next m.selector && m.selector.has_placeholder? if m.is_a?(Pseudo)
+      # Whether or not this selector should be hidden due to containing a
+      # placeholder.
+      def invisible?
+        @invisible ||= members.any? do |m|
+          next m.invisible? if m.is_a?(AbstractSequence) || m.is_a?(Pseudo)
           m.is_a?(Placeholder)
         end
       end
@@ -73,6 +72,8 @@ module Sass
       #
       # @param opts [Hash] rendering options.
       # @option opts [Symbol] :style The css rendering style.
+      # @option placeholders [Boolean] :placeholders
+      #   Whether to include placeholder selectors. Defaults to `true`.
       # @return [String]
       def to_s(opts = {})
         Sass::Util.abstract(self)

data/lib/sass/selector/comma_sequence.rb

@@ -119,7 +119,8 @@ module Sass
           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.
+Consider "@extend #{sseq.members.join(', ')}" instead.
+See http://bit.ly/ExtendCompound for details.
 WARNING
           end
 
@@ -129,7 +130,7 @@ WARNING
             end
 
             extends[sel] = Sass::Tree::Visitors::Cssize::Extend.new(
-              member, sel, extend_node, parent_directives, :not_found)
+              member, sel, extend_node, parent_directives, false)
           end
         end
       end
@@ -158,8 +159,8 @@ WARNING
           Sass::Script::Value::List.new(seq.members.map do |component|
             next if component == "\n"
             Sass::Script::Value::String.new(component.to_s)
-          end.compact, :space)
-        end, :comma)
+          end.compact, separator: :space)
+        end, separator: :comma)
       end
 
       # Returns a string representation of the sequence.
@@ -172,7 +173,10 @@ WARNING
 
       # @see AbstractSequence#to_s
       def to_s(opts = {})
-        @members.map {|m| m.to_s(opts)}.
+        @members.map do |m|
+          next if opts[:placeholder] == false && m.invisible?
+          m.to_s(opts)
+        end.compact.
           join(opts[:style] == :compressed ? "," : ", ").
           gsub(", \n", ",\n")
       end

data/lib/sass/selector/pseudo.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Sass
   module Selector
     # A pseudoclass (e.g. `:visited`) or pseudoelement (e.g. `::first-line`)
@@ -48,6 +49,18 @@ module Sass
         @selector = selector
       end
 
+      def unique?
+        type == :class && normalized_name == 'root'
+      end
+
+      # Whether or not this selector should be hidden due to containing a
+      # placeholder.
+      def invisible?
+        # :not() is a special case—if you eliminate all the placeholders from
+        # it, it should match anything.
+        name != 'not' && @selector && @selector.members.all? {|s| s.invisible?}
+      end
+
       # Returns a copy of this with \{#selector} set to \{#new\_selector}.
       #
       # @param new_selector [CommaSequence]
@@ -77,7 +90,7 @@ module Sass
               # more complex cases that likely aren't worth the pain.
               next [] unless sel.name == name && sel.arg == arg
               sel.selector.members
-            when 'has', 'host', 'host-context'
+            when 'has', 'host', 'host-context', 'slotted'
               # We can't expand nested selectors here, because each layer adds an
               # additional layer of semantics. For example, `:has(:has(img))`
               # doesn't match `<div><img></div>` but `:has(img)` does.
@@ -114,10 +127,14 @@ module Sass
 
       # @see Selector#to_s
       def to_s(opts = {})
+        # :not() is a special case, because :not(<nothing>) should match
+        # everything.
+        return '' if name == 'not' && @selector && @selector.members.all? {|m| m.invisible?}
+
         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 << ")"
@@ -161,7 +178,7 @@ module Sass
             their_seq = Sequence.new(parents + [their_sseq])
             our_seq.superselector?(their_seq)
           end
-        when 'has', 'host', 'host-context'
+        when 'has', 'host', 'host-context', 'slotted'
           # Like :matches, :has (et al) can be a superselector of another
           # selector if its constituent selectors are a superset of those of
           # another :has in the other selector. However, the :matches other case

data/lib/sass/selector/sequence.rb

@@ -66,10 +66,14 @@ module Sass
           next [sseq_or_op] unless sseq_or_op.is_a?(SimpleSequence)
           sseq_or_op.resolve_parent_refs(super_cseq).members
         end).map do |path|
-          Sequence.new(path.map do |seq_or_op|
+          path_members = path.map do |seq_or_op|
             next seq_or_op unless seq_or_op.is_a?(Sequence)
             seq_or_op.members
-          end.flatten)
+          end
+          if path_members.length == 2 && path_members[1][0] == "\n"
+            path_members[0].unshift path_members[1].shift
+          end
+          Sequence.new(path_members.flatten)
         end)
       end
 
@@ -115,7 +119,7 @@ module Sass
           # specificity greater than or equal to that of the original selector.
           # In order to ensure that, we record the original selector's
           # (`extended.first`) original specificity.
-          extended.first.add_sources!([self]) if original && !has_placeholder?
+          extended.first.add_sources!([self]) if original && !invisible?
 
           extended.map {|seq| seq.members}
         end
@@ -283,6 +287,9 @@ module Sass
           next unless s1.first.is_a?(SimpleSequence) && s2.first.is_a?(SimpleSequence)
           next s2 if parent_superselector?(s1, s2)
           next s1 if parent_superselector?(s2, s1)
+          next unless must_unify?(s1, s2)
+          next unless (unified = Sequence.new(s1).unify(Sequence.new(s2)))
+          unified.members.first.members if unified.members.length == 1
         end
 
         diff = [[init]]
@@ -337,8 +344,6 @@ module Sass
       #   be nil. Otherwise, this will contained the merged selector. Array
       #   elements are [Sass::Util#paths]-style options; conceptually, an "or"
       #   of multiple selectors.
-      # @comment
-      #   rubocop:disable MethodLength
       def merge_final_ops(seq1, seq2, res = [])
         ops1, ops2 = [], []
         ops1 << seq1.pop while seq1.last.is_a?(String)
@@ -420,8 +425,6 @@ module Sass
           return merge_final_ops(seq1, seq2, res)
         end
       end
-      # @comment
-      #   rubocop:enable MethodLength
 
       # Takes initial subsequences of `seq1` and `seq2` and returns all
       # orderings of those subsequences. The initial subsequences are determined
@@ -494,7 +497,7 @@ module Sass
         return if seq1.size > seq2.size
         return seq1.first.superselector?(seq2.last, seq2[0...-1]) if seq1.size == 1
 
-        _, si = Sass::Util.enum_with_index(seq2).find do |e, i|
+        _, si = seq2.each_with_index.find do |e, i|
           return if i == seq2.size - 1
           next if e.is_a?(String)
           seq1.first.superselector?(e, seq2[0...i])
@@ -537,6 +540,30 @@ module Sass
         _superselector?(seq1 + [base], seq2 + [base])
       end
 
+      # Returns whether two selectors must be unified to produce a valid
+      # combined selector. This is true when both selectors contain the same
+      # unique simple selector such as an id.
+      #
+      # @param seq1 [Array<SimpleSequence or String>]
+      # @param seq2 [Array<SimpleSequence or String>]
+      # @return [Boolean]
+      def must_unify?(seq1, seq2)
+        unique_selectors = seq1.map do |sseq|
+          next [] if sseq.is_a?(String)
+          sseq.members.select {|sel| sel.unique?}
+        end.flatten.to_set
+
+        return false if unique_selectors.empty?
+
+        seq2.any? do |sseq|
+          next false if sseq.is_a?(String)
+          sseq.members.any? do |sel|
+            next unless sel.unique?
+            unique_selectors.include?(sel)
+          end
+        end
+      end
+
       # Removes redundant selectors from between multiple lists of
       # selectors. This takes a list of lists of selector sequences;
       # each individual list is assumed to have no redundancy within
@@ -597,8 +624,6 @@ module Sass
         other.members.reject {|m| m == "\n"}.eql?(members.reject {|m| m == "\n"})
       end
 
-      private
-
       def path_has_two_subjects?(path)
         subject = false
         path.each do |sseq_or_op|

data/lib/sass/selector/simple.rb

@@ -14,6 +14,14 @@ module Sass
       # @return [String, nil]
       attr_accessor :filename
 
+      # Whether only one instance of this simple selector is allowed in a given
+      # complex selector.
+      #
+      # @return [Boolean]
+      def unique?
+        false
+      end
+
       # @see #to_s
       #
       # @return [String]
@@ -74,9 +82,8 @@ module Sass
       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)
-          _, i = sels_with_ix.find {|sel, _| sel.is_a?(Pseudo)}
+          _, i = sels.each_with_index.find {|sel, _| sel.is_a?(Pseudo)}
         end
         return sels + [self] unless i
         sels[0...i] + [self] + sels[i..-1]