sass 3.3.0.alpha.256 → 3.3.0.alpha.353

data/lib/sass/source/range.rb

@@ -26,7 +26,7 @@ module Sass::Source
     # @param end_pos [Sass::Source::Position] See \{#end_pos}
     # @param file [String] See \{#file}
     # @param importer [Sass::Importers::Base] See \{#importer}
-    def initialize(start_pos, end_pos, file, importer=nil)
+    def initialize(start_pos, end_pos, file, importer = nil)
       @start_pos = start_pos
       @end_pos = end_pos
       @file = file

data/lib/sass/supports.rb

@@ -81,12 +81,12 @@ module Sass::Supports
 
     def left_parens(str)
       return "(#{str})" if @left.is_a?(Negation)
-      return str
+      str
     end
 
     def right_parens(str)
       return "(#{str})" if @right.is_a?(Negation) || @right.is_a?(Operator)
-      return str
+      str
     end
   end
 
@@ -127,7 +127,7 @@ module Sass::Supports
 
     def parens(str)
       return "(#{str})" if @condition.is_a?(Negation) || @condition.is_a?(Operator)
-      return str
+      str
     end
   end
 

data/lib/sass/tree/debug_node.rb

@@ -5,7 +5,7 @@ module Sass
     # @see Sass::Tree
     class DebugNode < Node
       # The expression to print.
-      # @return [Script::Tree::Node] 
+      # @return [Script::Tree::Node]
       attr_accessor :expr
 
       # @param expr [Script::Tree::Node] The expression to print

data/lib/sass/tree/function_node.rb

@@ -21,7 +21,8 @@ module Sass
       attr_accessor :splat
 
       # @param name [String] The function name
-      # @param args [Array<(Script::Tree::Node, Script::Tree::Node)>] The arguments for the function.
+      # @param args [Array<(Script::Tree::Node, Script::Tree::Node)>]
+      #   The arguments for the function.
       # @param splat [Script::Tree::Node] See \{#splat}
       def initialize(name, args, splat)
         @name = name

data/lib/sass/tree/if_node.rb

@@ -36,7 +36,7 @@ module Sass::Tree
     end
 
     def _dump(f)
-      Marshal.dump([self.expr, self.else, self.children])
+      Marshal.dump([expr, self.else, children])
     end
 
     def self._load(data)

data/lib/sass/tree/import_node.rb

@@ -51,9 +51,8 @@ module Sass
         end
 
         paths.each do |p|
-          if f = p.find(@imported_filename, options_for_importer)
-            return f
-          end
+          f = p.find(@imported_filename, options_for_importer)
+          return f if f
         end
 
         message = "File to import not found or unreadable: #{@imported_filename}.\n"
@@ -64,7 +63,7 @@ module Sass
         end
         raise SyntaxError.new(message)
       rescue SyntaxError => e
-        raise SyntaxError.new(e.message, :line => self.line, :filename => @filename)
+        raise SyntaxError.new(e.message, :line => line, :filename => @filename)
       end
 
       def options_for_importer

data/lib/sass/tree/prop_node.rb

@@ -99,7 +99,8 @@ module Sass::Tree
     def declaration(opts = {:old => @prop_syntax == :old}, fmt = :sass)
       name = self.name.map {|n| n.is_a?(String) ? n : "\#{#{n.to_sass(opts)}}"}.join
       if name[0] == ?:
-        raise Sass::SyntaxError.new("The \"#{name}: #{self.class.val_to_sass(value, opts)}\" hack is not allowed in the Sass indented syntax")
+        raise Sass::SyntaxError.new("The \"#{name}: #{self.class.val_to_sass(value, opts)}\"" +
+                                    " hack is not allowed in the Sass indented syntax")
       end
 
       old = opts[:old] && fmt == :sass
@@ -120,7 +121,8 @@ module Sass::Tree
     def check!
       if @options[:property_syntax] && @options[:property_syntax] != @prop_syntax
         raise Sass::SyntaxError.new(
-          "Illegal property syntax: can't use #{@prop_syntax} syntax when :property_syntax => #{@options[:property_syntax].inspect} is set.")
+          "Illegal property syntax: can't use #{@prop_syntax} syntax when " +
+          ":property_syntax => #{@options[:property_syntax].inspect} is set.")
       end
     end
 

