sass 3.4.0 → 3.4.25

data/lib/sass/selector/pseudo.rb

@@ -9,7 +9,7 @@ module Sass
       # selectors.
       #
       # @return [Set<String>]
-      ACTUALLY_ELEMENTS = %w[after before first-line first-letter].to_set
+      ACTUALLY_ELEMENTS = %w(after before first-line first-letter).to_set
 
       # Like \{#type}, but returns the type of selector this looks like, rather
       # than the type it is semantically. This only differs from type for
@@ -51,40 +51,50 @@ module Sass
       # Returns a copy of this with \{#selector} set to \{#new\_selector}.
       #
       # @param new_selector [CommaSequence]
-      # @return [CommaSequence]
+      # @return [Array<Simple>]
       def with_selector(new_selector)
-        Pseudo.new(syntactic_type, name, arg, CommaSequence.new(new_selector.members.map do |seq|
-          next seq unless seq.members.length == 1
-          sseq = seq.members.first
-          next seq unless sseq.is_a?(SimpleSequence) && sseq.members.length == 1
-          sel = sseq.members.first
-          next seq unless sel.is_a?(Pseudo) && sel.selector
+        result = Pseudo.new(syntactic_type, name, arg,
+          CommaSequence.new(new_selector.members.map do |seq|
+            next seq unless seq.members.length == 1
+            sseq = seq.members.first
+            next seq unless sseq.is_a?(SimpleSequence) && sseq.members.length == 1
+            sel = sseq.members.first
+            next seq unless sel.is_a?(Pseudo) && sel.selector
 
-          case normalized_name
-          when 'not'
-            # In theory, if there's a nested :not its contents should be
-            # unified with the return value. For example, if :not(.foo)
-            # extends .bar, :not(.bar) should become .foo:not(.bar). However,
-            # this is a narrow edge case and supporting it properly would make
-            # this code and the code calling it a lot more complicated, so
-            # it's not supported for now.
-            next [] unless sel.normalized_name == 'matches'
-            sel.selector.members
-          when 'matches', 'any', 'current', 'nth-child', 'nth-last-child'
-            # As above, we could theoretically support :not within :matches, but
-            # doing so would require this method and its callers to handle much
-            # 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'
-            # 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.
-            sel
-          else
-            []
-          end
-        end.flatten))
+            case normalized_name
+            when 'not'
+              # In theory, if there's a nested :not its contents should be
+              # unified with the return value. For example, if :not(.foo)
+              # extends .bar, :not(.bar) should become .foo:not(.bar). However,
+              # this is a narrow edge case and supporting it properly would make
+              # this code and the code calling it a lot more complicated, so
+              # it's not supported for now.
+              next [] unless sel.normalized_name == 'matches'
+              sel.selector.members
+            when 'matches', 'any', 'current', 'nth-child', 'nth-last-child'
+              # As above, we could theoretically support :not within :matches, but
+              # doing so would require this method and its callers to handle much
+              # 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'
+              # 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.
+              sel
+            else
+              []
+            end
+          end.flatten))
+
+        # Older browsers support :not but only with a single complex selector.
+        # In order to support those browsers, we break up the contents of a :not
+        # unless it originally contained a selector list.
+        return [result] unless normalized_name == 'not'
+        return [result] if selector.members.length > 1
+        result.selector.members.map do |seq|
+          Pseudo.new(syntactic_type, name, arg, CommaSequence.new([seq]))
+        end
       end
 
       # The type of the selector. `:class` if this is a pseudoclass selector,
@@ -103,13 +113,13 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         res = (syntactic_type == :class ? ":" : "::") + @name
         if @arg || @selector
           res << "("
           res << @arg.strip if @arg
           res << " " if @arg && @selector
-          res << @selector.to_s if @selector
+          res << @selector.to_s(opts) if @selector
           res << ")"
         end
         res

data/lib/sass/selector/sequence.rb

@@ -6,11 +6,11 @@ module Sass
       # Sets the line of the Sass template on which this selector was declared.
       # This also sets the line for all child selectors.
       #
-      # @param line [Fixnum]
-      # @return [Fixnum]
+      # @param line [Integer]
+      # @return [Integer]
       def line=(line)
         members.each {|m| m.line = line if m.is_a?(SimpleSequence)}
-        line
+        @line = line
       end
 
       # Sets the name of the file in which this selector was declared,
@@ -52,9 +52,7 @@ module Sass
       def resolve_parent_refs(super_cseq, implicit_parent)
         members = @members.dup
         nl = (members.first == "\n" && members.shift)
