sass 3.2.19 → 3.3.0.alpha.1

data/lib/sass/scss/rx.rb

@@ -124,9 +124,16 @@ module Sass
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\'/
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
-
-      STATIC_COMPONENT = /#{IDENT}|#{STRING_NOINTERP}|#{HEXCOLOR}|[+-]?#{NUMBER}|\!important/i
-      STATIC_VALUE = /#{STATIC_COMPONENT}(\s*[\s,\/]\s*#{STATIC_COMPONENT})*([;}])/i
+      # Can't use IDENT here, because it seems to take exponential time on 1.8.
+      # We could use it for 1.9 only, but I don't want to introduce a cross-version
+      # behavior difference.
+      # In any case, almost all CSS idents will be matched by this.
+      #
+      # We explicitly avoid parsing newlines or values/selectors longer than
+      # about 50 characters. This mitigates the problem of exponential parsing
+      # time when a value has a long string of valid, parsable content followed
+      # by something invalid.
+      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|[ \t](?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important){1,50}([;}])/i
       STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){0,50}([{])/i
     end
   end

data/lib/sass/selector.rb

@@ -120,7 +120,7 @@ module Sass
 
       # @see AbstractSequence#specificity
       def specificity
-        SPECIFICITY_BASE
+        0
       end
     end
 
@@ -346,19 +346,19 @@ module Sass
     # A pseudoclass (e.g. `:visited`) or pseudoelement (e.g. `::first-line`) selector.
     # It can have arguments (e.g. `:nth-child(2n+1)`).
     class Pseudo < Simple
-      # Some psuedo-class-syntax selectors are actually considered
-      # pseudo-elements and must be treated differently. This is a list of such
-      # selectors
+      # The type of the selector.
+      # `:class` if this is a pseudoclass selector,
+      # `:element` if it's a pseudoelement.
       #
-      # @return [Array<String>]
-      ACTUALLY_ELEMENTS = %w[after before first-line first-letter]
+      # @return [Symbol]
+      attr_reader :type
 
-      # Like \{#type}, but returns the type of selector this looks like, rather
-      # than the type it is semantically. This only differs from type for
-      # selectors in \{ACTUALLY\_ELEMENTS}.
+      # Some psuedo-class-syntax selectors (`:after` and `:before)
+      # are actually considered pseudo-elements
+      # and must be at the end of the selector to function properly.
       #
-      # @return [Symbol]
-      attr_reader :syntactic_type
+      # @return [Array<String>]
+      FINAL_SELECTORS = %w[after before]
 
       # The name of the selector.
       #
@@ -380,22 +380,18 @@ module Sass
       # @param arg [nil, Array<String, Sass::Script::Node>] The argument to the selector,
       #   or nil if no argument was given
       def initialize(type, name, arg)
-        @syntactic_type = type
+        @type = type
         @name = name
         @arg = arg
       end
 
-      # The type of the selector. `:class` if this is a pseudoclass selector,
-      # `:element` if it's a pseudoelement.
-      #
-      # @return [Symbol]
-      def type
-        ACTUALLY_ELEMENTS.include?(name.first) ? :element : syntactic_type
+      def final?
+        type == :class && FINAL_SELECTORS.include?(name.first)
       end
 
       # @see Selector#to_a
       def to_a
-        res = [syntactic_type == :class ? ":" : "::"] + @name
+        res = [@type == :class ? ":" : "::"] + @name
         (res << "(").concat(Sass::Util.strip_string_array(@arg)) << ")" if @arg
         res
       end
@@ -409,6 +405,7 @@ module Sass
           sel.is_a?(Pseudo) && sel.type == :element &&
             (sel.name != self.name || sel.arg != self.arg)
         end
+        return sels + [self] if final?
         super
       end
 

data/lib/sass/selector/sequence.rb

@@ -255,7 +255,7 @@ module Sass
           # is a supersequence of the other, use that, otherwise give up.
           lcs = Sass::Util.lcs(ops1, ops2)
           return unless lcs == ops1 || lcs == ops2
-          res.unshift(*(ops1.size > ops2.size ? ops1 : ops2).reverse)
+          res.unshift *(ops1.size > ops2.size ? ops1 : ops2).reverse
           return res
         end
 
@@ -437,32 +437,23 @@ module Sass
       # @param seqses [Array<Array<Array<SimpleSequence or String>>>]
       # @return [Array<Array<Array<SimpleSequence or String>>>]
       def trim(seqses)
-        # Avoid truly horrific quadratic behavior. TODO: I think there
-        # may be a way to get perfect trimming without going quadratic.
-        return seqses 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
-        # identical selectors don't mutually trim one another.
-        result = seqses.dup
-
         # This is n^2 on the sequences, but only comparing between
         # separate sequences should limit the quadratic behavior.
-        seqses.each_with_index do |seqs1, i|
-          result[i] = seqs1.reject do |seq1|
-            max_spec = _sources(seq1).map {|seq| seq.specificity}.max || 0
-            result.any? do |seqs2|
+        seqses.map do |seqs1|
+          seqs1.reject do |seq1|
+            min_spec = 0
+            _sources(seq1).map {|seq| min_spec += seq.specificity}
+            seqses.any? do |seqs2|
               next if seqs1.equal?(seqs2)
               # Second Law of Extend: the specificity of a generated selector
               # should never be less than the specificity of the extending
               # selector.
               #
               # See https://github.com/nex3/sass/issues/324.
-              seqs2.any? {|seq2| _specificity(seq2) >= max_spec && _superselector?(seq2, seq1)}
+              seqs2.any? {|seq2| _specificity(seq2) >= min_spec && _superselector?(seq2, seq1)}
             end
           end
         end
-        result
       end
 
       def _hash

data/lib/sass/selector/simple.rb

@@ -85,7 +85,7 @@ module Sass
         sels_with_ix = Sass::Util.enum_with_index(sels)
         _, i =
           if self.is_a?(Pseudo) || self.is_a?(SelectorPseudoClass)
-            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && (sels.last.type == :element)}
+            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && (sels.last.final? || sels.last.type == :element)}
           else
             sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) || sel.is_a?(SelectorPseudoClass)}
           end

