haml 3.1.8 → 3.2.0.alpha.2

data/vendor/sass/lib/sass/scss/rx.rb

@@ -112,7 +112,6 @@ module Sass
       INTERP_START = /#\{/
       MOZ_ANY = quote(":-moz-any(", Regexp::IGNORECASE)
 
-      IDENT_HYPHEN_INTERP = /-(?=#\{)/
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\'/
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
@@ -120,7 +119,7 @@ module Sass
       # 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.
-      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important)+(?=[;}])/i
+      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM})+(?=[;}])/i
 
       STATIC_SELECTOR = /(#{NMCHAR}|\s|[,>+*]|[:#.]#{NMSTART})+(?=[{])/i
     end

data/vendor/sass/lib/sass/scss/static_parser.rb

@@ -13,12 +13,12 @@ module Sass
       #   Used for error reporting.
       # @return [Selector::CommaSequence] The parsed selector
       # @raise [Sass::SyntaxError] if there's a syntax error in the selector
-      def parse_selector
+      def parse_selector(filename)
         init_scanner!
         seq = expr!(:selector_comma_sequence)
         expected("selector") unless @scanner.eos?
         seq.line = @line
-        seq.filename = @filename
+        seq.filename = filename
         seq
       end
 

data/vendor/sass/lib/sass/shared.rb

@@ -17,7 +17,7 @@ module Sass
     # @return [String] The text remaining in the scanner after all `#{`s have been processed
     def handle_interpolation(str)
       scan = StringScanner.new(str)
-      yield scan while scan.scan(/(.*?)(\\*)\#\{/m)
+      yield scan while scan.scan(/(.*?)(\\*)\#\{/)
       scan.rest
     end
 

data/vendor/sass/lib/sass/tree/comment_node.rb

@@ -6,18 +6,9 @@ module Sass::Tree
   # @see Sass::Tree
   class CommentNode < Node
     # The text of the comment, not including `/*` and `*/`.
-    # Interspersed with {Sass::Script::Node}s representing `#{}`-interpolation
-    # if this is a loud comment.
-    #
-    # @return [Array<String, Sass::Script::Node>]
-    attr_accessor :value
-
-    # The text of the comment
-    # after any interpolated SassScript has been resolved.
-    # Only set once \{Tree::Visitors::Perform} has been run.
     #
     # @return [String]
-    attr_accessor :resolved_value
+    attr_accessor :value
 
     # Whether the comment is loud.
     #
@@ -32,13 +23,14 @@ module Sass::Tree
     # @return [Boolean]
     attr_accessor :silent
 
-    # @param value [Array<String, Sass::Script::Node>] See \{#value}
+    # @param value [String] See \{#value}
     # @param silent [Boolean] See \{#silent}
-    # @param loud [Boolean] See \{#loud}
-    def initialize(value, silent, loud)
-      @value = Sass::Util.with_extracted_values(value) {|str| normalize_indentation str}
+    def initialize(value, silent)
+      @lines = []
       @silent = silent
-      @loud = loud
+      @value = normalize_indentation value
+      @loud = @value =~ %r{^(/[\/\*])?!}
+      @value.sub!("#{$1}!", $1.to_s) if @loud
       super()
     end
 
@@ -48,7 +40,7 @@ module Sass::Tree
     # @return [Boolean] Whether or not this node and the other object
     #   are the same
     def ==(other)
-      self.class == other.class && value == other.value && silent == other.silent && loud == other.loud
+      self.class == other.class && value == other.value && silent == other.silent
     end
 
     # Returns `true` if this is a silent comment
@@ -65,14 +57,9 @@ module Sass::Tree
       end
     end
 
-    # Returns the number of lines in the comment.
-    #
-    # @return [Fixnum]
-    def lines
-      @value.inject(0) do |s, e|
-        next s + e.count("\n") if e.is_a?(String)
-        next s
-      end
+    # Returns whether this comment should be interpolated for dynamic comment generation.
+    def evaluated?
+      @loud
     end
 
     private

data/vendor/sass/lib/sass/tree/debug_node.rb

@@ -6,7 +6,7 @@ module Sass
     class DebugNode < Node
       # The expression to print.
       # @return [Script::Node] 
-      attr_accessor :expr
+      attr_reader :expr
 
       # @param expr [Script::Node] The expression to print
       def initialize(expr)

data/vendor/sass/lib/sass/tree/each_node.rb

@@ -11,7 +11,7 @@ module Sass::Tree
 
     # The parse tree for the list.
     # @param [Script::Node]
-    attr_accessor :list
+    attr_reader :list
 
     # @param var [String] The name of the loop variable
     # @param list [Script::Node] The parse tree for the list

data/vendor/sass/lib/sass/tree/extend_node.rb

@@ -15,7 +15,7 @@ module Sass::Tree
     # representing `#{}`-interpolation.
     #
     # @return [Array<String, Sass::Script::Node>]
-    attr_accessor :selector
+    attr_reader :selector
 
     # @param selector [Array<String, Sass::Script::Node>]
     #   The CSS selector to extend,

data/vendor/sass/lib/sass/tree/for_node.rb

@@ -11,11 +11,11 @@ module Sass::Tree
 
     # The parse tree for the initial expression.
     # @return [Script::Node]
-    attr_accessor :from
+    attr_reader :from
 
     # The parse tree for the final expression.
     # @return [Script::Node]
-    attr_accessor :to
+    attr_reader :to
 
     # Whether to include `to` in the loop or stop just before.
     # @return [Boolean]

data/vendor/sass/lib/sass/tree/function_node.rb

@@ -13,7 +13,7 @@ module Sass
       # the default value of the argument
       #
       # @return [Array<Script::Node>]
-      attr_accessor :args
+      attr_reader :args
 
       # @param name [String] The function name
       # @param args [Array<(Script::Node, Script::Node)>] The arguments for the function.

data/vendor/sass/lib/sass/tree/if_node.rb

@@ -13,7 +13,7 @@ module Sass::Tree
     # If this is nil, this is an `@else` node, not an `@else if`.
     #
     # @return [Script::Expr]
-    attr_accessor :expr
+    attr_reader :expr
 
     # The next {IfNode} in the if-else list, or `nil`.
     #
@@ -35,6 +35,12 @@ module Sass::Tree
       @last_else = node
     end
 
+    # @see Node#options=
+    def options=(options)
+      super
+      self.else.options = options if self.else
+    end
+
     def _dump(f)
       Marshal.dump([self.expr, self.else, self.children])
     end
@@ -48,5 +54,12 @@ module Sass::Tree
         node.else ? node.else.instance_variable_get('@last_else') : node)
       node
     end
+
+    # @see Node#deep_copy
+    def deep_copy
+      node = super
+      node.else = self.else.deep_copy if self.else
+      node
+    end
   end
 end

data/vendor/sass/lib/sass/tree/mixin_def_node.rb

@@ -13,7 +13,7 @@ module Sass
       # and the parse tree for the default value of the argument.
       #
       # @return [Array<(Script::Node, Script::Node)>]
-      attr_accessor :args
+      attr_reader :args
 
       # @param name [String] The mixin name
       # @param args [Array<(Script::Node, Script::Node)>] See \{#args}

data/vendor/sass/lib/sass/tree/mixin_node.rb

@@ -13,11 +13,11 @@ module Sass::Tree
 
     # The arguments to the mixin.
     # @return [Array<Script::Node>]
-    attr_accessor :args
+    attr_reader :args
 
     # A hash from keyword argument names to values.
     # @return [{String => Script::Node}]
-    attr_accessor :keywords
+    attr_reader :keywords
 
     # @param name [String] The name of the mixin
     # @param args [Array<Script::Node>] See \{#args}

data/vendor/sass/lib/sass/tree/node.rb

@@ -65,7 +65,8 @@ module Sass
       # @param options [{Symbol => Object}] The options
       # @see #options
       def options=(options)
-        Sass::Tree::Visitors::SetOptions.visit(self, options)
+        children.each {|c| c.options = options}
+        @options = options
       end
 
       # @private
@@ -184,7 +185,9 @@ module Sass
       #
       # @return [Node]
       def deep_copy
-        Sass::Tree::Visitors::DeepCopy.visit(self)
+        node = dup
+        node.children = children.map {|c| c.deep_copy}
+        node
       end
 
       protected

data/vendor/sass/lib/sass/tree/prop_node.rb

@@ -23,6 +23,11 @@ module Sass::Tree
     # @return [Sass::Script::Node]
     attr_accessor :value
 
+    # Whether the property was marked as !important.
+    #
+    # @return [Boolean]
+    attr_accessor :important
+
     # The value of the property
     # after any interpolated SassScript has been resolved.
     # Only set once \{Tree::Visitors::Perform} has been run.
@@ -44,14 +49,16 @@ module Sass::Tree
 
     # @param name [Array<String, Sass::Script::Node>] See \{#name}
     # @param value [Sass::Script::Node] See \{#value}
+    # @param important [Boolean] whether this is an !important property
     # @param prop_syntax [Symbol] `:new` if this property uses `a: b`-style syntax,
     #   `:old` if it uses `:a b`-style syntax
-    def initialize(name, value, prop_syntax)
+    def initialize(name, value, important, prop_syntax)
       @name = Sass::Util.strip_string_array(
         Sass::Util.merge_adjacent_strings(name))
       @value = value
       @tabs = 0
       @prop_syntax = prop_syntax
+      @important = important
       super()
     end
 
@@ -89,7 +96,7 @@ module Sass::Tree
       old = opts[:old] && fmt == :sass
       initial = old ? ':' : ''
       mid = old ? '' : ':'
-      "#{initial}#{name}#{mid} #{self.class.val_to_sass(value, opts)}".rstrip
+      "#{initial}#{name}#{mid} #{self.class.val_to_sass(value, opts)}#{' !important' if important}".rstrip
     end
 
     private

data/vendor/sass/lib/sass/tree/return_node.rb

@@ -6,7 +6,7 @@ module Sass
     class ReturnNode < Node
       # The expression to return.
       # @type [Script::Node]
-      attr_accessor :expr
+      attr_reader :expr
 
       # @param expr [Script::Node] The expression to return
       def initialize(expr)

data/vendor/sass/lib/sass/tree/rule_node.rb

@@ -50,13 +50,6 @@ module Sass::Tree
     # @return [Boolean]
     attr_accessor :group_end
 
-    # The stack trace.
-    # This is only readable in a CSS tree as it is written during the perform step
-    # and only when the :trace_selectors option is set.
-    #
-    # @return [Array<String>]
-    attr_accessor :stack_trace
-
     # @param rule [Array<String, Sass::Script::Node>]
     #   The CSS rule. See \{#rule}
     def initialize(rule)
@@ -128,8 +121,8 @@ module Sass::Tree
       if @rule.all? {|t| t.kind_of?(String)}
         # We don't use real filename/line info because we don't have it yet.
         # When we get it, we'll set it on the parsed rules if possible.
-        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, '', 1)
-        @parsed_rules = parser.parse_selector rescue nil
+        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, 1)
+        @parsed_rules = parser.parse_selector('') rescue nil
       end
     end
   end