-        contains_parent_ref = members.any? do |seq_or_op|
-          seq_or_op.is_a?(SimpleSequence) && seq_or_op.members.first.is_a?(Parent)
-        end
+        contains_parent_ref = contains_parent_ref?
         return CommaSequence.new([self]) if !implicit_parent && !contains_parent_ref
 
         unless contains_parent_ref
@@ -75,6 +73,19 @@ module Sass
         end)
       end
 
+      # Returns whether there's a {Parent} selector anywhere in this sequence.
+      #
+      # @return [Boolean]
+      def contains_parent_ref?
+        members.any? do |sseq_or_op|
+          next false unless sseq_or_op.is_a?(SimpleSequence)
+          next true if sseq_or_op.members.first.is_a?(Parent)
+          sseq_or_op.members.any? do |sel|
+            sel.is_a?(Pseudo) && sel.selector && sel.selector.contains_parent_ref?
+          end
+        end
+      end
+
       # Non-destructively extends this selector with the extensions specified in a hash
       # (which should come from {Sass::Tree::Visitors::Cssize}).
       #
@@ -146,8 +157,8 @@ module Sass
       end
 
       # @see AbstractSequence#to_s
-      def to_s
-        @members.join(" ").gsub(/ ?\n ?/, "\n")
+      def to_s(opts = {})
+        @members.map {|m| m.is_a?(String) ? m : m.to_s(opts)}.join(" ").gsub(/ ?\n ?/, "\n")
       end
 
       # Returns a string representation of the sequence.
@@ -217,11 +228,11 @@ module Sass
           next if current.empty?
           current = current.dup
           last_current = [current.pop]
-          prefixes = Sass::Util.flatten(prefixes.map do |prefix|
+          prefixes = prefixes.map do |prefix|
             sub = subweave(prefix, current)
             next [] unless sub
             sub.map {|seqs| seqs + last_current}
-          end, 1)
+          end.flatten(1)
         end
         prefixes
       end
@@ -249,10 +260,22 @@ module Sass
         return [seq1] if seq2.empty?
 
         seq1, seq2 = seq1.dup, seq2.dup
-        init = merge_initial_ops(seq1, seq2)
-        return unless init
-        fin = merge_final_ops(seq1, seq2)
-        return unless fin
+        return unless (init = merge_initial_ops(seq1, seq2))
+        return unless (fin = merge_final_ops(seq1, seq2))
+
+        # Make sure there's only one root selector in the output.
+        root1 = has_root?(seq1.first) && seq1.shift
+        root2 = has_root?(seq2.first) && seq2.shift
+        if root1 && root2
+          return unless (root = root1.unify(root2))
+          seq1.unshift root
+          seq2.unshift root
+        elsif root1
+          seq2.unshift root1
+        elsif root2
+          seq1.unshift root2
+        end
+
         seq1 = group_selectors(seq1)
         seq2 = group_selectors(seq2)
         lcs = Sass::Util.lcs(seq2, seq1) do |s1, s2|
@@ -263,6 +286,7 @@ module Sass
         end
 
         diff = [[init]]
+
         until lcs.empty?
           diff << chunks(seq1, seq2) {|s| parent_superselector?(s.first, lcs.first)} << [lcs.shift]
           seq1.shift
@@ -371,10 +395,10 @@ module Sass
                 ([merged, '+'] if merged)
               ].compact
             end
-          elsif op1 == '>' && %w[~ +].include?(op2)
+          elsif op1 == '>' && %w(~ +).include?(op2)
             res.unshift sel2, op2
             seq1.push sel1, op1
-          elsif op2 == '>' && %w[~ +].include?(op1)
+          elsif op2 == '>' && %w(~ +).include?(op1)
             res.unshift sel1, op1
             seq2.push sel2, op2
           elsif op1 == op2
@@ -479,8 +503,15 @@ module Sass
 
         if seq1[1].is_a?(String)
           return unless seq2[si + 1].is_a?(String)
+
           # .foo ~ .bar is a superselector of .foo + .bar
           return unless seq1[1] == "~" ? seq2[si + 1] != ">" : seq1[1] == seq2[si + 1]
+
+          # .foo > .baz is not a superselector of .foo > .bar > .baz or .foo >
+          # .bar .baz, despite the fact that .baz is a superselector of .bar >
+          # .baz and .bar .baz. Same goes for + and ~.
+          return if seq1.length == 3 && seq2.length > 3
+
           return _superselector?(seq1[2..-1], seq2[si + 2..-1])
         elsif seq2[si + 1].is_a?(String)
           return unless seq2[si + 1] == ">"
