rubocop 0.58.2 → 0.59.0

data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb

@@ -71,6 +71,7 @@ module RuboCop
 
         def on_array(node)
           return unless node.square_brackets?
+
           left, right = array_brackets(node)
           if empty_brackets?(left, right)
             return empty_offenses(node, left, right, EMPTY_MSG)
@@ -125,6 +126,7 @@ module RuboCop
         def end_has_own_line?(token)
           line, col = line_and_column_for(token)
           return true if col == -1
+
           processed_source.lines[line][0..col].delete(' ').empty?
         end
 

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

@@ -88,7 +88,7 @@ module RuboCop
             # brace plus space (rather than just inserting a space), then any
             # removal of the same brace will give us a clobbering error. This
             # in turn will make RuboCop fall back on cop-by-cop
-            # auto-correction.  Problem solved.
+            # auto-correction. Problem solved.
             case range.source
             when /\s/ then corrector.remove(range)
             when '{' then corrector.replace(range, '{ ')

data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb

@@ -65,9 +65,11 @@ module RuboCop
         def on_send(node)
           return if node.multiline?
           return unless bracket_method?(node)
+
           tokens = tokens(node)
           left_token = left_ref_bracket(node, tokens)
           return unless left_token
+
           right_token = closing_bracket(tokens, left_token)
 
           if empty_brackets?(left_token, right_token)

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

@@ -32,6 +32,7 @@ module RuboCop
           processed_source.lines.each.with_index(1) do |line, lineno|
             match = line.match(/^([^\t]*)\t+/)
             next unless match
+
             prefix = match.captures[0]
             col = prefix.length
             next if in_string_literal?(str_ranges, lineno, col)

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

@@ -49,6 +49,7 @@ module RuboCop
 
         def extract_heredoc_ranges(ast)
           return [] unless ast
+
           ast.each_node(:str, :dstr, :xstr).select(&:heredoc?).map do |node|
             body = node.location.heredoc_body
             (body.first_line...body.last_line)

data/lib/rubocop/cop/lint/deprecated_class_methods.rb

@@ -69,6 +69,7 @@ module RuboCop
           DEPRECATED_METHODS_OBJECT.each do |data|
             next unless data.class_nodes.include?(node.receiver)
             next unless node.method?(data.deprecated_method)
+
             yield data
           end
         end

data/lib/rubocop/cop/lint/duplicate_methods.rb

@@ -138,6 +138,7 @@ module RuboCop
 
         def found_instance_method(node, name)
           return unless (scope = node.parent_module_name)
+
           if scope =~ /\A#<Class:(.*)>\Z/
             found_method(node, "#{Regexp.last_match(1)}.#{name}")
           else
@@ -147,7 +148,12 @@ module RuboCop
 
         def found_method(node, method_name)
           if @definitions.key?(method_name)
-            loc = node.send_type? ? node.loc.selector : node.loc.keyword
+            loc = case node.type
+                  when :def, :defs
+                    node.loc.keyword.join(node.loc.name)
+                  else
+                    node.loc.expression
+                  end
             message = message_for_dup(node, method_name)
 
             add_offense(node, location: loc, message: message)
@@ -174,6 +180,7 @@ module RuboCop
           args.each do |arg|
             name = sym_name(arg)
             next unless name
+
             found_instance_method(node, name) if readable
             found_instance_method(node, "#{name}=") if writable
           end
@@ -193,6 +200,7 @@ module RuboCop
               end
 
               break if namespace.nil?
+
               namespace, mod_name = *namespace
             end
           end

data/lib/rubocop/cop/lint/format_parameter_mismatch.rb

@@ -48,6 +48,7 @@ module RuboCop
           num_of_format_args, num_of_expected_fields = count_matches(node)
 
           return false if num_of_format_args == :unknown
+
           matched_arguments_count?(num_of_expected_fields, num_of_format_args)
         end
 

