sass 3.7.4 → 4.0.0.alpha.1

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

@@ -56,7 +56,8 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
     @parents.pop
   end
 
-  # Converts the entire document to CSS.
+  # In Ruby 1.8, ensures that there's only one `@charset` directive
+  # and that it's at the top of the document.
   #
   # @return [(Tree::Node, Sass::Util::SubsetMap)] The resulting tree of static nodes
   #   *and* the extensions defined for this tree
@@ -64,6 +65,14 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
     yield
 
     if parent.nil?
+      # In Ruby 1.9 we can make all @charset nodes invisible
+      # and infer the final @charset from the encoding of the final string.
+      if Sass::Util.ruby1_8?
+        charset = node.children.find {|c| c.is_a?(Sass::Tree::CharsetNode)}
+        node.children.reject! {|c| c.is_a?(Sass::Tree::CharsetNode)}
+        node.children.unshift charset if charset
+      end
+
       imports_to_move = []
       import_limit = nil
       i = -1
@@ -106,9 +115,11 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   # @attr node [Sass::Tree::ExtendNode] The node that produced this extend.
   # @attr directives [Array<Sass::Tree::DirectiveNode>]
   #   The directives containing the `@extend`.
-  # @attr success [Boolean]
-  #   Whether this extend successfully matched a selector.
-  Extend = Struct.new(:extender, :target, :node, :directives, :success)
+  # @attr result [Symbol]
+  #   The result of this extend. One of `:not_found` (the target doesn't exist
+  #   in the document), `:failed_to_unify` (the target exists but cannot be
+  #   unified with the extender), or `:succeeded`.
+  Extend = Struct.new(:extender, :target, :node, :directives, :result)
 
   # Registers an extension in the `@extends` subset map.
   def visit_extend(node)

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

@@ -55,13 +55,13 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
 
   def visit_mixin(node)
     node.args = node.args.map {|a| a.deep_copy}
-    node.keywords = Sass::Util::NormalizedMap.new(Hash[node.keywords.map {|k, v| [k, v.deep_copy]}])
+    node.keywords = Hash[node.keywords.map {|k, v| [k, v.deep_copy]}]
     yield
   end
 
   def visit_prop(node)
     node.name = node.name.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
-    node.value = node.value.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
+    node.value = node.value.deep_copy
     yield
   end
 

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

@@ -44,21 +44,25 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
     node.resolved_rules = node.resolved_rules.do_extend(@extends, @parent_directives)
   end
 
-  class << self
-    private
+  private
 
-    def check_extends_fired!(extends)
-      extends.each_value do |ex|
-        next if ex.success || ex.node.optional?
-        message = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
+  def self.check_extends_fired!(extends)
+    extends.each_value do |ex|
+      next if ex.result == :succeeded || ex.node.optional?
+      message = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
+      reason =
+        if ex.result == :not_found
+          "The selector \"#{ex.target.join}\" was not found."
+        else
+          "No selectors matching \"#{ex.target.join}\" could be unified with \"#{ex.extender}\"."
+        end
 
-        # TODO(nweiz): this should use the Sass stack trace of the extend node.
-        raise Sass::SyntaxError.new(<<MESSAGE, :filename => ex.node.filename, :line => ex.node.line)
+      # TODO(nweiz): this should use the Sass stack trace of the extend node.
+      raise Sass::SyntaxError.new(<<MESSAGE, :filename => ex.node.filename, :line => ex.node.line)
 #{message}
-The selector "#{ex.target.join}" was not found.
+#{reason}
 Use "@extend #{ex.target.join} !optional" if the extend should be able to fail.
 MESSAGE
-      end
     end
   end
 end

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

@@ -1,7 +1,5 @@
 # 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.
@@ -11,6 +9,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     end
 
     # @api private
+    # @comment
+    #   rubocop:disable MethodLength
     def perform_arguments(callable, args, splat, environment)
       desc = "#{callable.type.capitalize} #{callable.name}"
       downcase_desc = "#{callable.type} #{callable.name}"
@@ -143,13 +143,13 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       end
     end
   end
+  # @comment
+  #   rubocop:enable MethodLength
 
   protected
 
   def initialize(env)
     @environment = env
-    @in_keyframes = false
-    @at_root_without_rule = false
   end
 
   # If an exception is raised, this adds proper metadata to the backtrace.
@@ -278,7 +278,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
     if node.normalized_name == 'calc' || node.normalized_name == 'element' ||
         node.name == 'expression' || node.name == 'url'
