lib/rubocop/cop/style/infinite_loop.rb in rubocop-0.46.0 vs lib/rubocop/cop/style/infinite_loop.rb in rubocop-0.47.0

@@ -14,78 +14,77 @@
       #   # good
       #   loop do
       #     work
       #   end
       class InfiniteLoop < Cop
+        LEADING_SPACE = /\A(\s*)/
+
         MSG = 'Use `Kernel#loop` for infinite loops.'.freeze
 
         def on_while(node)
-          condition, = *node
-          return unless condition.truthy_literal?
+          return unless node.condition.truthy_literal?
 
           add_offense(node, :keyword)
         end
 
         def on_until(node)
-          condition, = *node
-          return unless condition.falsey_literal?
+          return unless node.condition.falsey_literal?
 
           add_offense(node, :keyword)
         end
 
         alias on_while_post on_while
         alias on_until_post on_until
 
+        private
+
         def autocorrect(node)
           if node.while_post_type? || node.until_post_type?
             replace_begin_end_with_modifier(node)
           elsif node.modifier_form?
             replace_source(node.source_range, modifier_replacement(node))
           else
             replace_source(non_modifier_range(node), 'loop do')
           end
         end
 
-        private
-
         def replace_begin_end_with_modifier(node)
-          _, body = *node
-
           lambda do |corrector|
-            corrector.replace(body.loc.begin, 'loop do')
-            corrector.remove(body.loc.end.end.join(node.source_range.end))
+            corrector.replace(node.body.loc.begin, 'loop do')
+            corrector.remove(node.body.loc.end.end.join(node.source_range.end))
           end
         end
 
         def replace_source(range, replacement)
-          ->(corrector) { corrector.replace(range, replacement) }
+          lambda do |corrector|
+            corrector.replace(range, replacement)
+          end
         end
 
         def modifier_replacement(node)
-          _, body = *node
           if node.single_line?
-            'loop { ' + body.source + ' }'
+            'loop { ' + node.body.source + ' }'
           else
-            indentation = body.loc.expression.source_line[/\A(\s*)/]
-            "loop do\n" + indentation +
-              body.source.gsub(/^/, ' ' * configured_indentation_width) +
-              "\n#{indentation}end"
+            indentation = node.body.loc.expression.source_line[LEADING_SPACE]
+
+            ['loop do', node.body.source.gsub(/^/, configured_indent),
+             'end'].join("\n#{indentation}")
           end
         end
 
         def non_modifier_range(node)
-          condition_node, = *node
           start_range = node.loc.keyword.begin
-          end_range = if node.loc.begin
+          end_range = if node.do?
                         node.loc.begin.end
                       else
-                        condition_node.source_range.end
+                        node.condition.source_range.end
                       end
+
           start_range.join(end_range)
         end
 
-        def configured_indentation_width
-          config.for_cop('IndentationWidth')['Width']
+        def configured_indent
+          ' ' * config.for_cop('IndentationWidth')['Width']
         end
       end
     end
   end
 end