data/lib/sass/tree/rule_node.rb

@@ -111,12 +111,13 @@ module Sass::Tree
 
     # A hash that will be associated with this rule in the CSS document
     # if the {file:SASS_REFERENCE.md#debug_info-option `:debug_info` option} is enabled.
-    # This data is used by e.g. [the FireSass Firebug extension](https://addons.mozilla.org/en-US/firefox/addon/103988).
+    # This data is used by e.g. [the FireSass Firebug
+    # extension](https://addons.mozilla.org/en-US/firefox/addon/103988).
     #
     # @return [{#to_s => #to_s}]
     def debug_info
       {:filename => filename && ("file://" + Sass::Util.escape_uri(File.expand_path(filename))),
-       :line => self.line}
+       :line => line}
     end
 
     # A rule node is invisible if it has only placeholder selectors.
@@ -131,7 +132,9 @@ module Sass::Tree
         # 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, '', nil, 1)
+        # rubocop:disable RescueModifier
         @parsed_rules = parser.parse_selector rescue nil
+        # rubocop:enable RescueModifier
       end
     end
   end

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

@@ -32,9 +32,9 @@ module Sass::Tree::Visitors
     # @param node [Tree::Node] The node to visit.
     # @return [Object] The return value of the `visit_*` method for this node.
     def visit(node)
-      method = "visit_#{node_name node}"
-      if self.respond_to?(method, true)
-        self.send(method, node) {visit_children(node)}
+      method = "visit_#{self.class.node_name node}"
+      if respond_to?(method, true)
+        send(method, node) {visit_children(node)}
       else
         visit_children(node)
       end
@@ -59,9 +59,9 @@ module Sass::Tree::Visitors
     #
     # @param [Tree::Node] node The node.
     # @return [String] The name.
-    def node_name(node)
-      @@node_names ||= {}
-      @@node_names[node.class.name] ||= node.class.name.gsub(NODE_NAME_RE, '\\1').downcase
+    def self.node_name(node)
+      @node_names ||= {}
+      @node_names[node.class.name] ||= node.class.name.gsub(NODE_NAME_RE, '\\1').downcase
     end
 
     # `yield`s, then runs the visitor on the `@else` clause if the node has one.

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

@@ -1,5 +1,6 @@
 # A visitor for checking that all nodes are properly nested.
 class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
+
   protected
 
   def initialize
@@ -7,9 +8,9 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   def visit(node)
-    if error = @parent && (
-        try_send("invalid_#{node_name @parent}_child?", @parent, node) ||
-        try_send("invalid_#{node_name node}_parent?", @parent, node))
+    if (error = @parent && (
+        try_send("invalid_#{self.class.node_name @parent}_child?", @parent, node) ||
+        try_send("invalid_#{self.class.node_name node}_parent?", @parent, node)))
       raise Sass::SyntaxError.new(error)
     end
     super
@@ -19,7 +20,7 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   CONTROL_NODES = [Sass::Tree::EachNode, Sass::Tree::ForNode, Sass::Tree::IfNode,
-    Sass::Tree::WhileNode, Sass::Tree::TraceNode]
+                   Sass::Tree::WhileNode, Sass::Tree::TraceNode]
   SCRIPT_NODES = [Sass::Tree::ImportNode] + CONTROL_NODES
   def visit_children(parent)
     old_parent = @parent
@@ -110,7 +111,9 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     end
   end
 
-  VALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode, Sass::Tree::MixinNode] + CONTROL_NODES
+  VALID_PROP_CHILDREN =  CONTROL_NODES + [Sass::Tree::CommentNode,
+                                          Sass::Tree::PropNode,
+                                          Sass::Tree::MixinNode]
   def invalid_prop_child?(parent, child)
     unless is_any_of?(child, VALID_PROP_CHILDREN)
       "Illegal nesting: Only properties may be nested beneath properties."