data/vendor/sass/lib/sass/tree/variable_node.rb

@@ -10,7 +10,7 @@ module Sass
 
       # The parse tree for the variable value.
       # @return [Script::Node]
-      attr_accessor :expr
+      attr_reader :expr
 
       # Whether this is a guarded variable assignment (`!default`).
       # @return [Boolean]

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

@@ -17,11 +17,11 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     raise e
   end
 
-  CONTROL_NODES = [Sass::Tree::EachNode, Sass::Tree::ForNode, Sass::Tree::IfNode, Sass::Tree::WhileNode]
-  SCRIPT_NODES = [Sass::Tree::ImportNode, Sass::Tree::MixinNode] + CONTROL_NODES
+  PARENT_CLASSES = [ Sass::Tree::EachNode,   Sass::Tree::ForNode,   Sass::Tree::IfNode,
+                     Sass::Tree::ImportNode, Sass::Tree::MixinNode, Sass::Tree::WhileNode]
   def visit_children(parent)
     old_parent = @parent
-    @parent = parent unless is_any_of?(parent, SCRIPT_NODES)
+    @parent = parent unless is_any_of?(parent, PARENT_CLASSES)
     old_real_parent, @real_parent = @real_parent, parent
     super
   ensure
@@ -48,9 +48,9 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "@charset may only be used at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
-  VALID_EXTEND_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::MixinDefNode]
+  INVALID_EXTEND_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::MixinDefNode]
   def invalid_extend_parent?(parent, child)