data/lib/sass/selector/simple_sequence.rb

@@ -37,16 +37,11 @@ module Sass
         @base ||= (members.first if members.first.is_a?(Element) || members.first.is_a?(Universal))
       end
 
-      def pseudo_elements
-        @pseudo_elements ||= (members - [base]).
-          select {|sel| sel.is_a?(Pseudo) && sel.type == :element}
-      end
-
-      # Returns the non-base, non-pseudo-class selectors in this sequence.
+      # Returns the non-base selectors in this sequence.
       #
       # @return [Set<Simple>]
       def rest
-        @rest ||= Set.new(members - [base] - pseudo_elements)
+        @rest ||= Set.new(base ? members[1..-1] : members)
       end
 
       # Whether or not this compound selector is the subject of the parent
@@ -79,16 +74,13 @@ module Sass
         # Parent selector only appears as the first selector in the sequence
         return [self] unless @members.first.is_a?(Parent)
 
-        members = super_seq.members.dup
-        newline = members.pop if members.last == "\n"
-        return members if @members.size == 1
-        unless members.last.is_a?(SimpleSequence)
+        return super_seq.members if @members.size == 1
+        unless super_seq.members.last.is_a?(SimpleSequence)
           raise Sass::SyntaxError.new("Invalid parent selector: " + super_seq.to_a.join)
         end
 
-        members[0...-1] +
-          [SimpleSequence.new(members.last.members + @members[1..-1], subject?)] +
-          [newline].compact
+        super_seq.members[0...-1] +
+          [SimpleSequence.new(super_seq.members.last.members + @members[1..-1], subject?)]
       end
 
       # Non-destrucively extends this selector with the extensions specified in a hash
@@ -109,8 +101,8 @@ module Sass
           # If A {@extend B} and C {...},
           # seq is A, sels is B, and self is C
 
-          self_without_sel = Sass::Util.array_minus(self.members, sels)
-          group.each {|e, _| e.result = :failed_to_unify unless e.result == :succeeded}
+          self_without_sel = self.members - sels
+          group.each {|e, _| e.result = :failed_to_unify}
           next unless unified = seq.members.last.unify(self_without_sel, subject?)
           group.each {|e, _| e.result = :succeeded}
           next if group.map {|e, _| check_directives_match!(e, parent_directives)}.none?