@@ -520,7 +551,7 @@ module Sass
       def trim(seqses)
         # Avoid truly horrific quadratic behavior. TODO: I think there
         # may be a way to get perfect trimming without going quadratic.
-        return Sass::Util.flatten(seqses, 1) if seqses.size > 100
+        return seqses.flatten(1) if seqses.size > 100
 
         # Keep the results in a separate array so we can be sure we aren't
         # comparing against an already-trimmed selector. This ensures that two
@@ -555,7 +586,7 @@ module Sass
             end
           end
         end
-        Sass::Util.flatten(result, 1)
+        result.flatten(1)
       end
 
       def _hash
@@ -595,6 +626,11 @@ module Sass
           "(#{choices.join ', '})"
         end.join ' '
       end
+
+      def has_root?(sseq)
+        sseq.is_a?(SimpleSequence) &&
+          sseq.members.any? {|sel| sel.is_a?(Pseudo) && sel.normalized_name == "root"}
+      end
     end
   end
 end

data/lib/sass/selector/simple.rb

@@ -5,7 +5,7 @@ module Sass
     class Simple
       # The line of the Sass template on which this selector was declared.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       attr_accessor :line
 
       # The name of the file in which this selector was declared,
@@ -23,8 +23,10 @@ module Sass
 
       # Returns the selector string.
       #
+      # @param opts [Hash] rendering options.
+      # @option opts [Symbol] :style The css rendering style.
       # @return [String]
-      def to_s
+      def to_s(opts = {})
         Sass::Util.abstract(self)
       end
 
@@ -34,7 +36,7 @@ module Sass
       # so if that contains information irrelevant to the identity of the selector,
       # this should be overridden.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def hash
         @_hash ||= equality_key.hash
       end
@@ -70,14 +72,12 @@ 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)
-        _, i =
-          if is_a?(Pseudo)
-            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && (sels.last.type == :element)}
-          else
-            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo)}
-          end
+        if !is_a?(Pseudo) || (sels.last.is_a?(Pseudo) && sels.last.type == :element)
+          _, i = sels_with_ix.find {|sel, _| sel.is_a?(Pseudo)}
+        end
         return sels + [self] unless i
         sels[0...i] + [self] + sels[i..-1]
       end
@@ -107,10 +107,10 @@ module Sass
       #   could be found at all.
       #   If the second value is `false`, the first should be ignored.
       def unify_namespaces(ns1, ns2)
-        return nil, false unless ns1 == ns2 || ns1.nil? || ns1 == '*' || ns2.nil? || ns2 == '*'
         return ns2, true if ns1 == '*'
         return ns1, true if ns2 == '*'
-        [ns1 || ns2, true]
+        return nil, false unless ns1 == ns2
+        [ns1, true]
       end
     end
   end

data/lib/sass/selector/simple_sequence.rb

@@ -86,9 +86,14 @@ module Sass
       # @return [CommaSequence] This selector, with parent references resolved
       # @raise [Sass::SyntaxError] If a parent selector is invalid
       def resolve_parent_refs(super_cseq)
+        resolved_members = @members.map do |sel|
+          next sel unless sel.is_a?(Pseudo) && sel.selector
+          sel.with_selector(sel.selector.resolve_parent_refs(super_cseq, false))
+        end.flatten
+
         # Parent selector only appears as the first selector in the sequence
-        unless (parent = @members.first).is_a?(Parent)
-          return CommaSequence.new([Sequence.new([self])])
+        unless (parent = resolved_members.first).is_a?(Parent)
+          return CommaSequence.new([Sequence.new([SimpleSequence.new(resolved_members, subject?)])])
         end
 
         return super_cseq if @members.size == 1 && parent.suffix.nil?
@@ -128,9 +133,9 @@ module Sass
           end
 
           Sequence.new(members[0...-1] +
-            [SimpleSequence.new(parent_sub + @members[1..-1], subject?)] +
+            [SimpleSequence.new(parent_sub + resolved_members[1..-1], subject?)] +
             [newline].compact)
-        end)
+          end)
       end
 
       # Non-destructively extends this selector with the extensions specified in a hash
@@ -153,17 +158,31 @@ module Sass
         seen_with_pseudo_selectors = seen.dup
 
         modified_original = false
-        members = Sass::Util.enum_with_index(self.members).map do |sel, i|
+        members = self.members.map do |sel|
           next sel unless sel.is_a?(Pseudo) && sel.selector
           next sel if seen.include?([sel])