-    unless is_any_of?(parent, VALID_EXTEND_PARENTS)
+    unless is_any_of?(parent, INVALID_EXTEND_PARENTS)
       "Extend directives may only be used within rules."
     end
   end
@@ -59,22 +59,23 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "Functions may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
-  VALID_FUNCTION_CHILDREN = [
-    Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::ReturnNode,
-    Sass::Tree::VariableNode, Sass::Tree::WarnNode
-  ] + CONTROL_NODES
+  INVALID_FUNCTION_CHILDREN = [
+    Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::EachNode,
+    Sass::Tree::ForNode,      Sass::Tree::IfNode,    Sass::Tree::ReturnNode,
+    Sass::Tree::VariableNode, Sass::Tree::WarnNode,  Sass::Tree::WhileNode
+  ]
   def invalid_function_child?(parent, child)
-    unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
+    unless is_any_of?(child, INVALID_FUNCTION_CHILDREN)
       "Functions can only contain variable declarations and control directives."
     end
   end
 
-  VALID_IMPORT_PARENTS = [
+  INVALID_IMPORT_PARENTS = [
     Sass::Tree::IfNode,   Sass::Tree::ForNode, Sass::Tree::WhileNode,
     Sass::Tree::EachNode, Sass::Tree::MixinDefNode
   ]
   def invalid_import_parent?(parent, child)
-    if is_any_of?(@real_parent, VALID_IMPORT_PARENTS)
+    if is_any_of?(@real_parent, INVALID_IMPORT_PARENTS)
       return "Import directives may not be used within control directives or mixins."
     end
     return if parent.is_a?(Sass::Tree::RootNode)
@@ -97,17 +98,17 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "Mixins may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
-  VALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode, Sass::Tree::MixinNode] + CONTROL_NODES
+  INVALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode]
   def invalid_prop_child?(parent, child)