-      @@function_name_deprecation.warn(node.filename, node.line, <<WARNING)
+      Sass::Util.sass_warn <<WARNING
+DEPRECATION WARNING on line #{node.line}#{" of #{node.filename}" if node.filename}:
 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
@@ -286,7 +287,7 @@ WARNING
 
     @environment.set_local_function(node.name,
       Sass::Callable.new(node.name, node.args, node.splat, env,
-                         node.children, false, "function", :stylesheet))
+                         node.children, !:has_content, "function"))
     []
   end
 
@@ -337,7 +338,7 @@ WARNING
     env = Sass::Environment.new(@environment, node.options)
     @environment.set_local_mixin(node.name,
       Sass::Callable.new(node.name, node.args, node.splat, env,
-                         node.children, node.has_content, "mixin", :stylesheet))
+                         node.children, node.has_content, "mixin"))
     []
   end
 
@@ -347,8 +348,8 @@ WARNING
       mixin = @environment.mixin(node.name)
       raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin
 
-      if node.has_children && !mixin.has_content
-        raise Sass::SyntaxError.new(%(Mixin "#{node.name}" does not accept a content block.))
+      if node.children.any? && !mixin.has_content
+        raise Sass::SyntaxError.new(%Q{Mixin "#{node.name}" does not accept a content block.})
       end
 
       args = node.args.map {|a| a.perform(@environment)}
@@ -391,19 +392,9 @@ WARNING
   # Runs any SassScript that may be embedded in a property.
   def visit_prop(node)
     node.resolved_name = run_interp(node.name)
-
-    # If the node's value is just a variable or similar, we may get a useful
-    # source range from evaluating it.
-    if node.value.length == 1 && node.value.first.is_a?(Sass::Script::Tree::Node)
-      result = node.value.first.perform(@environment)
-      node.resolved_value = result.to_s
-      node.value_source_range = result.source_range if result.source_range
-    elsif node.custom_property?
-      node.resolved_value = run_interp_no_strip(node.value)
-    else
-      node.resolved_value = run_interp(node.value)
-    end
-
+    val = node.value.perform(@environment)
+    node.resolved_value = val.to_s
+    node.value_source_range = val.source_range if val.source_range
     yield
   end
 
@@ -489,11 +480,9 @@ WARNING
   def visit_warn(node)
     res = node.expr.perform(@environment)
     res = res.value if res.is_a?(Sass::Script::Value::String)
-    @environment.stack.with_directive(node.filename, node.line, "@warn") do
-      msg = "WARNING: #{res}\n         "
-      msg << @environment.stack.to_s.gsub("\n", "\n         ") << "\n"
-      Sass::Util.sass_warn msg
-    end
+    msg = "WARNING: #{res}\n         "
+    msg << @environment.stack.to_s.gsub("\n", "\n         ") << "\n"
+    Sass::Util.sass_warn msg
     []
   end
 
@@ -553,7 +542,7 @@ WARNING
   end
 
   def run_interp(text)
-    Sass::Util.strip_except_escapes(run_interp_no_strip(text))
+    run_interp_no_strip(text).strip
   end
 
   def handle_import_loop!(node)
@@ -564,7 +553,7 @@ WARNING
     end
 
     files << node.filename << node.imported_file.options[:filename]
-    msg << "\n" << files.each_cons(2).map do |m1, m2|
+    msg << "\n" << Sass::Util.enum_cons(files, 2).map do |m1, m2|
       "    #{m1} imports #{m2}"
     end.join("\n")
     raise Sass::SyntaxError.new(msg)

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

@@ -80,7 +80,7 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
 
   def visit_mixin(node)
     node.args.each {|a| a.options = @options}
-    node.keywords.each {|_k, v| v.options = @options}
+    node.keywords.each {|k, v| v.options = @options}
     node.splat.options = @options if node.splat
     node.kwarg_splat.options = @options if node.kwarg_splat
     yield
@@ -88,7 +88,7 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
 
   def visit_prop(node)
     node.name.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
-    node.value.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
+    node.value.options = @options
     yield
   end
 

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

@@ -12,10 +12,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     @tabs = 0
     @line = 1
     @offset = 1
-    @result = String.new("")
-    @source_mapping = build_source_mapping ? Sass::Source::Map.new : nil
-    @lstrip = nil
-    @in_directive = false
+    @result = ""
+    @source_mapping = Sass::Source::Map.new if build_source_mapping
   end
 
   # Runs the visitor on `node`.
@@ -53,8 +51,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     @source_mapping.add(source_range, target_range)
   end
 
