sass 3.2.7 → 3.3.0.rc.1

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

@@ -27,11 +27,20 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   # Keeps track of the current parent node.
   def visit_children(parent)
     with_parent parent do
-      parent.children = super.flatten
+      parent.children = visit_children_without_parent(parent)
       parent
     end
   end
 
+  # Like {#visit\_children}, but doesn't set {#parent}.
+  #
+  # @param node [Sass::Tree::Node]
+  # @return [Array<Sass::Tree::Node>] the flattened results of
+  #   visiting all the children of `node`
+  def visit_children_without_parent(node)
+    node.children.map {|c| visit(c)}.flatten
+  end
+
   MERGEABLE_DIRECTIVES = [Sass::Tree::MediaNode]
 
   # Runs a block of code with the current parent node
@@ -81,7 +90,7 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
         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]
+        node.children = node.children[0..index] + imports + node.children[index + 1..-1]
       else
         node.children = imports + node.children
       end
@@ -94,7 +103,7 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   end
 
   # A simple struct wrapping up information about a single `@extend` instance. A
-  # single [ExtendNode] can have multiple Extends if either the parent node or
+  # single {ExtendNode} can have multiple Extends if either the parent node or
   # the extended selector is a comma sequence.
   #
   # @attr extender [Sass::Selector::Sequence]
@@ -124,12 +133,12 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
       end
 
       sel = sseq.members
-      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")
+      parent.resolved_rules.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] = Extend.new(seq, sel, node, @parent_directives.dup, :not_found)
+        @extends[sel] = Extend.new(member, sel, node, @parent_directives.dup, :not_found)
       end
     end
 
@@ -138,8 +147,7 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
 
   # Modifies exception backtraces to include the imported file.
   def visit_import(node)
-    # Don't use #visit_children to avoid adding the import node to the list of parents.
-    node.children.map {|c| visit(c)}.flatten
+    visit_children_without_parent(node)
   rescue Sass::SyntaxError => e
     e.modify_backtrace(:filename => node.children.first.filename)
     e.add_backtrace(:filename => node.filename, :line => node.line)
@@ -150,28 +158,46 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   # and merges it with other `@media` directives.
   def visit_media(node)
     yield unless bubble(node)
-    media = node.children.select {|c| c.is_a?(Sass::Tree::MediaNode)}
-    node.children.reject! {|c| c.is_a?(Sass::Tree::MediaNode)}
-    media = media.select {|n| n.resolved_query = n.resolved_query.merge(node.resolved_query)}
-    (node.children.empty? ? [] : [node]) + media
+
+    bubbled = node.children.select do |n|
+      n.is_a?(Sass::Tree::AtRootNode) || n.is_a?(Sass::Tree::MediaNode)
+    end
+    node.children -= bubbled
+
+    bubbled = bubbled.map do |n|
+      next visit(n) if n.is_a?(Sass::Tree::AtRootNode)
+      # Otherwise, n should be a MediaNode.
+      next [] unless n.resolved_query = n.resolved_query.merge(node.resolved_query)
+      n
+    end.flatten
+
+    (node.children.empty? ? [] : [node]) + bubbled
   end
 
   # Bubbles the `@supports` directive up through RuleNodes.
   def visit_supports(node)
-    yield unless bubble(node)
-    node
+    visit_directive(node) {yield}
   end
 
   # Asserts that all the traced children are valid in their new location.
   def visit_trace(node)
-    # Don't use #visit_children to avoid adding the trace node to the list of parents.
-    node.children.map {|c| visit(c)}.flatten
+    visit_children_without_parent(node)
   rescue Sass::SyntaxError => e
     e.modify_backtrace(:mixin => node.name, :filename => node.filename, :line => node.line)
     e.add_backtrace(:filename => node.filename, :line => node.line)
     raise e
   end
 