@@ -122,7 +125,8 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
                         Sass::Tree::MixinNode]
   def invalid_prop_parent?(parent, child)
     unless is_any_of?(parent, VALID_PROP_PARENTS)
-      "Properties are only allowed within rules, directives, mixin includes, or other properties." + child.pseudo_class_selector_message
+      "Properties are only allowed within rules, directives, mixin includes, or other properties." +
+        child.pseudo_class_selector_message
     end
   end
 
@@ -133,10 +137,10 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   private
 
   def is_any_of?(val, classes)
-    for c in classes
+    classes.each do |c|
       return true if val.is_a?(c)
     end
-    return false
+    false
   end
 
   def try_send(method, *args)
@@ -144,4 +148,3 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     send(method, *args)
   end
 end
-

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

@@ -23,7 +23,11 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   def visit_children(parent)
     @tabs += 1
     return @format == :sass ? "\n" : " {}\n" if parent.children.empty?
-    (@format == :sass ? "\n" : " {\n") + super.join.rstrip + (@format == :sass ? "\n" : "\n#{ @tab_chars * (@tabs-1)}}\n")
+    if @format == :sass
+      "\n"  + super.join.rstrip + "\n"
+    else
+      " {\n" + super.join.rstrip + "\n#{ @tab_chars * (@tabs - 1)}}\n"
+    end
   ensure
     @tabs -= 1
   end
@@ -52,7 +56,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   def visit_comment(node)
     value = interp_to_src(node.value)
-    content = if @format == :sass
+    if @format == :sass
       content = value.gsub(/\*\/$/, '').rstrip
       if content =~ /\A[ \t]/
         # Re-indent SCSS comments like this:
@@ -63,31 +67,27 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
         content.sub!(/\A([ \t]*)\/\*/, '/*\1')
       end
 
