rubocop 0.30.1 → 0.31.0

data/lib/rubocop/cop/style/multiline_block_chain.rb

@@ -24,7 +24,8 @@ module RuboCop
 
             # The begin and end could also be braces, but we call the
             # variables do... and end...
-            do_kw_loc, end_kw_loc = receiver.loc.begin, receiver.loc.end
+            do_kw_loc = receiver.loc.begin
+            end_kw_loc = receiver.loc.end
             next if do_kw_loc.line == end_kw_loc.line
 
             range =

data/lib/rubocop/cop/style/multiline_block_layout.rb

@@ -50,14 +50,17 @@ module RuboCop
           # with arguments and the expression start on the same line.
           _block_start, args, last_expression = node.children
 
-          if !args.children.empty? && do_loc.line != args.loc.end.line
-            add_offense_for_expression(node, args, ARG_MSG)
-          else
-            return unless last_expression
-            expression_loc = last_expression.loc
-            return unless do_loc.line == expression_loc.line
-            add_offense_for_expression(node, last_expression, MSG)
+          unless args.children.empty?
+            line = args.loc.end.nil? ? args.loc.line : args.loc.end.line
+            if do_loc.line != line
+              add_offense_for_expression(node, args, ARG_MSG)
+            end
           end
+
+          return unless last_expression
+          expression_loc = last_expression.loc
+          return unless do_loc.line == expression_loc.line
+          add_offense_for_expression(node, last_expression, MSG)
         end
 
         def add_offense_for_expression(node, expr, msg)
@@ -70,7 +73,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             _method, args, block_body = *node
             unless args.children.empty? ||
                    args.loc.end.line == node.loc.begin.line

data/lib/rubocop/cop/style/multiline_if_then.rb

@@ -30,7 +30,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.remove(range_with_surrounding_space(node.loc.begin,
                                                           :left))
           end

data/lib/rubocop/cop/style/multiline_operation_indentation.rb

@@ -29,7 +29,8 @@ module RuboCop
           return unless receiver
           return if method_name == :[] # Don't check parameters inside [].
 
-          lhs, rhs = left_hand_side(receiver), right_hand_side(node)
+          lhs = left_hand_side(receiver)
+          rhs = right_hand_side(node)
           range = offending_range(node, lhs, rhs, style)
           check(range, node, lhs, rhs)
         end
@@ -148,7 +149,7 @@ module RuboCop
 
             case a.type
             when :if, :while, :until then condition, = *a
-            when :for                then _, collection, _ = *a
+            when :for                then _, collection, = *a
             end
 
             if condition || collection

data/lib/rubocop/cop/style/multiline_ternary_operator.rb

@@ -9,12 +9,13 @@ module RuboCop
               ' use `if`/`unless` instead.'
 
         def on_if(node)
+          _condition, _if_branch, else_branch = *node
           loc = node.loc
 
           # discard non-ternary ops
           return unless loc.respond_to?(:question)
 
-          add_offense(node, :expression) if loc.line != loc.colon.line
+          add_offense(node, :expression) if loc.line != else_branch.loc.line
         end
       end
     end

data/lib/rubocop/cop/style/negated_if.rb

@@ -28,7 +28,7 @@ module RuboCop
         private
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             condition, _body, _rest = *node
             # look inside parentheses around the condition
             condition = condition.children.first while condition.type == :begin

data/lib/rubocop/cop/style/negated_while.rb

@@ -28,10 +28,10 @@ module RuboCop
         private
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             condition, _body, _rest = *node
             # Look inside parentheses around the condition, if any.