-          extended = sel.selector.do_extend(extends, parent_directives, replace, seen, !:original)
+          extended = sel.selector.do_extend(extends, parent_directives, replace, seen, false)
           next sel if extended == sel.selector
           extended.members.reject! {|seq| seq.has_placeholder?}
+
+          # For `:not()`, we usually want to get rid of any complex
+          # selectors because that will cause the selector to fail to
+          # parse on all browsers at time of writing. We can keep them
+          # if either the original selector had a complex selector, or
+          # the result of extending has only complex selectors,
+          # because either way we aren't breaking anything that isn't
+          # already broken.
+          if sel.normalized_name == 'not' &&
+              (sel.selector.members.none? {|seq| seq.members.length > 1} &&
+               extended.members.any? {|seq| seq.members.length == 1})
+            extended.members.reject! {|seq| seq.members.length > 1}
+          end
+
           modified_original = true
           result = sel.with_selector(extended)
-          seen_with_pseudo_selectors << [result]
+          result.each {|new_sel| seen_with_pseudo_selectors << [new_sel]}
           result
-        end
+        end.flatten
 
         groups = Sass::Util.group_by_to_a(extends[members.to_set]) {|ex| ex.extender}
         groups.map! do |seq, group|
@@ -185,7 +204,7 @@ module Sass
         groups.map! do |sels, seq|
           next [] if seen.include?(sels)
           seq.do_extend(
-            extends, parent_directives, !:replace, seen_with_pseudo_selectors + [sels], !:original)
+            extends, parent_directives, false, seen_with_pseudo_selectors + [sels], false)
         end
         groups.flatten!
 
@@ -241,7 +260,7 @@ module Sass
 
         # Some psuedo-selectors can be subselectors of non-pseudo selectors.
         # Pull those out here so we can efficiently check against them below.
-        their_subselector_pseudos = %w[matches any nth-child nth-last-child].
+        their_subselector_pseudos = %w(matches any nth-child nth-last-child).
           map {|name| their_spcs[name] || []}.flatten
 
         # If `self`'s non-pseudo simple selectors aren't a subset of `their_sseq`'s,
@@ -260,14 +279,14 @@ module Sass
           end
         end
 
-        our_spcs.all? do |name, pseudos|
+        our_spcs.all? do |_name, pseudos|
           pseudos.all? {|pseudo| pseudo.superselector?(their_sseq, parents)}
         end
       end
 
       # @see Simple#to_s
-      def to_s
-        res = @members.join
+      def to_s(opts = {})
+        res = @members.map {|m| m.to_s(opts)}.join
         res << '!' if subject?
         res
       end
@@ -313,12 +332,12 @@ MESSAGE
       end
 
       def _hash
-        [base, Sass::Util.set_hash(rest)].hash
+        [base, rest.hash].hash
       end
 
       def _eql?(other)
         other.base.eql?(base) && other.pseudo_elements == pseudo_elements &&
-          Sass::Util.set_eql?(other.rest, rest) && other.subject? == subject?
+          other.rest.eql?(rest) && other.subject? == subject?
       end
     end
   end

data/lib/sass/selector.rb

@@ -39,7 +39,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         "&" + (@suffix || '')
       end
 
@@ -65,7 +65,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         "." + @name
       end
 
@@ -88,7 +88,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         "#" + @name
       end
 
@@ -123,7 +123,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         "%" + @name
       end
 
@@ -147,7 +147,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         @namespace ? "#{@namespace}|*" : "*"
       end
 
@@ -219,7 +219,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         @namespace ? "#{@namespace}|#{@name}" : @name
       end
 
@@ -296,10 +296,7 @@ module Sass
       # @param operator [String] The matching operator, e.g. `"="` or `"^="`
       # @param value [String] See \{#value}
       # @param flags [String] See \{#flags}
-      # @comment
-      #   rubocop:disable ParameterLists
       def initialize(name, namespace, operator, value, flags)
-        # rubocop:enable ParameterLists
         @name = name
         @namespace = namespace
         @operator = operator
@@ -308,7 +305,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         res = "["
         res << @namespace << "|" if @namespace
         res << @name

data/lib/sass/shared.rb

@@ -31,7 +31,7 @@ module Sass
     #   A `Fixnum` in 1.8, a `String` in 1.9
     # @param finish [Character] The character closing the balanced pair.
     #   A `Fixnum` in 1.8, a `String` in 1.9
-    # @param count [Fixnum] The number of opening characters matched
+    # @param count [Integer] The number of opening characters matched
     #   before calling this method
     # @return [(String, String)] The string matched within the balanced pair
     #   and the rest of the string.