-  def trailing_semicolon?
-   @result.end_with?(";") && !@result.end_with?('\;')
+  def ends_with?(str)
+    @result.end_with?(str)
   end
 
   # Move the output cursor back `chars` characters.
@@ -104,7 +102,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     @lstrip = true
     yield
   ensure
-    @lstrip &&= old_lstrip
+    @lstrip = @lstrip && old_lstrip
   end
 
   # Prepend `prefix` to the output string.
@@ -122,20 +120,22 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     node.children.each do |child|
       next if child.invisible?
       visit(child)
-      next if node.style == :compressed
-      output "\n"
-      next unless child.is_a?(Sass::Tree::DirectiveNode) && child.has_children && !child.bubbles?
-      output "\n"
+      unless node.style == :compressed
+        output "\n"
+        if child.is_a?(Sass::Tree::DirectiveNode) && child.has_children && !child.bubbles?
+          output "\n"
+        end
+      end
     end
     rstrip!
-    if node.style == :compressed && trailing_semicolon?
+    if node.style == :compressed && ends_with?(";")
       erase! 1
     end
     return "" if @result.empty?
 
     output "\n"
 
-    unless @result.ascii_only?
+    unless Sass::Util.ruby1_8? || @result.ascii_only?
       if node.style == :compressed
         # A byte order mark is sufficient to tell browsers that this
         # file is UTF-8 encoded, and will override any other detection
@@ -163,14 +163,16 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
     content = node.resolved_value.split("\n").join("\n" + spaces)
     if node.type == :silent