-            condition, _ = *condition while condition.type == :begin
+            condition, = *condition while condition.type == :begin
             # Unwrap the negated portion of the condition (a send node).
             pos_condition, _method, = *condition
             corrector.replace(

data/lib/rubocop/cop/style/next.rb

@@ -21,6 +21,7 @@ module RuboCop
       class Next < Cop
         include IfNode
         include ConfigurableEnforcedStyle
+        include MinBodyLength
 
         MSG = 'Use `next` to skip iteration.'
         ENUMERATORS = [:collect, :detect, :downto, :each, :find, :find_all,
@@ -56,17 +57,6 @@ module RuboCop
 
         private
 
-        def min_body_length?(node)
-          (node.loc.end.line - node.loc.keyword.line) > min_body_length
-        end
-
-        def min_body_length
-          length = cop_config['MinBodyLength'] || 1
-          return length if length.is_a?(Integer) && length > 0
-
-          fail 'MinBodyLength needs to be a positive integer!'
-        end
-
         def enumerator?(method_name)
           ENUMERATORS.include?(method_name) || /\Aeach_/.match(method_name)
         end

data/lib/rubocop/cop/style/nil_comparison.rb

@@ -29,11 +29,9 @@ module RuboCop
         private
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
-            expr = node.loc.expression
-            new_code = expr.source.sub(/\s*={2,3}\s*nil/, '.nil?')
-            corrector.replace(expr, new_code)
-          end
+          expr = node.loc.expression
+          new_code = expr.source.sub(/\s*={2,3}\s*nil/, '.nil?')
+          ->(corrector) { corrector.replace(expr, new_code) }
         end
       end
     end

data/lib/rubocop/cop/style/non_nil_check.rb

@@ -84,7 +84,7 @@ module RuboCop
         end
 
         def autocorrect_comparison(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             expr = node.loc.expression
             new_code =
               if include_semantic_changes?
@@ -97,7 +97,7 @@ module RuboCop
         end
 
         def autocorrect_non_nil(node, inner_node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             receiver, _method, _args = *inner_node
             if receiver
               corrector.replace(node.loc.expression,

data/lib/rubocop/cop/style/not.rb

@@ -22,11 +22,9 @@ module RuboCop
         private
 
         def correction(node)
-          lambda do |corrector|
-            old_source = node.loc.expression.source
-            new_source = old_source.sub(/not\s+/, '!')
-            corrector.replace(node.loc.expression, new_source)
-          end
+          old_source = node.loc.expression.source
+          new_source = old_source.sub(/not\s+/, '!')
+          ->(corrector) { corrector.replace(node.loc.expression, new_source) }
         end
       end
     end

data/lib/rubocop/cop/style/numeric_literals.rb

@@ -46,11 +46,8 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
-            corrector.replace(
-              node.loc.expression,
-              format_number(node)
-            )
+          lambda do |corrector|
+            corrector.replace(node.loc.expression, format_number(node))
           end
         end
 

data/lib/rubocop/cop/style/parentheses_around_condition.rb

@@ -61,7 +61,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.remove(node.loc.begin)
             corrector.remove(node.loc.end)
           end

data/lib/rubocop/cop/style/percent_literal_delimiters.rb

@@ -55,7 +55,7 @@ module RuboCop
             expression_indentation + expression + closing_newline +
             closing_indentation + closing_delimiter + reg_opt
 
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.replace(node.loc.expression, corrected_source)
           end
         end

data/lib/rubocop/cop/style/percent_q_literals.rb

@@ -39,7 +39,7 @@ module RuboCop
         def autocorrect(node)
           src = node.loc.expression.source
 
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.replace(node.loc.expression, corrected(src))
           end
         end

data/lib/rubocop/cop/style/perl_backrefs.rb

@@ -13,7 +13,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             backref, = *node
             parent_type = node.parent ? node.parent.type : nil
             if [:dstr, :xstr, :regexp].include?(parent_type)

data/lib/rubocop/cop/style/proc.rb

@@ -22,9 +22,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
-            corrector.replace(node.loc.expression, 'proc')
-          end
+          ->(corrector) { corrector.replace(node.loc.expression, 'proc') }
         end
       end
     end

data/lib/rubocop/cop/style/redundant_begin.rb

@@ -36,7 +36,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             child = node.children.first
 
             begin_indent = node.loc.column

data/lib/rubocop/cop/style/redundant_exception.rb

@@ -29,14 +29,12 @@ module RuboCop
 
         # switch `raise RuntimeError, 'message'` to `raise 'message'`
         def autocorrect(node)
-          @corrections << lambda do |corrector|
-            start_range = node.loc.expression.begin
-            no_comma = range_with_surrounding_comma(node.loc.expression.end,
-                                                    :right)
-            comma_range = start_range.join(no_comma)
-            final_range = range_with_surrounding_space(comma_range, :right)
-            corrector.replace(final_range, '')
-          end
+          start_range = node.loc.expression.begin
+          no_comma = range_with_surrounding_comma(node.loc.expression.end,
+                                                  :right)
+          comma_range = start_range.join(no_comma)
+          final_range = range_with_surrounding_space(comma_range, :right)
+          ->(corrector) { corrector.replace(final_range, '') }
         end
       end
     end

data/lib/rubocop/cop/style/redundant_return.rb

@@ -28,7 +28,7 @@ module RuboCop
         private
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             if node.children.size > 1
               kids = node.children.map { |child| child.loc.expression }
               corrector.insert_before(kids.first, '[')

data/lib/rubocop/cop/style/redundant_self.rb

@@ -103,7 +103,7 @@ module RuboCop
 
         def autocorrect(node)
           receiver, _method_name, *_args = *node
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.remove(receiver.loc.expression)
             corrector.remove(node.loc.dot)
           end
@@ -112,7 +112,7 @@ module RuboCop
         private
 
         def on_argument(node)
-          name, _ = *node
+          name, = *node
           @local_variables << name
         end
 

data/lib/rubocop/cop/style/regexp_literal.rb

@@ -97,7 +97,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          fail CorrectionNotPossible if contains_slash?(node)
+          return if contains_slash?(node)
 
           if slash_literal?(node)
             replacement = ['%r', ''].zip(preferred_delimiters).map(&:join)
@@ -105,7 +105,7 @@ module RuboCop
             replacement = %w(/ /)
           end
 
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.replace(node.loc.begin, replacement.first)
             corrector.replace(node.loc.end, replacement.last)
           end

data/lib/rubocop/cop/style/self_assignment.rb

@@ -84,7 +84,7 @@ module RuboCop
         end
 
         def apply_autocorrect(node, rhs, operator, new_rhs)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.insert_before(node.loc.operator, operator)
             corrector.replace(rhs.loc.expression, new_rhs.loc.expression.source)
           end

data/lib/rubocop/cop/style/semicolon.rb

@@ -55,8 +55,8 @@ module RuboCop
         end
 
         def autocorrect(range)
-          fail CorrectionNotPossible unless range
-          @corrections << ->(corrector) { corrector.remove(range) }
+          return unless range
+          ->(corrector) { corrector.remove(range) }
         end
       end
     end

data/lib/rubocop/cop/style/signal_exception.rb

@@ -34,7 +34,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             name =
               case style
               when :semantic then command?(:raise, node) ? 'fail' : 'raise'

data/lib/rubocop/cop/style/single_line_methods.rb

@@ -32,7 +32,7 @@ module RuboCop
           eol_comment = processed_source.comments.find do |c|
             c.loc.line == node.loc.expression.line
           end
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             if body.type == :begin
               body.children.each do |part|
                 break_line_before(part.loc.expression, node, corrector, 1)

data/lib/rubocop/cop/style/single_space_before_first_arg.rb

@@ -33,7 +33,7 @@ module RuboCop
         end
 
         def autocorrect(range)
-          @corrections << ->(corrector) { corrector.replace(range, ' ') }
+          ->(corrector) { corrector.replace(range, ' ') }
         end
       end
     end

data/lib/rubocop/cop/style/space_after_colon.rb

@@ -30,9 +30,7 @@ module RuboCop
         end
 
         def autocorrect(range)
-          @corrections << lambda do |corrector|
-            corrector.insert_after(range, ' ')
-          end
+          ->(corrector) { corrector.insert_after(range, ' ') }
         end
       end
     end

data/lib/rubocop/cop/style/space_after_control_keyword.rb

@@ -27,9 +27,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
-            corrector.insert_after(node.loc.keyword, ' ')
-          end
+          ->(corrector) { corrector.insert_after(node.loc.keyword, ' ') }
         end
       end
     end

data/lib/rubocop/cop/style/space_after_method_name.rb

@@ -30,9 +30,7 @@ module RuboCop
         end
 
         def autocorrect(pos_before_left_paren)
-          @corrections << lambda do |corrector|
-            corrector.remove(pos_before_left_paren)
-          end
+          ->(corrector) { corrector.remove(pos_before_left_paren) }
         end
       end
     end

data/lib/rubocop/cop/style/space_after_not.rb

@@ -25,7 +25,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             receiver, _method_name, *_args = *node
             space_range =
               Parser::Source::Range.new(node.loc.selector.source_buffer,

data/lib/rubocop/cop/style/space_around_block_parameters.rb

@@ -17,7 +17,8 @@ module RuboCop
 
         def on_block(node)
           _method, args, body = *node
-          opening_pipe, closing_pipe = args.loc.begin, args.loc.end
+          opening_pipe = args.loc.begin
+          closing_pipe = args.loc.end
           return unless !args.children.empty? && opening_pipe
 
           check_inside_pipes(args.children, opening_pipe, closing_pipe)
@@ -37,25 +38,42 @@ module RuboCop
         end
 
         def check_inside_pipes(args, opening_pipe, closing_pipe)
-          first, last = args.first.loc.expression, args.last.loc.expression
-
           if style == :no_space
-            check_no_space(opening_pipe.end_pos, first.begin_pos,
-                           'Space before first')
-            check_no_space(last.end_pos, closing_pipe.begin_pos,
-                           'Space after last')
+            check_no_space_style_inside_pipes(args, opening_pipe, closing_pipe)
           elsif style == :space
-            check_space(opening_pipe.end_pos, first.begin_pos, first,
-                        'before first block parameter')
-            check_space(last.end_pos, closing_pipe.begin_pos, last,
-                        'after last block parameter')
-            check_no_space(opening_pipe.end_pos, first.begin_pos - 1,
-                           'Extra space before first')
-            check_no_space(last.end_pos + 1, closing_pipe.begin_pos,
-                           'Extra space after last')
+            check_space_style_inside_pipes(args, opening_pipe, closing_pipe)
           end
         end
 
+        def check_no_space_style_inside_pipes(args, opening_pipe, closing_pipe)
+          first = args.first.loc.expression
+          last = args.last.loc.expression
+
+          check_no_space(opening_pipe.end_pos, first.begin_pos,
+                         'Space before first')
+          check_no_space(last_end_pos_inside_pipes(last.end_pos),
+                         closing_pipe.begin_pos, 'Space after last')
+        end
+
+        def check_space_style_inside_pipes(args, opening_pipe, closing_pipe)
+          first = args.first.loc.expression
+          last = args.last.loc.expression
+          last_end_pos = last_end_pos_inside_pipes(last.end_pos)
+
+          check_space(opening_pipe.end_pos, first.begin_pos, first,
+                      'before first block parameter')
+          check_space(last_end_pos, closing_pipe.begin_pos, last,
+                      'after last block parameter')
+          check_no_space(opening_pipe.end_pos, first.begin_pos - 1,
+                         'Extra space before first')
+          check_no_space(last_end_pos + 1, closing_pipe.begin_pos,
+                         'Extra space after last')
+        end
+
+        def last_end_pos_inside_pipes(pos)
+          processed_source.buffer.source[pos] == ',' ? pos + 1 : pos
+        end
+
         def check_each_arg(args)
           args.children[1..-1].each do |arg|
             expr = arg.loc.expression
@@ -79,7 +97,7 @@ module RuboCop
         end
 
         def autocorrect(range)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             case range.source
             when /^\s+$/ then corrector.remove(range)
             else              corrector.insert_after(range, ' ')