rubocop 0.50.0 → 0.51.0

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

@@ -9,7 +9,7 @@ module RuboCop
               'Use `Kernel#at_exit` instead.'.freeze
 
         def on_postexe(node)
-          add_offense(node, :keyword)
+          add_offense(node, location: :keyword)
         end
       end
     end

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

@@ -27,7 +27,7 @@ module RuboCop
         def on_send(node)
           even_odd_candidate?(node) do |_base_number, method, arg|
             replacement_method = replacement_method(arg, method)
-            add_offense(node, :expression, format(MSG, replacement_method))
+            add_offense(node, message: format(MSG, replacement_method))
           end
         end
 

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

@@ -13,7 +13,9 @@ module RuboCop
 
         def on_for(node)
           if style == :each
-            add_offense(node, :keyword, 'Prefer `each` over `for`.') do
+            msg = 'Prefer `each` over `for`.'
+
+            add_offense(node, location: :keyword, message: msg) do
               opposite_style_detected
             end
           else
@@ -39,7 +41,9 @@ module RuboCop
         def incorrect_style_detected(method)
           end_pos = method.source_range.end_pos
           range = range_between(end_pos - EACH_LENGTH, end_pos)
-          add_offense(range, range, 'Prefer `for` over `each`.') do
+          msg = 'Prefer `for` over `each`.'
+
+          add_offense(range, location: range, message: msg) do
             opposite_style_detected
           end
         end

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

@@ -17,9 +17,9 @@ module RuboCop
 
         def_node_matcher :formatter, <<-PATTERN
         {
-          (send nil ${:sprintf :format} _ _ ...)
+          (send nil? ${:sprintf :format} _ _ ...)
           (send {str dstr} $:% ... )
-          (send !nil $:% {array hash})
+          (send !nil? $:% {array hash})
         }
         PATTERN
 
@@ -29,7 +29,8 @@ module RuboCop
 
             return if detected_style == style
 
-            add_offense(node, :selector, message(detected_style))
+            add_offense(node, location: :selector,
+                              message: message(detected_style))
           end
         end
 

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

@@ -50,7 +50,8 @@ module RuboCop
               correct_style_detected
             else
               style_detected(detected_style)
-              add_offense(node, token_range, message(detected_style))
+              add_offense(node, location: token_range,
+                                message: message(detected_style))
             end
           end
         end

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

@@ -79,7 +79,7 @@ module RuboCop
           last_special_comment = last_special_comment(processed_source)
           range = source_range(processed_source.buffer, 0, 0)
 
-          add_offense(last_special_comment, range)
+          add_offense(last_special_comment, location: range)
         end
 
         def unnecessary_comment_offense(processed_source)
@@ -87,8 +87,8 @@ module RuboCop
             frozen_string_literal_comment(processed_source)
 
           add_offense(frozen_string_literal_comment,
-                      frozen_string_literal_comment.pos,
-                      MSG_UNNECESSARY)
+                      location: frozen_string_literal_comment.pos,
+                      message: MSG_UNNECESSARY)
         end
       end
     end

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

@@ -62,7 +62,7 @@ module RuboCop
         def check(node)
           global_var, = *node
 
-          add_offense(node, :name) unless allowed_var?(global_var)
+          add_offense(node, location: :name) unless allowed_var?(global_var)
         end
       end
     end

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

@@ -57,7 +57,7 @@ module RuboCop
         def on_if(node)
           return if accepted_form?(node) || !contains_guard_clause?(node)
 
-          add_offense(node, :keyword)
+          add_offense(node, location: :keyword)
         end
 
         private
@@ -65,7 +65,7 @@ module RuboCop
         def check_ending_if(node)
           return if accepted_form?(node, true) || !min_body_length?(node)
 
-          add_offense(node, :keyword)
+          add_offense(node, location: :keyword)
         end
 
         def accepted_form?(node, ending = false)

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

@@ -164,9 +164,8 @@ module RuboCop
         def check(pairs, delim, msg)
           pairs.each do |pair|
             if pair.delimiter == delim
-              add_offense(pair,
-                          pair.source_range.begin.join(pair.loc.operator),
-                          msg) do
+              location = pair.source_range.begin.join(pair.loc.operator)
+              add_offense(pair, location: location, message: msg) do
                 opposite_style_detected
               end
             else

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

