rubocop 0.30.1 → 0.31.0

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

@@ -62,9 +62,7 @@ module RuboCop
           m = range.source.match(/=\s*(\S+)/)
           rest = m ? m.captures[0] : ''
           replacement = style == :space ? ' = ' : '='
-          @corrections << lambda do |corrector|
-            corrector.replace(range, replacement + rest)
-          end
+          ->(corrector) { corrector.replace(range, replacement + rest) }
         end
       end
     end

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

@@ -41,7 +41,8 @@ module RuboCop
         end
 
         def unary_operation?(node)
-          whole, selector = node.loc.expression, node.loc.selector
+          whole = node.loc.expression
+          selector = node.loc.selector
           return unless selector
           operator?(selector) && whole.begin_pos == selector.begin_pos
         end
@@ -79,7 +80,7 @@ module RuboCop
         end
 
         def autocorrect(range)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             case range.source
             when /\*\*/
               corrector.replace(range, '**')

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

@@ -51,7 +51,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_before(range, ' ')

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

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

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

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

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

@@ -23,7 +23,8 @@ module RuboCop
             return
           end
 
-          left_brace, right_brace = node.loc.begin, node.loc.end
+          left_brace = node.loc.begin
+          right_brace = node.loc.end
 
           check_inside(node, left_brace, right_brace)
         end
@@ -58,7 +59,8 @@ module RuboCop
 
         def braces_with_contents_inside(node, inner, sb)
           _method, args, _body = *node
-          left_brace, right_brace = node.loc.begin, node.loc.end
+          left_brace = node.loc.begin
+          right_brace = node.loc.end
           args_delimiter = args.loc.begin # Can be ( | or nil.
 
           if inner =~ /^\S/
@@ -148,7 +150,7 @@ module RuboCop
         end
 
         def autocorrect(range)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             case range.source
             when /\s/ then corrector.remove(range)
             when '{}' then corrector.replace(range, '{ }')

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

@@ -68,7 +68,7 @@ module RuboCop
         end
 
         def autocorrect(range)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             # It is possible that BracesAroundHashParameters will remove the
             # braces while this cop inserts spaces. This can lead to unwanted
             # changes to the inspected code. If we replace the brace with a

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