-      content.gsub!(%r{^(\s*)//(.*)$}) {"#{$1}/*#{$2} */"}
+      content.gsub!(%r{^(\s*)//(.*)$}) {|md| "#{$1}/*#{$2} */"}
     end
     if (node.style == :compact || node.style == :compressed) && node.type != :loud
-      content.gsub!(%r{\n +(\* *(?!/))?}, ' ')
+      content.gsub!(/\n +(\* *(?!\/))?/, ' ')
     end
     for_node(node) {output(content)}
   end
 
+  # @comment
+  #   rubocop:disable MethodLength
   def visit_directive(node)
     was_in_directive = @in_directive
     tab_str = '  ' * @tabs
@@ -185,7 +187,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       return
     end
 
-    @in_directive ||= !node.is_a?(Sass::Tree::MediaNode)
+    @in_directive = @in_directive || !node.is_a?(Sass::Tree::MediaNode)
     output(tab_str) if node.style != :compressed
     for_node(node) {output(node.resolved_value)}
     output(node.style == :compressed ? "{" : " {")
@@ -220,7 +222,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
         first = false
       elsif node.style == :compressed
         unless had_children
-          output(";") unless trailing_semicolon?
+          output(";") unless ends_with?(";")
         end
         with_tabs(0) {visit(child)}
         had_children = child.has_children
@@ -230,7 +232,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       end
     end
     rstrip!
-    if node.style == :compressed && trailing_semicolon?
+    if node.style == :compressed && ends_with?(";")
       erase! 1
     end
     if node.style == :expanded
@@ -242,6 +244,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
   ensure
     @in_directive = was_in_directive
   end
+  # @comment
+  #   rubocop:enable MethodLength
 
   def visit_media(node)
     with_tabs(@tabs + node.tabs) {visit_directive(node)}
@@ -257,22 +261,22 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
   end
 
   def visit_prop(node)
-    return if node.resolved_value.empty? && !node.custom_property?
+    return if node.resolved_value.empty?
     tab_str = '  ' * (@tabs + node.tabs)
     output(tab_str)
     for_node(node, :name) {output(node.resolved_name)}
-    output(":")
-    output(" ") unless node.style == :compressed || node.custom_property?
-    for_node(node, :value) do
-      output(if node.custom_property?
-               format_custom_property_value(node)
-             else
-               node.resolved_value
-             end)
+    if node.style == :compressed
+      output(":")
+      for_node(node, :value) {output(node.resolved_value)}
+    else
+      output(": ")
+      for_node(node, :value) {output(node.resolved_value)}
+      output(";")
     end
-    output(";") unless node.style == :compressed
   end
 
+  # @comment
+  #   rubocop:disable MethodLength
   def visit_rule(node)
     with_tabs(@tabs + node.tabs) do
       rule_separator = node.style == :compressed ? ',' : ', '
@@ -290,15 +294,12 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
                                       end
 
       joined_rules = node.resolved_rules.members.map do |seq|
-        next if seq.invisible?
-        rule_part = seq.to_s(style: node.style, placeholder: false)
+        next if seq.has_placeholder?
+        rule_part = seq.to_s
         if node.style == :compressed
           rule_part.gsub!(/([^,])\s*\n\s*/m, '\1 ')
-          rule_part.gsub!(/\s*([+>])\s*/m, '\1')
-          rule_part.gsub!(/nth([^( ]*)\(([^)]*)\)/m) do |match|
-            match.tr(" \t\n", "")
-          end
-          rule_part = Sass::Util.strip_except_escapes(rule_part)
+          rule_part.gsub!(/\s*([-,+>])\s*/m, '\1')
+          rule_part.strip!
         end
         rule_part
       end.compact.join(rule_separator)
@@ -336,7 +337,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
         end
       end
 
-      end_props, trailer, tabs = '', '', 0
+      end_props, trailer, tabs  = '', '', 0
       if node.style == :compact
         separator, end_props, bracket = ' ', ' ', ' { '
         trailer = "\n" if node.group_end
@@ -355,7 +356,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       with_tabs(tabs) do
         node.children.each_with_index do |child, i|
           if i > 0
-            if separator.start_with?(";") && trailing_semicolon?
+            if separator.start_with?(";") && ends_with?(";")
               erase! 1
             end
             output(separator)
@@ -363,7 +364,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
           visit(child)
         end
       end
-      if node.style == :compressed && trailing_semicolon?
+      if node.style == :compressed && ends_with?(";")
         erase! 1
       end
 
@@ -371,6 +372,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       output("}" + trailer)
     end
   end
+  # @comment
+  #   rubocop:enable MethodLength
 
   def visit_keyframerule(node)
     visit_directive(node)
@@ -378,51 +381,18 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
   private
 
-  # Reformats the value of `node` so that it's nicely indented, preserving its
-  # existing relative indentation.
-  #
-  # @param node [Sass::Script::Tree::PropNode] A custom property node.
-  # @return [String]
-  def format_custom_property_value(node)
-    value = node.resolved_value.sub(/\n[ \t\r\f\n]*\Z/, ' ')
-    if node.style == :compact || node.style == :compressed || !value.include?("\n")
-      # Folding not involving newlines was done in the parser. We can safely
-      # fold newlines here because tokens like strings can't contain literal
-      # newlines, so we know any adjacent whitespace is tokenized as whitespace.
-      return node.resolved_value.gsub(/[ \t\r\f]*\n[ \t\r\f\n]*/, ' ')
-    end
-
-    # Find the smallest amount of indentation in the custom property and use
-    # that as the base indentation level.
-    lines = value.split("\n")
-    indented_lines = lines[1..-1]
-    min_indentation = indented_lines.
-      map {|line| line[/^[ \t]*/]}.
-      reject {|line| line.empty?}.
-      min_by {|line| line.length}
-
-    # Limit the base indentation to the same indentation level as the node name
-    # so that if *every* line is indented relative to the property name that's
-    # preserved.
-    if node.name_source_range
-      base_indentation = min_indentation[0...node.name_source_range.start_pos.offset - 1]
-    end
-
-    lines.first + "\n" + indented_lines.join("\n").gsub(/^#{base_indentation}/, '  ' * @tabs)
-  end
-
   def debug_info_rule(debug_info, options)
     node = Sass::Tree::DirectiveNode.resolved("@media -sass-debug-info")
-    debug_info.map {|k, v| [k.to_s, v.to_s]}.to_a.each do |k, v|
+    Sass::Util.hash_to_a(debug_info.map {|k, v| [k.to_s, v.to_s]}).each do |k, v|
       rule = Sass::Tree::RuleNode.new([""])
       rule.resolved_rules = Sass::Selector::CommaSequence.new(
         [Sass::Selector::Sequence.new(
-          [Sass::Selector::SimpleSequence.new(
-            [Sass::Selector::Element.new(k.to_s.gsub(/[^\w-]/, "\\\\\\0"), nil)],
-            false)
-          ])
+            [Sass::Selector::SimpleSequence.new(
+                [Sass::Selector::Element.new(k.to_s.gsub(/[^\w-]/, "\\\\\\0"), nil)],
+                false)
+            ])
         ])
-      prop = Sass::Tree::PropNode.new([""], [""], :new)
+      prop = Sass::Tree::PropNode.new([""], Sass::Script::Value::String.new(''), :new)
       prop.resolved_name = "font-family"
       prop.resolved_value = Sass::SCSS::RX.escape_ident(v.to_s)
       rule << prop