@@ -37,7 +37,7 @@ module RuboCop
 
           return unless else_branch && else_branch.if_type? && else_branch.if?
 
-          add_offense(else_branch, :keyword)
+          add_offense(else_branch, location: :keyword)
         end
       end
     end

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

@@ -19,7 +19,8 @@ module RuboCop
         def on_if(node)
           return unless eligible_node?(node)
 
-          add_offense(node, :keyword, format(MSG, node.keyword))
+          add_offense(node, location: :keyword,
+                            message: format(MSG, node.keyword))
         end
 
         private

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

@@ -30,7 +30,8 @@ module RuboCop
         def on_if(node)
           return unless node.modifier_form? && node.body.if_type?
 
-          add_offense(node, :keyword, format(MSG, node.keyword))
+          add_offense(node, location: :keyword,
+                            message: format(MSG, node.keyword))
         end
       end
     end

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

@@ -19,11 +19,11 @@ module RuboCop
               'rather than just a message.'.freeze
 
         def_node_matcher :implicit_runtime_error_raise_or_fail,
-                         '(send nil ${:raise :fail} {str dstr})'
+                         '(send nil? ${:raise :fail} {str dstr})'
 
         def on_send(node)
           implicit_runtime_error_raise_or_fail(node) do |method|
-            add_offense(node, :expression, format(MSG, method))
+            add_offense(node, message: format(MSG, method))
           end
         end
       end

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

@@ -23,13 +23,13 @@ module RuboCop
         def on_while(node)
           return unless node.condition.truthy_literal?
 
-          add_offense(node, :keyword)
+          add_offense(node, location: :keyword)
         end
 
         def on_until(node)
           return unless node.condition.falsey_literal?
 
-          add_offense(node, :keyword)
+          add_offense(node, location: :keyword)
         end
 
         alias on_while_post on_while

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

@@ -57,9 +57,8 @@ module RuboCop
             return if negated?(node)
 
             add_offense(node,
-                        :expression,
-                        format(MSG, method: method,
-                                    inverse: inverse_methods[method]))
+                        message: format(MSG, method: method,
+                                             inverse: inverse_methods[method]))
           end
         end
 
@@ -73,9 +72,8 @@ module RuboCop
             # can cause auto-correction to apply improper corrections.
             ignore_node(block)
             add_offense(node,
-                        :expression,
-                        format(MSG, method: method,
-                                    inverse: inverse_blocks[method]))
+                        message: format(MSG, method: method,
+                                             inverse: inverse_blocks[method]))
           end
         end
 

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

@@ -70,7 +70,7 @@ module RuboCop
           }
         }.freeze
 
-        def_node_matcher :lambda_node?, '(block $(send nil :lambda) ...)'
+        def_node_matcher :lambda_node?, '(block $(send nil? :lambda) ...)'
 
         def on_block(node)
           return unless node.lambda?
@@ -80,8 +80,8 @@ module RuboCop
           return unless offending_selector?(node, selector)
 
           add_offense(node,
-                      node.send_node.source_range,
-                      message(node, selector))
+                      location: node.send_node.source_range,
+                      message: message(node, selector))
         end
 
         private

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

@@ -67,7 +67,7 @@ module RuboCop
 
           return unless eligible_next_successor?(next_successor)
 
-          add_offense(operator.pos, operator.pos)
+          add_offense(operator.pos, location: operator.pos)
         end
 
         def eligible_successor?(successor)

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

@@ -22,7 +22,7 @@ module RuboCop
           return unless !node.arguments? && node.parenthesized?
           return if same_name_assignment?(node)
 
-          add_offense(node, :begin)
+          add_offense(node, location: :begin)
         end
 
         private

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

@@ -35,7 +35,7 @@ module RuboCop
           range = range_between(receiver.loc.end.begin_pos,
                                 node.source_range.end_pos)
 
-          add_offense(nil, range)
+          add_offense(nil, location: range)
         end
       end
     end

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

@@ -59,13 +59,15 @@ module RuboCop
         end
 
         def missing_parentheses(node)
-          add_offense(node, node.arguments.source_range, MSG_MISSING) do
+          location = node.arguments.source_range
+
+          add_offense(node, location: location, message: MSG_MISSING) do
             unexpected_style_detected(:require_no_parentheses)
           end
         end
 
         def unwanted_parentheses(args)