data/lib/rubocop/cop/lint/ineffective_access_modifier.rb

@@ -104,6 +104,7 @@ module RuboCop
               modifier = child if access_modifier?(child)
             when :defs
               next if correct_visibility?(child, modifier, ignored_methods)
+
               yield child, modifier
             when :kwbegin
               ineffective_modifier(child, ignored_methods, modifier, &block)

data/lib/rubocop/cop/lint/interpolation_check.rb

@@ -22,9 +22,11 @@ module RuboCop
 
         def on_str(node)
           return if heredoc?(node)
+
           parent = node.parent
           return if parent && (parent.dstr_type? || parent.regexp_type?)
           return unless node.source.scrub =~ /(?<!\\)#\{.*\}/
+
           add_offense(node)
         end
 

data/lib/rubocop/cop/lint/literal_as_condition.rb

@@ -67,6 +67,7 @@ module RuboCop
 
         def on_send(node)
           return unless node.negation_method?
+
           check_for_literal(node)
         end
 
@@ -98,12 +99,8 @@ module RuboCop
         end
 
         def check_node(node)
-          return unless node
-
-          if node.keyword_bang?
-            receiver, = *node
-
-            handle_node(receiver)
+          if node.send_type? && node.prefix_bang?
+            handle_node(node.receiver)
           elsif LOGICAL_OPERATOR_NODES.include?(node.type)
             node.each_child_node { |op| handle_node(op) }
           elsif node.begin_type? && node.children.one?

data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb

@@ -57,6 +57,7 @@ module RuboCop
               # This has to remain a strict inequality to handle
               # the case when max_range is Float::INFINITY
               next if line_range.max - line_range.min < max_range + 2
+
               range = source_range(processed_source.buffer,
                                    line_range.min,
                                    (0..0))

data/lib/rubocop/cop/lint/nested_method_definition.rb

@@ -74,6 +74,7 @@ module RuboCop
             elsif child.defs_type?
               subject, = *child
               next if subject.lvar_type?
+
               yield child
             elsif !scoping_method_call?(child)
               find_nested_defs(child, &block)

data/lib/rubocop/cop/lint/rescue_exception.rb

@@ -30,6 +30,7 @@ module RuboCop
 
         def on_resbody(node)
           return unless node.children.first
+
           rescue_args = node.children.first.children
           return unless rescue_args.any? { |a| targets_exception?(a) }
 

data/lib/rubocop/cop/lint/rescue_type.rb

@@ -44,6 +44,7 @@ module RuboCop
         def on_resbody(node)
           rescued, _, _body = *node
           return if rescued.nil?
+
           exceptions = *rescued
           invalid_exceptions = invalid_exceptions(exceptions)
           return if invalid_exceptions.empty?

data/lib/rubocop/cop/lint/safe_navigation_chain.rb

@@ -4,8 +4,8 @@ module RuboCop
   module Cop
     module Lint
       # The safe navigation operator returns nil if the receiver is
-      # nil.  If you chain an ordinary method call after a safe
-      # navigation operator, it raises NoMethodError.  We should use a
+      # nil. If you chain an ordinary method call after a safe
+      # navigation operator, it raises NoMethodError. We should use a
       # safe navigation operator after a safe navigation operator.
       # This cop checks for the problem outlined above.
       #

data/lib/rubocop/cop/lint/safe_navigation_consistency.rb

@@ -36,6 +36,7 @@ module RuboCop
         def on_csend(node)
           return unless node.parent &&
                         AST::Node::OPERATOR_KEYWORDS.include?(node.parent.type)
+
           check(node)
         end
 
@@ -77,6 +78,7 @@ module RuboCop
                    AST::Node::OPERATOR_KEYWORDS.include?(parent.parent.type)))
             return node
           end
+
           top_conditional_ancestor(parent)
         end
 

data/lib/rubocop/cop/lint/script_permission.rb