+  # Bubbles a directive up through RuleNodes.
+  def visit_directive(node)
+    return yield unless node.has_children
+    yield unless (bubbled = bubble(node))
+    at_roots = node.children.select {|n| n.is_a?(Sass::Tree::AtRootNode)}
+    node.children -= at_roots
+    at_roots.map! {|n| visit(n)}.flatten
+    (bubbled && node.children.empty? ? [] : [node]) + at_roots
+  end
+
   # Converts nested properties into flat properties
   # and updates the indentation of the prop node based on the nesting level.
   def visit_prop(node)
@@ -191,18 +217,16 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
     result
   end
 
-  # Resolves parent references and nested selectors,
-  # and updates the indentation of the rule node based on the nesting level.
+  # Updates the indentation of the rule node based on the nesting
+  # level. The selectors were resolved in {Perform}.
   def visit_rule(node)
-    parent_resolved_rules = parent.is_a?(Sass::Tree::RuleNode) ? parent.resolved_rules : nil
-    # It's possible for resolved_rules to be set if we've duplicated this node during @media bubbling
-    node.resolved_rules ||= node.parsed_rules.resolve_parent_refs(parent_resolved_rules)
-
     yield
 
     rules = node.children.select {|c| c.is_a?(Sass::Tree::RuleNode) || c.bubbles?}
     props = node.children.reject {|c| c.is_a?(Sass::Tree::RuleNode) || c.bubbles? || c.invisible?}
 
+    rules.map {|c| c.is_a?(Sass::Tree::AtRootNode) ? visit(c) : c}.flatten
+
     unless props.empty?
       node.children = props
       rules.each {|r| r.tabs += 1} if node.style == :nested
@@ -214,6 +238,22 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
     rules
   end
 
+  def visit_atroot(node)
+    if @parent_directives.any? {|n| node.exclude_node?(n)}
+      return node if node.exclude_node?(parent)
+
+      new_rule = parent.dup
+      new_rule.children = node.children
+      node.children = [new_rule]
+      return node
+    end
+
+    results = visit_children_without_parent(node)
+    results.each {|n| n.tabs += node.tabs}
+    results.last.group_end = node.group_end unless results.empty?
+    results
+  end
+
   private
 
   def bubble(node)

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

@@ -1,5 +1,6 @@
 # A visitor for copying the full structure of a Sass tree.
 class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
+
   protected
 
   def visit(node)
@@ -22,7 +23,7 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
   end
 
   def visit_extend(node)
-    node.selector = node.selector.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.selector = node.selector.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     yield
   end
 
@@ -55,7 +56,7 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
   end
 
   def visit_prop(node)
-    node.name = node.name.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.name = node.name.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     node.value = node.value.deep_copy
     yield
   end
@@ -66,7 +67,7 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
   end
 
   def visit_rule(node)
-    node.rule = node.rule.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.rule = node.rule.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     yield
   end
 
@@ -86,12 +87,12 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
   end
 
   def visit_directive(node)
-    node.value = node.value.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.value = node.value.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     yield
   end
 
   def visit_media(node)
-    node.query = node.query.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.query = node.query.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     yield
   end
 

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

@@ -49,7 +49,7 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
   def self.check_extends_fired!(extends)
     extends.each_value do |ex|
       next if ex.result == :succeeded || ex.node.optional?
-      warn = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
+      message = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
       reason =
         if ex.result == :not_found
           "The selector \"#{ex.target.join}\" was not found."
@@ -57,12 +57,12 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
           "No selectors matching \"#{ex.target.join}\" could be unified with \"#{ex.extender}\"."
         end
 
-      Sass::Util.sass_warn <<WARN
-WARNING on line #{ex.node.line}#{" of #{ex.node.filename}" if ex.node.filename}: #{warn}
-  #{reason}
-  This will be an error in future releases of Sass.
-  Use "@extend #{ex.target.join} !optional" if the extend should be able to fail.
-WARN
+      # 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}
+#{reason}
+Use "@extend #{ex.target.join} !optional" if the extend should be able to fail.
+MESSAGE
     end
   end
 end