sass 3.7.4 → 4.0.0.alpha.1

data/lib/sass/selector/comma_sequence.rb

@@ -2,8 +2,6 @@ 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.
       #
@@ -98,11 +96,8 @@ 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 = [],
-          allow_compound_target = false)
+      def populate_extends(extends, extendee, extend_node = nil, parent_directives = [])
         extendee.members.each do |seq|
           if seq.members.size > 1
             raise Sass::SyntaxError.new("Can't extend #{seq}: can't extend nested selectors")
@@ -116,21 +111,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.
-Consider "@extend #{sseq.members.join(', ')}" instead.
-See http://bit.ly/ExtendCompound 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")
             end
 
             extends[sel] = Sass::Tree::Visitors::Cssize::Extend.new(
-              member, sel, extend_node, parent_directives, false)
+              member, sel, extend_node, parent_directives, :not_found)
           end
         end
       end
@@ -159,8 +146,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, separator: :space)
-        end, separator: :comma)
+          end.compact, :space)
+        end, :comma)
       end
 
       # Returns a string representation of the sequence.
@@ -172,13 +159,8 @@ WARNING
       end
 
       # @see AbstractSequence#to_s
-      def 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")
+      def to_s
+        @members.join(", ").gsub(", \n", ",\n")
       end
 
       private

data/lib/sass/selector/pseudo.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 module Sass
   module Selector
     # A pseudoclass (e.g. `:visited`) or pseudoelement (e.g. `::first-line`)
@@ -10,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
@@ -53,14 +52,6 @@ module Sass
         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]
@@ -90,7 +81,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', 'slotted'
+            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.
@@ -126,17 +117,13 @@ module Sass
       end
 
       # @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?}
-
+      def to_s
         res = (syntactic_type == :class ? ":" : "::") + @name
         if @arg || @selector
           res << "("
-          res << Sass::Util.strip_except_escapes(@arg) if @arg
+          res << @arg.strip if @arg
           res << " " if @arg && @selector
-          res << @selector.to_s(opts) if @selector
+          res << @selector.to_s if @selector
           res << ")"
         end
         res
@@ -178,7 +165,7 @@ module Sass
             their_seq = Sequence.new(parents + [their_sseq])
             our_seq.superselector?(their_seq)
           end
-        when 'has', 'host', 'host-context', 'slotted'
+        when 'has', 'host', 'host-context'
           # 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

@@ -6,8 +6,8 @@ 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 [Integer]
-      # @return [Integer]
+      # @param line [Fixnum]
+      # @return [Fixnum]
       def line=(line)
         members.each {|m| m.line = line if m.is_a?(SimpleSequence)}
         @line = line
@@ -66,14 +66,10 @@ 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|
-          path_members = path.map do |seq_or_op|
+          Sequence.new(path.map do |seq_or_op|
             next seq_or_op unless seq_or_op.is_a?(Sequence)
             seq_or_op.members
-          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.flatten)
         end)
       end
 
@@ -119,7 +115,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 && !invisible?
+          extended.first.add_sources!([self]) if original && !has_placeholder?
 
           extended.map {|seq| seq.members}
         end
@@ -161,8 +157,8 @@ module Sass
       end
 
       # @see AbstractSequence#to_s
-      def to_s(opts = {})
-        @members.map {|m| m.is_a?(String) ? m : m.to_s(opts)}.join(" ").gsub(/ ?\n ?/, "\n")
+      def to_s
+        @members.join(" ").gsub(/ ?\n ?/, "\n")
       end
 
       # Returns a string representation of the sequence.
@@ -344,6 +340,8 @@ 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)
@@ -400,10 +398,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
@@ -425,6 +423,8 @@ 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
@@ -497,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 = seq2.each_with_index.find do |e, i|
+        _, si = Sass::Util.enum_with_index(seq2).find do |e, i|
           return if i == seq2.size - 1
           next if e.is_a?(String)
           seq1.first.superselector?(e, seq2[0...i])
@@ -624,6 +624,8 @@ 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

@@ -5,7 +5,7 @@ module Sass
     class Simple
       # The line of the Sass template on which this selector was declared.
       #
-      # @return [Integer]
+      # @return [Fixnum]
       attr_accessor :line
 
       # The name of the file in which this selector was declared,
@@ -31,10 +31,8 @@ module Sass
 
       # Returns the selector string.
       #
-      # @param opts [Hash] rendering options.
-      # @option opts [Symbol] :style The css rendering style.
       # @return [String]
-      def to_s(opts = {})
+      def to_s
         Sass::Util.abstract(self)
       end
 
@@ -44,7 +42,7 @@ module Sass
       # so if that contains information irrelevant to the identity of the selector,
       # this should be overridden.
       #
-      # @return [Integer]
+      # @return [Fixnum]
       def hash
         @_hash ||= equality_key.hash
       end