@@ -48,7 +48,7 @@ module RuboCop
           operator = node.loc.operator.source
           operator_escaped = operator.gsub(/\./, '\.')
 
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.replace(
               node.loc.expression,
               expression

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

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

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

@@ -24,7 +24,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             current_name = node.loc.expression.source
             corrector.replace(node.loc.expression,
                               current_name.gsub(/["']/, ''))

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

@@ -40,7 +40,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             _block_method, _block_args, block_body = *node
             _receiver, method_name, _args = *block_body
 

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

@@ -25,7 +25,7 @@ module RuboCop
         private
 
         def autocorrect(range)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.replace(range, range.source.gsub(/\t/, '  '))
           end
         end

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

@@ -43,7 +43,7 @@ module RuboCop
           return false if processed_source.tokens.empty?
 
           extra = sb.source[processed_source.tokens.last.pos.end_pos..-1]
-          extra.strip.start_with?('__END__')
+          extra && extra.strip.start_with?('__END__')
         end
 
         def message(wanted_blank_lines, blank_lines)
@@ -64,7 +64,7 @@ module RuboCop
         end
 
         def autocorrect(range)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.replace(range, style == :final_newline ? "\n" : "\n\n")
           end
         end

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

@@ -159,7 +159,7 @@ module RuboCop
         end
 
         def autocorrect(range)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             case range.source
             when ',' then corrector.remove(range)
             else          corrector.insert_after(range, ',')

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

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+module RuboCop
+  module Cop
+    module Style
+      # This cop checks for extra underscores in variable assignment.
+      #
+      # @example
+      #   # bad
+      #   a, b, _ = foo()
+      #   a, b, _, = foo()
+      #   a, _, _ = foo()
+      #   a, _, _, = foo()
+      #
+      #   #good
+      #   a, b, = foo()
+      #   a, = foo()
+      class TrailingUnderscoreVariable < Cop
+        include SurroundingSpace
+
+        MSG = 'Do not use trailing `_`s in parallel assignment.'
+
+        def on_masgn(node)
+          left, = *node
+          variables = *left
+          first_offense = find_first_offense(variables)
+
+          return if first_offense.nil?
+
+          range =
+            Parser::Source::Range.new(node.loc.expression.source_buffer,
+                                      first_offense.loc.expression.begin_pos,
+                                      variables.last.loc.expression.end_pos)
+          add_offense(node, range)
+        end
+
+        def autocorrect(node)
+          left, right = *node
+          variables = *left
+          first_offense = find_first_offense(variables)
+
+          end_position =
+            if first_offense.loc.expression == variables.first.loc.expression
+              right.loc.expression.begin_pos
+            else
+              node.loc.operator.begin_pos
+            end
+
+          range =
+            Parser::Source::Range.new(node.loc.expression.source_buffer,
+                                      first_offense.loc.expression.begin_pos,
+                                      end_position)
+
+          ->(corrector) { corrector.remove(range) unless range.nil? }
+        end
+
+        private
+
+        def find_first_offense(variables)
+          first_offense = nil
+
+          variables.reverse_each do |variable|
+            break unless variable.children.first == :_
+            first_offense = variable
+          end
+
+          first_offense
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -121,8 +121,6 @@ module RuboCop
             autocorrect_instance(node)
           elsif node.type == :defs && node.children.first.type == :self
             autocorrect_class(node)
-          else
-            fail CorrectionNotPossible
           end
         end
 
@@ -130,14 +128,11 @@ module RuboCop
           method_name, args, body = *node
           unless names_match?(method_name, body) &&
                  (kind = trivial_accessor_kind(method_name, args, body))
-            fail CorrectionNotPossible
+            return
           end
 
-          @corrections << lambda do |corrector|
-            corrector.replace(
-              node.loc.expression,
-              accessor(kind, method_name)
-            )
+          lambda do |corrector|
+            corrector.replace(node.loc.expression, accessor(kind, method_name))
           end
         end
 
@@ -145,10 +140,10 @@ module RuboCop
           _, method_name, args, body = *node
           unless names_match?(method_name, body) &&
                  (kind = trivial_accessor_kind(method_name, args, body))
-            fail CorrectionNotPossible
+            return
           end
 
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             indent = ' ' * node.loc.column
             corrector.replace(
               node.loc.expression,

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

@@ -25,7 +25,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             src = node.loc.begin.source
             corrector.replace(node.loc.begin, src.tr('W', 'w'))
           end

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

@@ -47,7 +47,7 @@ module RuboCop
 
         def autocorrect(node)
           delimiter = node.loc.expression.source =~ /^%Q[^"]+$|'/ ? '"' : "'"
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.replace(node.loc.begin, delimiter)
             corrector.replace(node.loc.end, delimiter)
           end

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

@@ -30,10 +30,8 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
-            expr = node.loc.expression
-            corrector.replace(expr, "{#{expr.source}}")
-          end
+          expr = node.loc.expression
+          ->(corrector) { corrector.replace(expr, "{#{expr.source}}") }
         end
 
         def var_nodes(nodes)

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

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

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

@@ -28,13 +28,11 @@ module RuboCop
         end
 
         def autocorrect(node)
-          @corrections << lambda do |corrector|
-            condition_node, = *node
-            end_of_condition_range = condition_node.loc.expression.end
-            do_range = node.loc.begin
-            whitespaces_and_do_range = end_of_condition_range.join(do_range)
-            corrector.remove(whitespaces_and_do_range)
-          end
+          condition_node, = *node
+          end_of_condition_range = condition_node.loc.expression.end
+          do_range = node.loc.begin
+          whitespaces_and_do_range = end_of_condition_range.join(do_range)
+          ->(corrector) { corrector.remove(whitespaces_and_do_range) }
         end
       end
     end

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

@@ -19,12 +19,10 @@ module RuboCop
 
         def autocorrect(node)
           cond, body = *node
-          @corrections << lambda do |corrector|
-            oneline = "#{body.loc.expression.source} " \
-                      "#{node.loc.keyword.source} " +
-                      cond.loc.expression.source
-            corrector.replace(node.loc.expression, oneline)
-          end
+          oneline = "#{body.loc.expression.source} " \
+                    "#{node.loc.keyword.source} " +
+                    cond.loc.expression.source
+          ->(corrector) { corrector.replace(node.loc.expression, oneline) }
         end
 
         private

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

@@ -64,7 +64,7 @@ module RuboCop
           contents = node.children.map { |n| source_for(n) }.join(' ')
           char = @interpolated ? 'W' : 'w'
 
-          @corrections << lambda do |corrector|
+          lambda do |corrector|
             corrector.replace(node.loc.expression, "%#{char}(#{contents})")
           end
         end

data/lib/rubocop/cop/util.rb

@@ -147,7 +147,8 @@ module RuboCop
 
         go_left, go_right = directions(side)
 
-        begin_pos, end_pos = range.begin_pos, range.end_pos
+        begin_pos = range.begin_pos
+        end_pos = range.end_pos
         begin_pos = move_pos(src, begin_pos, -1, go_left, /,/)
         end_pos = move_pos(src, end_pos, 1, go_right, /,/)
 
@@ -161,7 +162,8 @@ module RuboCop
 
         go_left, go_right = directions(side)
 
-        begin_pos, end_pos = range.begin_pos, range.end_pos
+        begin_pos = range.begin_pos
+        end_pos = range.end_pos
         begin_pos = move_pos(src, begin_pos, -1, go_left, /[ \t]/)
         begin_pos = move_pos(src, begin_pos, -1, go_left && with_newline, /\n/)
         end_pos = move_pos(src, end_pos, 1, go_right, /[ \t]/)
@@ -189,7 +191,8 @@ module RuboCop
       end
 
       def within_node?(inner, outer)
-        o, i = outer.loc.expression, inner.loc.expression
+        o = outer.loc.expression
+        i = inner.loc.expression
         i.begin_pos >= o.begin_pos && i.end_pos <= o.end_pos
       end
 

data/lib/rubocop/formatter/progress_formatter.rb

@@ -6,11 +6,12 @@ module RuboCop
     # letters for files with problems in the them. In the end it
     # appends the regular report data in the clang style format.
     class ProgressFormatter < ClangStyleFormatter
+      include TextUtil
+
       def started(target_files)
         super
         @offenses_for_files = {}
-        file_phrase = target_files.count == 1 ? 'file' : 'files'
-        output.puts "Inspecting #{target_files.count} #{file_phrase}"
+        output.puts "Inspecting #{pluralize(target_files.size, 'file')}"
       end
 
       def file_finished(file, offenses)

data/lib/rubocop/formatter/simple_text_formatter.rb

@@ -70,7 +70,7 @@ module RuboCop
 
       def count_stats(offenses)
         @total_offense_count += offenses.count
-        @total_correction_count += offenses.select(&:corrected?).count
+        @total_correction_count += offenses.count(&:corrected?)
       end
 
       def smart_path(path)