@@ -39,6 +39,7 @@ module RuboCop
           return if Platform.windows?
           return unless processed_source.start_with?(SHEBANG)
           return if executable?(processed_source)
+
           comment = processed_source.comments[0]
           message = format_message_from(processed_source)
           add_offense(comment, message: message)

data/lib/rubocop/cop/lint/shadowed_argument.rb

@@ -83,6 +83,9 @@ module RuboCop
 
         def check_argument(argument)
           return unless argument.method_argument? || argument.block_argument?
+          # Block local variables, i.e., variables declared after ; inside
+          # |...| aren't really arguments.
+          return if argument.explicit_block_local_variable?
 
           shadowing_assignment(argument) do |node|
             message = format(MSG, argument: argument.name)

data/lib/rubocop/cop/lint/shadowed_exception.rb

@@ -51,6 +51,7 @@ module RuboCop
 
         def on_rescue(node)
           return if rescue_modifier?(node)
+
           _body, *rescues, _else = *node
           rescued_groups = rescues.each_with_object([]) do |group, exceptions|
             rescue_group, = *group
@@ -151,6 +152,7 @@ module RuboCop
           klasses = *rescue_group
           klasses.map do |klass|
             next unless klass.const_type?
+
             klass.source
           end.compact
         end

data/lib/rubocop/cop/lint/unneeded_cop_disable_directive.rb

@@ -215,6 +215,7 @@ module RuboCop
         def matching_range(haystack, needle)
           offset = (haystack.source =~ Regexp.new(Regexp.escape(needle)))
           return unless offset
+
           offset += haystack.begin_pos
           Parser::Source::Range.new(haystack.source_buffer, offset,
                                     offset + needle.size)

data/lib/rubocop/cop/lint/unneeded_cop_enable_directive.rb

@@ -40,6 +40,7 @@ module RuboCop
 
         def investigate(processed_source)
           return if processed_source.blank?