-          add_offense(args, :expression, MSG_PRESENT) do
+          add_offense(args, message: MSG_PRESENT) do
             unexpected_style_detected(:require_parentheses)
           end
         end

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

@@ -21,7 +21,8 @@ module RuboCop
           min_max_candidate(node) do |receiver|
             offender = offending_range(node)
 
-            add_offense(node, offender, message(offender, receiver))
+            add_offense(node, location: offender,
+                              message: message(offender, receiver))
           end
         end
         alias on_return on_array

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      # This cop checks that `include`, `extend` and `prepend` exists at
+      # the top level.
+      # Using these at the top level affects the behavior of `Object`.
+      # There will not be using `include`, `extend` and `prepend` at
+      # the top level. Let's use it inside `class` or `module`.
+      #
+      # @example
+      #   # bad
+      #   include M
+      #
+      #   class C
+      #   end
+      #
+      #   # bad
+      #   extend M
+      #
+      #   class C
+      #   end
+      #
+      #   # bad
+      #   prepend M
+      #
+      #   class C
+      #   end
+      #
+      #   # good
+      #   class C
+      #     include M
+      #   end
+      #
+      #   # good
+      #   class C
+      #     extend M
+      #   end
+      #
+      #   # good
+      #   class C
+      #     prepend M
+      #   end
+      class MixinUsage < Cop
+        MSG = '`%<statement>s` is used at the top level. Use inside `class` ' \
+              'or `module`.'.freeze
+
+        def_node_matcher :include_statement, <<-PATTERN
+          (send nil? ${:include :extend :prepend}
+            (const nil? _))
+        PATTERN
+
+        def on_send(node)
+          return unless (statement = include_statement(node))
+          return unless top_level_node?(node)
+
+          add_offense(node, message: format(MSG, statement: statement))
+        end
+
+        private
+
+        def top_level_node?(node)
+          if node.parent.parent.nil?
+            node.sibling_index.zero?
+          else
+            top_level_node?(node.parent)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -32,8 +32,8 @@ module RuboCop
         EXTEND_SELF_MSG =
           'Use `extend self` instead of `module_function`.'.freeze
 
-        def_node_matcher :module_function_node?, '(send nil :module_function)'
-        def_node_matcher :extend_self_node?, '(send nil :extend self)'
+        def_node_matcher :module_function_node?, '(send nil? :module_function)'
+        def_node_matcher :extend_self_node?, '(send nil? :extend self)'
 
         def on_module(node)
           _name, body = *node

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

@@ -25,7 +25,7 @@ module RuboCop
             range = range_between(receiver.loc.end.begin_pos,
                                   node.send_node.source_range.end_pos)
 
-            add_offense(nil, range)
+            add_offense(nil, location: range)
 
             # Done. If there are more blocks in the chain, they will be
             # found by subsequent calls to on_block.

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

@@ -25,7 +25,8 @@ module RuboCop
         def on_normal_if_unless(node)
           return unless non_modifier_then?(node)
 
-          add_offense(node, :begin, format(MSG, node.keyword))
+          add_offense(node, location: :begin,
+                            message: format(MSG, node.keyword))
         end
 
         private

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

@@ -46,7 +46,7 @@ module RuboCop
 
           return unless bad_rhs?(rhs)
 
-          add_offense(rhs, node.source_range)
+          add_offense(rhs, location: node.source_range)
         end
 
         private

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

@@ -32,7 +32,7 @@ module RuboCop
           return if part_of_ignored_node?(node)
           return unless modifier?(node) && modifier?(node.parent)
 
-          add_offense(node, :keyword)
+          add_offense(node, location: :keyword)
           ignore_node(node)
         end
 

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

@@ -21,7 +21,9 @@ module RuboCop
           node.each_child_node(:send) do |nested|
             next if allowed_omission?(nested)
 
-            add_offense(nested, nested.source_range, format(MSG, nested.source))
+            add_offense(nested,
+                        location: nested.source_range,
+                        message: format(MSG, nested.source))
           end
         end
 

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

@@ -51,7 +51,8 @@ module RuboCop
 
           offending_node = offense_node(node.body)
 
-          add_offense(offending_node, offense_location(offending_node))
+          add_offense(offending_node,
+                      location: offense_location(offending_node))
         end
 
         def ends_with_condition?(body)