-    unless is_any_of?(child, VALID_PROP_CHILDREN)
+    unless is_any_of?(child, INVALID_PROP_CHILDREN)
       "Illegal nesting: Only properties may be nested beneath properties."
     end
   end
 
-  VALID_PROP_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::PropNode,
-                        Sass::Tree::MixinDefNode, Sass::Tree::DirectiveNode]
+  INVALID_PROP_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::PropNode,
+                          Sass::Tree::MixinDefNode, Sass::Tree::DirectiveNode]
   def invalid_prop_parent?(parent, child)
-    unless is_any_of?(parent, VALID_PROP_PARENTS)
+    unless is_any_of?(parent, INVALID_PROP_PARENTS)
       "Properties are only allowed within rules, directives, or other properties." + child.pseudo_class_selector_message
     end
   end

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

@@ -32,7 +32,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       visit(child) +
         if nxt &&
             (child.is_a?(Sass::Tree::CommentNode) &&
-              child.line + child.lines + 1 == nxt.line) ||
+              child.line + child.value.count("\n") + 1 == nxt.line) ||
             (child.is_a?(Sass::Tree::ImportNode) && nxt.is_a?(Sass::Tree::ImportNode) &&
               child.line + 1 == nxt.line) ||
             (child.is_a?(Sass::Tree::VariableNode) && nxt.is_a?(Sass::Tree::VariableNode) &&
@@ -49,13 +49,8 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_comment(node)
-    value = node.value.map do |r|
-      next r if r.is_a?(String)
-      "\#{#{r.to_sass(@options)}}"
-    end.join
-
     content = if @format == :sass
-      content = value.gsub(/\*\/$/, '').rstrip
+      content = node.value.gsub(/\*\/$/, '').rstrip
       if content =~ /\A[ \t]/
         # Re-indent SCSS comments like this:
         #     /* foo
@@ -83,11 +78,11 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       content.gsub!(/^/, tab_str)
       content.rstrip + "\n"
     else
-      spaces = ('  ' * [@tabs - value[/^ */].size, 0].max)
+      spaces = ('  ' * [@tabs - node.value[/^ */].size, 0].max)
       content = if node.silent
-        value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
+        node.value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
       else
-        value
+        node.value
       end.gsub(/^/, spaces) + "\n"
       content
     end

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

@@ -53,10 +53,12 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Removes this node from the tree if it's a silent comment.
   def visit_comment(node)
     return [] if node.invisible?
-    check_for_loud_silent_comment node
-    check_for_comment_interp node
-    node.resolved_value = run_interp_no_strip(node.value)
-    node.resolved_value.gsub!(/\\([\\#])/, '\1')
+    if node.evaluated?
+      node.value.gsub!(/(^|[^\\])\#\{([^}]*)\}/) do |md|
+        $1+Sass::Script.parse($2, node.line, 0, node.options).perform(@environment).to_s
+      end
+      node.value = run_interp([Sass::Script::String.new(node.value)])
+    end
     node
   end
 
@@ -87,8 +89,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Runs SassScript interpolation in the selector,
   # and then parses the result into a {Sass::Selector::CommaSequence}.
   def visit_extend(node)
-    parser = Sass::SCSS::CssParser.new(run_interp(node.selector), node.filename, node.line)
-    node.resolved_selector = parser.parse_selector
+    parser = Sass::SCSS::CssParser.new(run_interp(node.selector), node.line)
+    node.resolved_selector = parser.parse_selector(node.filename)
     node
   end
 
@@ -140,7 +142,6 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
     @environment.push_frame(:filename => node.filename, :line => node.line)
     root = node.imported_file.to_tree
-    Sass::Tree::Visitors::CheckNesting.visit(root)
     node.children = root.children.map {|c| visit(c)}.flatten
     node
   rescue Sass::SyntaxError => e
@@ -224,13 +225,8 @@ END
   # Runs SassScript interpolation in the selector,
   # and then parses the result into a {Sass::Selector::CommaSequence}.
   def visit_rule(node)
-    parser = Sass::SCSS::StaticParser.new(run_interp(node.rule), node.filename, node.line)
-    node.parsed_rules ||= parser.parse_selector
-    if node.options[:trace_selectors]
-      @environment.push_frame(:filename => node.filename, :line => node.line)
-      node.stack_trace = @environment.stack_trace
-      @environment.pop_frame
-    end
+    parser = Sass::SCSS::StaticParser.new(run_interp(node.rule), node.line)
+    node.parsed_rules ||= parser.parse_selector(node.filename)
     yield
   end
 
@@ -247,10 +243,13 @@ END
     @environment.push_frame(:filename => node.filename, :line => node.line)
     res = node.expr.perform(@environment)
     res = res.value if res.is_a?(Sass::Script::String)
-    msg = "WARNING: #{res}\n         "
-    msg << @environment.stack_trace.join("\n         ")
-    # JRuby doesn't automatically add a newline for #warn
-    msg << (RUBY_PLATFORM =~ /java/ ? "\n\n" : "\n")
+    msg = "WARNING: #{res}\n"
+    @environment.stack.reverse.each_with_index do |entry, i|
+      msg << "        #{i == 0 ? "on" : "from"} line #{entry[:line]}" <<
+        " of #{entry[:filename] || "an unknown file"}"
+      msg << ", in `#{entry[:mixin]}'" if entry[:mixin]
+      msg << "\n"
+    end
     Sass::Util.sass_warn msg
     []
   ensure
@@ -276,18 +275,14 @@ END
 
   private
 
-  def run_interp_no_strip(text)
+  def run_interp(text)
     text.map do |r|
       next r if r.is_a?(String)
       val = r.perform(@environment)
       # Interpolated strings should never render with quotes
       next val.value if val.is_a?(Sass::Script::String)
       val.to_s
-    end.join
-  end
-
-  def run_interp(text)
-    run_interp_no_strip(text).strip
+    end.join.strip
   end
 
   def handle_include_loop!(node)
@@ -303,30 +298,4 @@ END
     end.join("\n")
     raise Sass::SyntaxError.new(msg)
   end
-
-  def check_for_loud_silent_comment(node)
-    return unless node.loud && node.silent
-    Sass::Util.sass_warn <<MESSAGE
-WARNING:
-On line #{node.line}#{" of '#{node.filename}'" if node.filename}
-`//` comments will no longer be allowed to use the `!` flag in Sass 3.2.
-Please change to `/*` comments.
-MESSAGE
-  end
-
-  def check_for_comment_interp(node)
-    return if node.loud
-    node.value.each do |e|
-      next unless e.is_a?(String)
-      e.scan(/(\\*)#\{/) do |esc|
-        Sass::Util.sass_warn <<MESSAGE if esc.first.size.even?
-WARNING:
-On line #{node.line}#{" of '#{node.filename}'" if node.filename}
-Comments will evaluate the contents of interpolations (\#{ ... }) in Sass 3.2.
-Please escape the interpolation by adding a backslash before the `#`.
-MESSAGE
-        return
-      end
-    end
-  end
 end