-      content =
-        unless content.include?("\n")
-          content
+      if content.include?("\n")
+        content.gsub!(%r{\n( \*|//)}, "\n  ")
+        spaces = content.scan(/\n( *)/).map {|s| s.first.size}.min
+        sep = node.type == :silent ? "\n//" : "\n *"
+        if spaces >= 2
+          content.gsub!(/\n  /, sep)
         else
-          content.gsub!(/\n( \*|\/\/)/, "\n  ")
-          spaces = content.scan(/\n( *)/).map {|s| s.first.size}.min
-          sep = node.type == :silent ? "\n//" : "\n *"
-          if spaces >= 2
-            content.gsub(/\n  /, sep)
-          else
-            content.gsub(/\n#{' ' * spaces}/, sep)
-          end
+          content.gsub!(/\n#{' ' * spaces}/, sep)
         end
+      end
 
       content.gsub!(/\A\/\*/, '//') if node.type == :silent
       content.gsub!(/^/, tab_str)
-      content.rstrip + "\n"
+      content = content.rstrip + "\n"
     else
       spaces = (@tab_chars * [@tabs - value[/^ */].size, 0].max)
       content = if node.type == :silent
-        value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
-      else
-        value
-      end.gsub(/^/, spaces) + "\n"
-      content
+                  value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
+                else
+                  value
+                end.gsub(/^/, spaces) + "\n"
     end
     content
   end
@@ -98,7 +98,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   def visit_directive(node)
     res = "#{tab_str}#{interp_to_src(node.value)}"
-    res.gsub!(/^@import \#\{(.*)\}([^}]*)$/, '@import \1\2');
+    res.gsub!(/^@import \#\{(.*)\}([^}]*)$/, '@import \1\2')
     return res + "#{semi}\n" unless node.has_children
     res + yield + "\n"
   end
@@ -109,7 +109,8 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_extend(node)
-    "#{tab_str}@extend #{selector_to_src(node.selector).lstrip}#{semi}#{" !optional" if node.optional?}\n"
+    "#{tab_str}@extend #{selector_to_src(node.selector).lstrip}#{semi}" +
+      "#{" !optional" if node.optional?}\n"
   end
 
   def visit_for(node)
@@ -131,9 +132,12 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   def visit_if(node)
     name =
-      if !@is_else; "if"
-      elsif node.expr; "else if"
-      else; "else"
+      if !@is_else
+        "if"
+      elsif node.expr
+        "else if"
+      else
+        "else"
       end
     @is_else = false
     str = "#{tab_str}@#{name}"
@@ -206,13 +210,14 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
       keywords = Sass::Util.hash_to_a(node.keywords).
         map {|k, v| "$#{dasherize(k)}: #{arg_to_sass[v]}"}.join(', ')
       if node.splat
-        splat = (args.empty? && keywords.empty?) ? "" : ", "
+        splat = args.empty? && keywords.empty? ? "" : ", "
         splat = "#{splat}#{arg_to_sass[node.splat]}..."
         splat = "#{splat}, #{node.kwarg_splat.inspect}..." if node.kwarg_splat
       end
       arglist = "(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords}#{splat})"
     end
-    "#{tab_str}#{@format == :sass ? '+' : '@include '}#{dasherize(node.name)}#{arglist}#{node.has_children ? yield : semi}\n"
+    "#{tab_str}#{@format == :sass ? '+' : '@include '}" +
+      "#{dasherize(node.name)}#{arglist}#{node.has_children ? yield : semi}\n"
   end
 
   def visit_content(node)
@@ -246,7 +251,8 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_variable(node)
-    "#{tab_str}$#{dasherize(node.name)}: #{node.expr.to_sass(@options)}#{' !default' if node.guarded}#{semi}\n"
+    "#{tab_str}$#{dasherize(node.name)}: #{node.expr.to_sass(@options)}" +
+      "#{' !default' if node.guarded}#{semi}\n"
   end
 
   def visit_warn(node)
@@ -280,7 +286,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   def media_interp_to_src(interp)
     Sass::Util.enum_with_index(interp).map do |r, i|
       next r if r.is_a?(String)
-      before, after = interp[i-1], interp[i+1]
+      before, after = interp[i - 1], interp[i + 1]
       if before.is_a?(String) && after.is_a?(String) &&
           ((before[-1] == ?( && after[0] == ?:) ||
            (before =~ /:\s*/ && after[0] == ?)))

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

@@ -81,7 +81,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
@@ -125,7 +125,7 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
 
       sel = sseq.members
       parent.resolved_rules.members.each do |member|
-        if !member.members.last.is_a?(Sass::Selector::SimpleSequence)
+        unless member.members.last.is_a?(Sass::Selector::SimpleSequence)
           raise Sass::SyntaxError.new("#{member} can't extend: invalid selector")
         end
 
@@ -195,7 +195,8 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   # and updates the indentation of the rule node based on the nesting level.
   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
+    # 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

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)

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

@@ -9,6 +9,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     end
 
     # @api private
+    # @comment
+    #   rubocop:disable MethodLength
     def perform_arguments(callable, args, keywords, splat)
       desc = "#{callable.type.capitalize} #{callable.name}"
       downcase_desc = "#{callable.type} #{callable.name}"
@@ -25,10 +27,12 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
           unknown_args = Sass::Util.array_minus(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.")
+            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 #{description} " +
+                                        "#{unknown_args.map {|name| "$#{name}"}.join ', '}.")
           end
         end
       rescue Sass::SyntaxError => keyword_exception
@@ -56,7 +60,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       env = Sass::Environment.new(callable.environment)
       callable.args.zip(args[0...callable.args.length]) do |(var, default), value|
         if value && keywords.include?(var.underscored_name)
-          raise Sass::SyntaxError.new("#{desc} was passed argument $#{var.name} both by position and by name.")
+          raise Sass::SyntaxError.new("#{desc} was passed argument $#{var.name} " +
+                                      "both by position and by name.")
         end
 
         value ||= keywords.delete(var.underscored_name)
@@ -73,7 +78,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       end
 
       yield env
-    rescue Exception => e
+    rescue StandardError => 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
@@ -111,7 +116,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
       kwarg_splat = kwarg_splat.perform(environment)
       unless kwarg_splat.is_a?(Sass::Script::Value::Map)
-        raise Sass::SyntaxError.new("Variable keyword arguments must be a map (was #{kwarg_splat.inspect}).")
+        raise Sass::SyntaxError.new("Variable keyword arguments must be a map " +
+                                    "(was #{kwarg_splat.inspect}).")
       end
 
       if splat.is_a?(Sass::Script::Value::ArgList)
@@ -128,10 +134,12 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       Sass::Util.map_keys(map.to_h) do |key|
         next key.value if key.is_a?(Sass::Script::Value::String)
         raise Sass::SyntaxError.new("Variable keyword argument map must have string keys.\n" +
-          "#{key.inspect} is not a string in #{map.inspect}.");
+          "#{key.inspect} is not a string in #{map.inspect}.")
       end
     end
   end
+  # @comment
+  #   rubocop:enable MethodLength
 
   protected
 
@@ -246,7 +254,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   def visit_function(node)
     env = Sass::Environment.new(@environment, node.options)
     @environment.set_local_function(node.name,
-      Sass::Callable.new(node.name, node.args, node.splat, env, node.children, !:has_content, "function"))
+      Sass::Callable.new(node.name, node.args, node.splat, env,
+                         node.children, !:has_content, "function"))
     []
   end
 
@@ -266,7 +275,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Returns a static DirectiveNode if this is importing a CSS file,
   # or parses and includes the imported Sass file.
   def visit_import(node)
-    if path = node.css_import?
+    if (path = node.css_import?)
       resolved_node = Sass::Tree::CssImportNode.resolved("url(#{path})")
       resolved_node.source_range = node.source_range
       return resolved_node
@@ -294,18 +303,22 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   def visit_mixindef(node)
     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"))
+      Sass::Callable.new(node.name, node.args, node.splat, env,
+                         node.children, node.has_content, "mixin"))
     []
   end
 
   # Runs a mixin.
   def visit_mixin(node)
     include_loop = true
-    handle_include_loop!(node) if @environment.stack.frames.any? {|f| f.is_mixin? && f.name == node.name}
+    if @environment.stack.frames.any? {|f| f.is_mixin? && f.name == node.name}
+      handle_include_loop!(node)
+    end
     include_loop = false
 
     @environment.stack.with_mixin(node.filename, node.line, node.name) do
-      raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin = @environment.mixin(node.name)
+      mixin = @environment.mixin(node.name)
+      raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin
 
       if node.children.any? && !mixin.has_content
         raise Sass::SyntaxError.new(%Q{Mixin "#{node.name}" does not accept a content block.})
@@ -333,10 +346,13 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   end
 
   def visit_content(node)
-    return [] unless content = @environment.content
+    content = @environment.content
+    return [] unless content
     @environment.stack.with_mixin(node.filename, node.line, '@content') do
       trace_node = Sass::Tree::TraceNode.from_node('@content', node)
-      with_environment(@environment.caller) {trace_node.children = content.map {|c| visit(c.dup)}.flatten}
+      with_environment(@environment.caller) do
+        trace_node.children = content.map {|c| visit(c.dup)}.flatten
+      end
       trace_node
     end
   rescue Sass::SyntaxError => e
@@ -362,8 +378,6 @@ 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_rule(node)
-    rule = node.rule
-    rule = rule.map {|e| e.is_a?(String) && e != ' ' ? e.strip : e} if node.style == :compressed
     parser = Sass::SCSS::StaticParser.new(run_interp(node.rule),
       node.filename, node.options[:importer], node.line)
     node.parsed_rules ||= parser.parse_selector
@@ -455,7 +469,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   def handle_include_loop!(node)
     msg = "An @include loop has been found:"
     content_count = 0
-    mixins = @environment.stack.frames.select {|f| f.is_mixin?}.reverse.map {|f| f.name}.select do |name|
+    mixins = @environment.stack.frames.select {|f| f.is_mixin?}.reverse!.map! {|f| f.name}
+    mixins = mixins.select do |name|
       if name == '@content'
         content_count += 1
         false