RubyGems - rubocop - Versions diffs - 0.43.0 → 0.44.0 - Mend

rubocop 0.43.0 → 0.44.0

Potentially problematic release.

This version of rubocop might be problematic. Click here for more details.

Files changed (430) hide show

data/lib/rubocop/cop/style/empty_line_between_defs.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/empty_lines.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'set'

data/lib/rubocop/cop/style/empty_lines_around_access_modifier.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -8,7 +7,8 @@ module RuboCop
       class EmptyLinesAroundAccessModifier < Cop
         include AccessModifierNode
-        MSG = 'Keep a blank line before and after `%s`.'.freeze
+        MSG_AFTER = 'Keep a blank line after `%s`.'.freeze
+        MSG_BEFORE_AND_AFTER = 'Keep a blank line before and after `%s`.'.freeze
         def on_send(node)
           return unless modifier_node?(node)
@@ -49,13 +49,13 @@ module RuboCop
         end
         def previous_line_empty?(previous_line)
-          block_start?(previous_line.lstrip) ||
-            class_def?(previous_line.lstrip) ||
+          block_start?(previous_line) ||
+            class_def?(previous_line) ||
             previous_line.blank?
         end
         def next_line_empty?(next_line)
-          body_end?(next_line.lstrip) || next_line.blank?
+          body_end?(next_line) || next_line.blank?
         end
         def empty_lines_around?(node)
@@ -68,7 +68,7 @@ module RuboCop
         end
         def class_def?(line)
-          line.start_with?('class', 'module')
+          line =~ /^\s*(class|module)/
         end
         def block_start?(line)
@@ -76,11 +76,18 @@ module RuboCop
         end
         def body_end?(line)
-          line.start_with?('end')
+          line =~ /^\s*end/
         end
         def message(node)
-          format(MSG, node.loc.selector.source)
+          previous_line = processed_source[node.loc.line - 2]
+          if block_start?(previous_line) ||
+             class_def?(previous_line)
+            format(MSG_AFTER, node.loc.selector.source)
+          else
+            format(MSG_BEFORE_AND_AFTER, node.loc.selector.source)
+          end
         end
       end
     end

data/lib/rubocop/cop/style/empty_lines_around_block_body.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/empty_lines_around_class_body.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/empty_lines_around_method_body.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/empty_lines_around_module_body.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/empty_literal.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/encoding.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/end_block.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/end_of_line.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/even_odd.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/extra_spacing.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'set'
@@ -141,15 +140,17 @@ module RuboCop
         end
         # Returns an array of ranges that should not be reported. It's the
-        # extra spaces between the keys and values in a hash, since those are
-        # handled by the Style/AlignHash cop.
+        # extra spaces between the keys and values in a multiline hash,
+        # since those are handled by the Style/AlignHash cop.
         def ignored_ranges(ast)
           return [] unless ast
           @ignored_ranges ||= on_node(:pair, ast).map do |pair|
+            next if pair.parent.single_line?
             key, value = *pair
             key.source_range.end_pos...value.source_range.begin_pos
-          end
+          end.compact
         end
         def aligned_comments?(token)

data/lib/rubocop/cop/style/file_name.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'pathname'

data/lib/rubocop/cop/style/first_array_element_line_break.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/first_hash_element_line_break.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/first_method_argument_line_break.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/first_method_parameter_line_break.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/first_parameter_indentation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/flip_flop.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/for.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/format_string.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/frozen_string_literal_comment.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/global_vars.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/guard_clause.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -39,13 +38,12 @@ module RuboCop
       class GuardClause < Cop
         include IfNode
         include MinBodyLength
+        include OnMethodDef
         MSG = 'Use a guard clause instead of wrapping the code inside a ' \
               'conditional expression.'.freeze
-        def on_def(node)
-          _, _, body = *node
+        def on_method_def(_node, _method_name, _args, body)
           return unless body
           if body.if_type?

data/lib/rubocop/cop/style/hash_syntax.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/identical_conditional_branches.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/if_inside_else.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/if_unless_modifier.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/if_with_semicolon.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/implicit_runtime_error.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/indent_array.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/indent_assignment.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/indent_hash.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/indentation_consistency.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/indentation_width.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/infinite_loop.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/initial_indentation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/inline_comment.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/lambda.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/lambda_call.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/leading_comment_space.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/line_end_concatenation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -40,7 +39,7 @@ module RuboCop
           # Include any trailing whitespace so we don't create a syntax error.
           operator_range = range_with_surrounding_space(operator_range,
                                                         :right,
-                                                        !:with_newline)
+                                                        false)
           one_more_char = operator_range.resize(operator_range.size + 1)
           # Don't create a double backslash at the end of the line, in case
           # there already was a backslash after the concatenation operator.

data/lib/rubocop/cop/style/method_call_parentheses.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/method_called_on_do_end_block.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/method_def_parentheses.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/method_missing.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/method_name.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/missing_else.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/module_function.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/multiline_array_brace_layout.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/multiline_assignment_layout.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/multiline_hash_brace_layout.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/multiline_memoization.rb ADDED

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+module RuboCop
+  module Cop
+    module Style
+      # This cop checks that multiline memoizations are wrapped in a `begin`
+      # and `end` block.
+      #
+      # @example
+      #
+      #   @bad
+      #   foo ||= (
+      #     bar
+      #     baz
+      #   )
+      #
+      #   @good
+      #   foo ||= begin
+      #     bar
+      #     baz
+      #   end
+      class MultilineMemoization < Cop
+        MSG = 'Wrap multiline memoization blocks in `begin` and `end`.'.freeze
+        def on_or_asgn(node)
+          _lhs, rhs = *node
+          return unless rhs.multiline? && rhs.begin_type?
+          add_offense(rhs, node.source_range, MSG)
+        end
+        private
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.replace(node.loc.begin, 'begin')
+            corrector.replace(node.loc.end, 'end')
+          end
+        end
+      end
+    end
+  end
+end