data/lib/sass/source/map.rb

@@ -37,7 +37,7 @@ module Sass::Source
 
     # Shifts all output source ranges forward one or more lines.
     #
-    # @param delta [Fixnum] The number of lines to shift the ranges forward.
+    # @param delta [Integer] The number of lines to shift the ranges forward.
     def shift_output_lines(delta)
       return if delta == 0
       @data.each do |m|
@@ -49,7 +49,7 @@ module Sass::Source
     # Shifts any output source ranges that lie on the first line forward one or
     # more characters on that line.
     #
-    # @param delta [Fixnum] The number of characters to shift the ranges
+    # @param delta [Integer] The number of characters to shift the ranges
     #   forward.
     def shift_output_offsets(delta)
       return if delta == 0
@@ -95,7 +95,8 @@ module Sass::Source
       end
       css_path &&= Sass::Util.pathname(Sass::Util.absolute_path(css_path))
       sourcemap_path &&= Sass::Util.pathname(Sass::Util.absolute_path(sourcemap_path))
-      css_uri ||= Sass::Util.file_uri_from_path(css_path.relative_path_from(sourcemap_path.dirname))
+      css_uri ||= Sass::Util.file_uri_from_path(
+        Sass::Util.relative_path_from(css_path, sourcemap_path.dirname))
 
       result = "{\n"
       write_json_field(result, "version", 3, true)
@@ -117,12 +118,14 @@ module Sass::Source
       @data.each do |m|
         file, importer = m.input.file, m.input.importer
 
+        next unless importer
+
         if options[:type] == :inline
           source_uri = file
         else
           sourcemap_dir = sourcemap_path && sourcemap_path.dirname.to_s
           sourcemap_dir = nil if options[:type] == :file
-          source_uri = importer && importer.public_url(file, sourcemap_dir)
+          source_uri = importer.public_url(file, sourcemap_dir)
           next unless source_uri
         end
 

data/lib/sass/source/position.rb

@@ -2,17 +2,17 @@ module Sass::Source
   class Position
     # The one-based line of the document associated with the position.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     attr_accessor :line
 
     # The one-based offset in the line of the document associated with the
     # position.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     attr_accessor :offset
 
-    # @param line [Fixnum] The source line
-    # @param offset [Fixnum] The source offset
+    # @param line [Integer] The source line
+    # @param offset [Integer] The source offset
     def initialize(line, offset)
       @line = line
       @offset = offset

data/lib/sass/stack.rb

@@ -101,8 +101,8 @@ module Sass
     def to_s
       Sass::Util.enum_with_index(Sass::Util.enum_cons(frames.reverse + [nil], 2)).
           map do |(frame, caller), i|
-        "#{i == 0 ? "on" : "from"} line #{frame.line}" +
-          " of #{frame.filename || "an unknown file"}" +
+        "#{i == 0 ? 'on' : 'from'} line #{frame.line}" +
+          " of #{frame.filename || 'an unknown file'}" +
           (caller && caller.name ? ", in `#{caller.name}'" : "")
       end.join("\n")
     end

data/lib/sass/supports.rb

@@ -58,11 +58,11 @@ module Sass::Supports
     end
 
     def to_css
-      "#{left_parens @left.to_css} #{op} #{right_parens @right.to_css}"
+      "#{parens @left, @left.to_css} #{op} #{parens @right, @right.to_css}"
     end
 
     def to_src(options)
-      "#{left_parens @left.to_src(options)} #{op} #{right_parens @right.to_src(options)}"
+      "#{parens @left, @left.to_src(options)} #{op} #{parens @right, @right.to_src(options)}"
     end
 
     def deep_copy
@@ -79,14 +79,12 @@ module Sass::Supports
 
     private
 
-    def left_parens(str)
-      return "(#{str})" if @left.is_a?(Negation)
-      str
-    end
-
-    def right_parens(str)
-      return "(#{str})" if @right.is_a?(Negation) || @right.is_a?(Operator)
-      str
+    def parens(condition, str)
+      if condition.is_a?(Negation) || (condition.is_a?(Operator) && condition.op != op)
+        return "(#{str})"
+      else
+        return str
+      end
     end
   end
 

data/lib/sass/tree/comment_node.rb

@@ -59,7 +59,7 @@ module Sass::Tree
 
     # Returns the number of lines in the comment.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def lines
       @value.inject(0) do |s, e|
         next s + e.count("\n") if e.is_a?(String)