@@ -137,9 +129,9 @@ 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, other_subject)
-        return unless sseq = members.inject(sels) do |member, sel|
-          return unless member
-          sel.unify(member)
+        return unless sseq = members.inject(sels) do |sseq, sel|
+          return unless sseq
+          sel.unify(sseq)
         end
         SimpleSequence.new(sseq, other_subject || subject?)
       end
@@ -153,9 +145,7 @@ module Sass
       # @param sseq [SimpleSequence]
       # @return [Boolean]
       def superselector?(sseq)
-        (base.nil? || base.eql?(sseq.base)) &&
-          pseudo_elements.eql?(sseq.pseudo_elements) &&
-          rest.subset?(sseq.rest)
+        (base.nil? || base.eql?(sseq.base)) && rest.subset?(sseq.rest)
       end
 
       # @see Simple#to_a
@@ -181,7 +171,7 @@ module Sass
       def with_more_sources(sources)
         sseq = dup
         sseq.members = members.dup
-        sseq.sources = self.sources | sources
+        sseq.sources.merge sources
         sseq
       end
 
@@ -207,8 +197,8 @@ WARNING
       end
 
       def _eql?(other)
-        other.base.eql?(self.base) && other.pseudo_elements == pseudo_elements &&
-          Sass::Util.set_eql?(other.rest, self.rest) && other.subject? == self.subject?
+        other.base.eql?(self.base) && Sass::Util.set_eql?(other.rest, self.rest) &&
+          other.subject? == self.subject?
       end
     end
   end

data/lib/sass/tree/comment_node.rb

@@ -70,13 +70,13 @@ module Sass::Tree
     private
 
     def normalize_indentation(str)
-      ind = str.split("\n").inject(str[/^[ \t]*/].split("")) do |pre, line|
+      pre = str.split("\n").inject(str[/^[ \t]*/].split("")) do |pre, line|
         line[/^[ \t]*/].split("").zip(pre).inject([]) do |arr, (a, b)|
           break arr if a != b
           arr << a
         end
       end.join