@@ -80,10 +78,10 @@ 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)
-          _, i = sels.each_with_index.find {|sel, _| sel.is_a?(Pseudo)}
+          _, i = sels_with_ix.find {|sel, _| sel.is_a?(Pseudo)}
         end
         return sels + [self] unless i
         sels[0...i] + [self] + sels[i..-1]
@@ -114,10 +112,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 == '*'
-        return nil, false unless ns1 == ns2
-        [ns1, true]
+        [ns1 || ns2, true]
       end
     end
   end

data/lib/sass/selector/simple_sequence.rb

@@ -88,7 +88,7 @@ module Sass
       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))
+          sel.with_selector(sel.selector.resolve_parent_refs(super_cseq, !:implicit_parent))
         end.flatten
 
         # Parent selector only appears as the first selector in the sequence
@@ -158,12 +158,12 @@ module Sass
         seen_with_pseudo_selectors = seen.dup
 
         modified_original = false
-        members = self.members.map do |sel|
+        members = Sass::Util.enum_with_index(self.members).map do |sel, i|
           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, false)
+          extended = sel.selector.do_extend(extends, parent_directives, replace, seen, !:original)
           next sel if extended == sel.selector
-          extended.members.reject! {|seq| seq.invisible?}
+          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
@@ -184,16 +184,17 @@ module Sass
           result
         end.flatten
 
-        groups = extends[members.to_set].group_by {|ex| ex.extender}.to_a
+        groups = Sass::Util.group_by_to_a(extends[members.to_set]) {|ex| ex.extender}
         groups.map! do |seq, group|
           sels = group.map {|e| e.target}.flatten
           # If A {@extend B} and C {...},
           # seq is A, sels is B, and self is C
 
           self_without_sel = Sass::Util.array_minus(members, sels)
-          group.each {|e| e.success = true}
+          group.each {|e| e.result = :failed_to_unify unless e.result == :succeeded}
           unified = seq.members.last.unify(SimpleSequence.new(self_without_sel, subject?))
           next unless unified
+          group.each {|e| e.result = :succeeded}
           group.each {|e| check_directives_match!(e, parent_directives)}
           new_seq = Sequence.new(seq.members[0...-1] + [unified])
           new_seq.add_sources!(sources + [seq])
@@ -203,7 +204,7 @@ module Sass
         groups.map! do |sels, seq|
           next [] if seen.include?(sels)
           seq.do_extend(
-            extends, parent_directives, false, seen_with_pseudo_selectors + [sels], false)
+            extends, parent_directives, !:replace, seen_with_pseudo_selectors + [sels], !:original)
         end
         groups.flatten!
 
@@ -259,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,
@@ -278,19 +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(opts = {})
-        res = @members.map {|m| m.to_s(opts)}.join
-
-        # :not(%foo) may resolve to the empty string, but it should match every
-        # selector so we replace it with "*".
-        res = '*' if res.empty?
-
+      def to_s
+        res = @members.join
         res << '!' if subject?
         res
       end

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 [Integer] The number of opening characters matched
+    # @param count [Fixnum] 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 [Integer] The number of lines to shift the ranges forward.
+    # @param delta [Fixnum] 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 [Integer] The number of characters to shift the ranges
+    # @param delta [Fixnum] The number of characters to shift the ranges
     #   forward.
     def shift_output_offsets(delta)
       return if delta == 0
@@ -84,6 +84,8 @@ module Sass::Source
     # @return [String] The JSON string.
     # @raise [ArgumentError] If neither `:css_uri` nor `:css_path` and
     #   `:sourcemap_path` are specified.
+    # @comment
+    #   rubocop:disable MethodLength
     def to_json(options)
       css_uri, css_path, sourcemap_path =
         options[:css_uri], options[:css_path], options[:sourcemap_path]
@@ -91,8 +93,8 @@ module Sass::Source
         raise ArgumentError.new("Sass::Source::Map#to_json requires either " \
           "the :css_uri option or both the :css_path and :soucemap_path options.")
       end
-      css_path &&= Sass::Util.pathname(File.absolute_path(css_path))
-      sourcemap_path &&= Sass::Util.pathname(File.absolute_path(sourcemap_path))
+      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(
         Sass::Util.relative_path_from(css_path, sourcemap_path.dirname))
 
@@ -116,14 +118,12 @@ 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.public_url(file, sourcemap_dir)
+          source_uri = importer && importer.public_url(file, sourcemap_dir)
           next unless source_uri
         end
 
@@ -195,6 +195,8 @@ module Sass::Source
       result << "\n}"
       result
     end
+    # @comment
+    #   rubocop:enable MethodLength
 
     private
 

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 [Integer]
+    # @return [Fixnum]
     attr_accessor :line
 
     # The one-based offset in the line of the document associated with the
     # position.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     attr_accessor :offset
 
-    # @param line [Integer] The source line
-    # @param offset [Integer] The source offset
+    # @param line [Fixnum] The source line
+    # @param offset [Fixnum] The source offset
     def initialize(line, offset)
       @line = line
       @offset = offset