+
           offenses = processed_source.comment_config.extra_enabled_comments
           offenses.each do |comment, name|
             add_offense(

data/lib/rubocop/cop/lint/unneeded_require_statement.rb

@@ -33,6 +33,7 @@ module RuboCop
 
         def on_send(node)
           return unless unnecessary_require_statement?(node)
+
           add_offense(node)
         end
 

data/lib/rubocop/cop/lint/unneeded_splat_expansion.rb

@@ -50,7 +50,7 @@ module RuboCop
       #     baz
       #   end
       class UnneededSplatExpansion < Cop
-        MSG = 'Unnecessary splat expansion.'.freeze
+        MSG = 'Replace splat expansion with comma separated values.'.freeze
         ARRAY_PARAM_MSG = 'Pass array contents as separate arguments.'.freeze
         PERCENT_W = '%w'.freeze
         PERCENT_CAPITAL_W = '%W'.freeze

data/lib/rubocop/cop/lint/unreachable_code.rb

@@ -63,6 +63,7 @@ module RuboCop
 
         def flow_expression?(node)
           return true if flow_command?(node)
+
           case node.type
           when :begin, :kwbegin
             expressions = *node
@@ -87,6 +88,7 @@ module RuboCop
           else_branch = node.else_branch
           return false unless else_branch
           return false unless flow_expression?(else_branch)
+
           node.when_branches.all? do |branch|
             branch.body && flow_expression?(branch.body)
           end

data/lib/rubocop/cop/lint/useless_assignment.rb

@@ -123,6 +123,7 @@ module RuboCop
 
         def variable_like_method_invocation?(node)
           return false unless node.send_type?
+
           receiver, _method_name, *args = *node
           receiver.nil? && args.empty?
         end

data/lib/rubocop/cop/lint/useless_setter_call.rb

@@ -127,6 +127,7 @@ module RuboCop
           def process_logical_operator_assignment(asgn_node)
             lhs_node, rhs_node = *asgn_node
             return unless ASSIGNMENT_TYPES.include?(lhs_node.type)
+
             process_assignment(lhs_node, rhs_node)
 
             throw :skip_children
@@ -135,6 +136,7 @@ module RuboCop
           def process_binary_operator_assignment(op_asgn_node)
             lhs_node, = *op_asgn_node
             return unless ASSIGNMENT_TYPES.include?(lhs_node.type)
+
             lhs_variable_name, = *lhs_node
             @local[lhs_variable_name] = true
 
@@ -155,6 +157,7 @@ module RuboCop
           def constructor?(node)
             return true if node.literal?
             return false unless node.send_type?
+
             _receiver, method = *node
             method == :new
           end

data/lib/rubocop/cop/lint/void.rb

@@ -83,6 +83,7 @@ module RuboCop
         def on_block(node)
           return unless node.body && !node.body.begin_type?
           return unless in_void_context?(node.body)
+
           check_expression(node.body)
         end
 

data/lib/rubocop/cop/message_annotator.rb

@@ -106,6 +106,7 @@ module RuboCop
         return true if debug?
         return false if options[:display_cop_names] == false
         return true if options[:display_cop_names]
+
         config.for_all_cops['DisplayCopNames']
       end
 

data/lib/rubocop/cop/metrics/block_length.rb

@@ -14,6 +14,7 @@ module RuboCop
 
         def on_block(node)
           return if excluded_method?(node)
+
           check_code_length(node)
         end
 

data/lib/rubocop/cop/metrics/block_nesting.rb

@@ -21,6 +21,7 @@ module RuboCop
 
         def investigate(processed_source)
           return if processed_source.blank?
+
           max = cop_config['Max']
           check_nesting_level(processed_source.ast, max, 0)
         end

data/lib/rubocop/cop/metrics/line_length.rb

@@ -38,6 +38,7 @@ module RuboCop
 
         def highligh_start(line)
           return max unless tab_indentation_width
+
           max - (tab_indentation_width - 1) * line.count("\t")
         end
 
@@ -76,7 +77,7 @@ module RuboCop
           excessive_position = if uri_range && uri_range.begin < max
                                  uri_range.end
                                else
-                                 max
+                                 highligh_start(line)
                                end
 
           source_range(processed_source.buffer, index + 1,
@@ -97,6 +98,7 @@ module RuboCop
 
         def extract_heredocs(ast)
           return [] unless ast
+
           ast.each_node(:str, :dstr, :xstr).select(&:heredoc?).map do |node|
             body = node.location.heredoc_body
             delimiter = node.location.heredoc_end.source.strip
@@ -128,8 +130,10 @@ module RuboCop
         def find_excessive_uri_range(line)
           last_uri_match = match_uris(line).last
           return nil unless last_uri_match
+
           begin_position, end_position = last_uri_match.offset(0)
           return nil if begin_position < max && end_position < max
+
           begin_position...end_position
         end
 
@@ -175,6 +179,7 @@ module RuboCop
             .detect { |e| e.location.line == source_line_number }
 
           return false unless comment
+
           comment.text.match(CommentConfig::COMMENT_DIRECTIVE_REGEXP)
         end
 

data/lib/rubocop/cop/metrics/method_length.rb

@@ -18,6 +18,7 @@ module RuboCop
 
         def on_block(node)
           return unless node.send_node.method_name == :define_method
+
           check_code_length(node)
         end
 

data/lib/rubocop/cop/mixin/annotation_comment.rb

@@ -16,6 +16,7 @@ module RuboCop
         def split_comment(comment)
           match = comment.text.match(/^(# ?)([A-Za-z]+)(\s*:)?(\s+)?(\S+)?/)
           return false unless match
+
           match.captures
         end
 

data/lib/rubocop/cop/mixin/classish_length.rb

@@ -17,6 +17,7 @@ module RuboCop
         target_line_numbers.reduce(0) do |length, line_number|
           source_line = processed_source[line_number]
           next length if irrelevant_line(source_line)
+
           length + 1
         end
       end