-      str.gsub(/^#{ind}/, '')
+      str.gsub(/^#{pre}/, '')
     end
   end
 end

data/lib/sass/tree/import_node.rb

@@ -9,9 +9,6 @@ module Sass
       # @return [String]
       attr_reader :imported_filename
 
-      # Sets the imported file.
-      attr_writer :imported_file
-
       # @param imported_filename [String] The name of the imported file
       def initialize(imported_filename)
         @imported_filename = imported_filename
@@ -46,12 +43,12 @@ module Sass
 
         if @options[:importer]
           f = @options[:importer].find_relative(
-            @imported_filename, @options[:filename], options_for_importer)
+            @imported_filename, @options[:filename], @options.dup)
           return f if f
         end
 
         paths.each do |p|
-          if f = p.find(@imported_filename, options_for_importer)
+          if f = p.find(@imported_filename, @options.dup)
             return f
           end
         end
@@ -66,10 +63,6 @@ module Sass
       rescue SyntaxError => e
         raise SyntaxError.new(e.message, :line => self.line, :filename => @filename)
       end
-
-      def options_for_importer
-        @options.merge(:_line => line)
-      end
     end
   end
 end

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

@@ -23,8 +23,7 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   SCRIPT_NODES = [Sass::Tree::ImportNode] + CONTROL_NODES
   def visit_children(parent)
     old_parent = @parent
-    @parent = parent unless is_any_of?(parent, SCRIPT_NODES) ||
-      (parent.bubbles? && !old_parent.is_a?(Sass::Tree::RootNode))
+    @parent = parent unless is_any_of?(parent, SCRIPT_NODES)
     @parents.push parent
     super
   ensure
@@ -140,7 +139,7 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   def try_send(method, *args)
-    return unless respond_to?(method, true)
+    return unless respond_to?(method)
     send(method, *args)
   end
 end

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

@@ -89,6 +89,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       end.gsub(/^/, spaces) + "\n"
       content
     end
+    content.sub!(%r{^\s*(/\*)}, '/*!') if node.type == :loud #'
     content
   end
 
@@ -194,19 +195,13 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_mixin(node)
-    arg_to_sass = lambda do |arg|
-      sass = arg.to_sass(@options)
-      sass = "(#{sass})" if arg.is_a?(Sass::Script::List) && arg.separator == :comma
-      sass
-    end
-
     unless node.args.empty? && node.keywords.empty? && node.splat.nil?
-      args = node.args.map(&arg_to_sass).join(", ")
+      args = node.args.map {|a| a.to_sass(@options)}.join(", ")
       keywords = Sass::Util.hash_to_a(node.keywords).
-        map {|k, v| "$#{dasherize(k)}: #{arg_to_sass[v]}"}.join(', ')
+        map {|k, v| "$#{dasherize(k)}: #{v.to_sass(@options)}"}.join(', ')
       if node.splat
         splat = (args.empty? && keywords.empty?) ? "" : ", "
-        splat = "#{splat}#{arg_to_sass[node.splat]}..."
+        splat = "#{splat}#{node.splat.to_sass(@options)}..."
       end
       arglist = "(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords}#{splat})"
     end

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

@@ -32,8 +32,6 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
     end
   end
 
-  MERGEABLE_DIRECTIVES = [Sass::Tree::MediaNode]
-
   # Runs a block of code with the current parent node
   # replaced with the given node.
   #
@@ -41,18 +39,11 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   # @yield A block in which the parent is set to `parent`.
   # @return [Object] The return value of the block.
   def with_parent(parent)
-    if parent.is_a?(Sass::Tree::DirectiveNode)
-      if MERGEABLE_DIRECTIVES.any? {|klass| parent.is_a?(klass)}
-        old_parent_directive = @parent_directives.pop
-      end
-      @parent_directives.push parent
-    end
-
+    @parent_directives.push parent if parent.is_a?(Sass::Tree::DirectiveNode)
     old_parent, @parent = @parent, parent
     yield
   ensure
     @parent_directives.pop if parent.is_a?(Sass::Tree::DirectiveNode)
-    @parent_directives.push old_parent_directive if old_parent_directive
     @parent = old_parent
   end
 
@@ -73,29 +64,17 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
         node.children.unshift charset if charset
       end
 
-      imports_to_move = []
-      import_limit = nil
-      i = -1
-      node.children.reject! do |n|
-        i += 1
-        if import_limit
-          next false unless n.is_a?(Sass::Tree::CssImportNode)
-          imports_to_move << n
-          next true
-        end
-
-        if !n.is_a?(Sass::Tree::CommentNode) &&
-            !n.is_a?(Sass::Tree::CharsetNode) &&
-            !n.is_a?(Sass::Tree::CssImportNode)
-          import_limit = i
-        end
-
-        false
+      imports = Sass::Util.extract!(node.children) do |c|
+        c.is_a?(Sass::Tree::DirectiveNode) && !c.is_a?(Sass::Tree::MediaNode) &&
+          c.resolved_value =~ /^@import /i
       end
-
-      if import_limit
-        node.children = node.children[0...import_limit] + imports_to_move +
-          node.children[import_limit..-1]
+      charset_and_index = Sass::Util.ruby1_8? &&
+        node.children.each_with_index.find {|c, _| c.is_a?(Sass::Tree::CharsetNode)}
+      if charset_and_index
+        index = charset_and_index.last
+        node.children = node.children[0..index] + imports + node.children[index+1..-1]
+      else
+        node.children = imports + node.children
       end
     end
 
@@ -136,12 +115,12 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
       end
 
       sel = sseq.members
-      parent.resolved_rules.members.each do |member|
-        if !member.members.last.is_a?(Sass::Selector::SimpleSequence)
-          raise Sass::SyntaxError.new("#{member} can't extend: invalid selector")
+      parent.resolved_rules.members.each do |seq|
+        if !seq.members.last.is_a?(Sass::Selector::SimpleSequence)
+          raise Sass::SyntaxError.new("#{seq} can't extend: invalid selector")
         end
 
-        @extends[sel] = Extend.new(member, sel, node, @parent_directives.dup, :not_found)
+        @extends[sel] = Extend.new(seq, sel, node, @parent_directives.dup, :not_found)
       end
     end
 

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

@@ -14,13 +14,11 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
     begin
       unless keywords.empty?
-        unknown_args = Sass::Util.array_minus(keywords.keys,
-          callable.args.map {|var| var.first.underscored_name})
+        unknown_args = keywords.keys - callable.args.map {|var| var.first.underscored_name}
         if callable.splat && unknown_args.include?(callable.splat.underscored_name)
           raise Sass::SyntaxError.new("Argument $#{callable.splat.name} of #{downcase_desc} cannot be used as a named argument.")
         elsif unknown_args.any?
-          description = unknown_args.length > 1 ? 'the following arguments:' : 'an argument named'
-          raise Sass::SyntaxError.new("#{desc} doesn't have #{description} #{unknown_args.map {|name| "$#{name}"}.join ', '}.")
+          raise Sass::SyntaxError.new("#{desc} doesn't have #{unknown_args.length > 1 ? 'the following arguments:' : 'an argument named'} #{unknown_args.map{|name| "$#{name}"}.join ', '}.")
         end
       end
     rescue Sass::SyntaxError => keyword_exception
@@ -68,7 +66,6 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     end
 
     yield env
-  rescue Exception => e
   ensure
     # If there's a keyword exception, we don't want to throw it immediately,
     # because the invalid keywords may be part of a glob argument that should be
@@ -80,10 +77,10 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     # non-Sass exceptions.
     if keyword_exception &&
         !(arg_list && arg_list.keywords_accessed) &&
-        (e.nil? || e.is_a?(Sass::SyntaxError))
+        ($!.nil? || $!.is_a?(Sass::SyntaxError))
       raise keyword_exception
-    elsif e
-      raise e
+    elsif $!
+      raise $!
     end
   end
 
@@ -144,9 +141,9 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     res = node.expr.perform(@environment)
     res = res.value if res.is_a?(Sass::Script::String)
     if node.filename
-      Sass::Util.sass_warn "#{node.filename}:#{node.line} DEBUG: #{res}"
+      $stderr.puts "#{node.filename}:#{node.line} DEBUG: #{res}"
     else
-      Sass::Util.sass_warn "Line #{node.line} DEBUG: #{res}"
+      $stderr.puts "Line #{node.line} DEBUG: #{res}"
     end
     []
   end
@@ -220,17 +217,15 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     file = node.imported_file
     handle_import_loop!(node) if @stack.any? {|e| e[:filename] == file.options[:filename]}
 
-    begin
-      @stack.push(:filename => node.filename, :line => node.line)
-      root = file.to_tree
-      Sass::Tree::Visitors::CheckNesting.visit(root)
-      node.children = root.children.map {|c| visit(c)}.flatten
-      node
-    rescue Sass::SyntaxError => e
-      e.modify_backtrace(:filename => node.imported_file.options[:filename])
-      e.add_backtrace(:filename => node.filename, :line => node.line)
-      raise e
-    end
+    @stack.push(:filename => node.filename, :line => node.line)
+    root = file.to_tree
+    Sass::Tree::Visitors::CheckNesting.visit(root)
+    node.children = root.children.map {|c| visit(c)}.flatten
+    node
+  rescue Sass::SyntaxError => e
+    e.modify_backtrace(:filename => node.imported_file.options[:filename])
+    e.add_backtrace(:filename => node.filename, :line => node.line)
+    raise e
   ensure
     @stack.pop unless path
   end
@@ -335,7 +330,9 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     res = node.expr.perform(@environment)
     res = res.value if res.is_a?(Sass::Script::String)
     msg = "WARNING: #{res}\n         "
-    msg << stack_trace.join("\n         ") << "\n"
+    msg << stack_trace.join("\n         ")
+    # JRuby doesn't automatically add a newline for #warn
+    msg << (RUBY_PLATFORM =~ /java/ ? "\n\n" : "\n")
     Sass::Util.sass_warn msg
     []
   ensure
@@ -421,7 +418,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       end
     end
 
-    return unless mixins.include?(node.name)
+    return if mixins.empty?
     raise Sass::SyntaxError.new("#{msg} #{node.name} includes itself") if mixins.size == 1
 
     msg << "\n" << Sass::Util.enum_cons(mixins.reverse + [node.name], 2).map do |m1, m2|