rubocop 0.59.2 → 0.60.0

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

@@ -23,7 +23,7 @@ module RuboCop
       def style_detected(detected)
         return if no_acceptable_style?
 
-        # `detected` can be a single style, or an Array of possible styles
+        # `detected` can be a single style or an Array of possible styles
         # (if there is more than one which matches the observed code)
         detected_as_strings = Array(detected).map(&:to_s)
 

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

@@ -7,8 +7,6 @@ module RuboCop
       include ConfigurableEnforcedStyle
 
       def check_name(node, name, name_range)
-        return if operator?(name)
-
         if valid_name?(node, name)
           correct_style_detected
         else

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

@@ -9,8 +9,10 @@ module RuboCop
 
       def max=(value)
         cfg = config_to_allow_offenses
-        value = [cfg[max_parameter_name], value].max if cfg[max_parameter_name]
-        cfg[max_parameter_name] = value
+        cfg[:exclude_limit] ||= {}
+        current_max = cfg[:exclude_limit][max_parameter_name]
+        value = [current_max, value].max if current_max
+        cfg[:exclude_limit][max_parameter_name] = value
       end
 
       def max_parameter_name

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

@@ -9,7 +9,7 @@ module RuboCop
 
       FORMATS = {
         snake_case: /^@{0,2}[\da-z_]+[!?=]?$/,
-        camelCase:  /^@{0,2}_?[a-z][\da-zA-Z]+[!?=]?$/
+        camelCase: /^@{0,2}_?[a-z][\da-zA-Z]+[!?=]?$/
       }.freeze
     end
   end

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

@@ -8,8 +8,8 @@ module RuboCop
       include ConfigurableFormatting
 
       FORMATS = {
-        snake_case:  /(?:[a-z_]|_\d+)$/,
-        normalcase:  /(?:_\D*|[A-Za-z]\d*)$/,
+        snake_case: /(?:[a-z_]|_\d+)$/,
+        normalcase: /(?:_\D*|[A-Za-z]\d*)$/,
         non_integer: /[A-Za-z_]$/
       }.freeze
     end

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

@@ -10,17 +10,46 @@ module RuboCop
           true
         end
 
-        def deltas_for_first_pair(*_nodes)
-          {}
+        def deltas_for_first_pair(first_pair, _node)
+          {
+            separator: separator_delta(first_pair),
+            value: value_delta(first_pair)
+          }
         end
 
         def deltas(first_pair, current_pair)
           if Util.begins_its_line?(current_pair.source_range)
-            { key: first_pair.key_delta(current_pair) }
+            key_delta = first_pair.key_delta(current_pair)
+            separator_delta = separator_delta(current_pair)
+            value_delta = value_delta(current_pair)
+
+            { key: key_delta, separator: separator_delta, value: value_delta }
           else
             {}
           end
         end
+
+        private
+
+        def separator_delta(pair)
+          if pair.hash_rocket?
+            correct_separator_column = pair.key.loc.expression.end.column + 1
+            actual_separator_column = pair.loc.operator.column
+
+            correct_separator_column - actual_separator_column
+          else
+            0
+          end
+        end
+
+        def value_delta(pair)
+          return 0 if pair.kwsplat_type? || pair.value_on_new_line?
+
+          correct_value_column = pair.loc.operator.end.column + 1
+          actual_value_column = pair.value.loc.column
+
+          correct_value_column - actual_value_column
+        end
       end
 
       # Common functionality for checking alignment of hash values.
@@ -54,8 +83,6 @@ module RuboCop
       class TableAlignment
         include ValueAlignment
 
-        # The table style is the only one where the first key-value pair can
-        # be considered to have bad alignment.
         def deltas_for_first_pair(first_pair, node)
           self.max_key_width = node.keys.map { |key| key.source.length }.max
 

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

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     # Common functionality for working with heredoc strings.
     module Heredoc
-      OPENING_DELIMITER = /(<<[~-]?)['"`]?([^'"`]+)['"`]?/
+      OPENING_DELIMITER = /(<<[~-]?)['"`]?([^'"`]+)['"`]?/.freeze
 
       def on_str(node)
         return unless node.heredoc?

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

@@ -5,10 +5,9 @@ module RuboCop
     # Common functionality for checking multiline method calls and binary
     # operations.
     module MultilineExpressionIndentation # rubocop:disable Metrics/ModuleLength
-      KEYWORD_ANCESTOR_TYPES  = [:for, :return, *Util::MODIFIER_NODES].freeze
+      KEYWORD_ANCESTOR_TYPES  = %i[for if while until return].freeze
       UNALIGNED_RHS_TYPES     = %i[if while until for return
                                    array kwbegin].freeze
-      ASSIGNMENT_RHS_TYPES    = [:send, *Util::ASGN_NODES].freeze
       DEFAULT_MESSAGE_TAIL    = 'an expression'.freeze
       ASSIGNMENT_MESSAGE_TAIL = 'an expression in an assignment'.freeze
       KEYWORD_MESSAGE_TAIL    = 'a %<kind>s in %<article>s `%<keyword>s` ' \
@@ -121,7 +120,7 @@ module RuboCop
       def keyword_message_tail(node)
         keyword = node.loc.keyword.source
         kind    = keyword == 'for' ? 'collection' : 'condition'
-        article = keyword =~ /^[iu]/ ? 'an' : 'a'
+        article = keyword.start_with?('i', 'u') ? 'an' : 'a'
 
         format(KEYWORD_MESSAGE_TAIL, kind: kind,
                                      article: article,
@@ -191,7 +190,7 @@ module RuboCop
       def valid_rhs?(candidate, ancestor)
         if ancestor.send_type?
           valid_method_rhs_candidate?(candidate, ancestor)
-        elsif Util::ASGN_NODES.include?(ancestor.type)
+        elsif ancestor.assignment?
           valid_rhs_candidate?(candidate, assignment_rhs(ancestor))
         else
           false

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     # Common functionality for checking the closing brace of a literal is
-    # either on the same line as the last contained elements, or a new line.
+    # either on the same line as the last contained elements or a new line.
     module MultilineLiteralBraceLayout
       include ConfigurableEnforcedStyle
 

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

@@ -32,6 +32,8 @@ module RuboCop
       end
 
       def modifier_fits_on_single_line?(node)
+        return true unless max_line_length
+
         modifier_length = length_in_modifier_form(node, node.condition,
                                                   node.body.source_length)
 
@@ -47,6 +49,8 @@ module RuboCop
       end
 
       def max_line_length
+        return unless config.for_cop('Metrics/LineLength')['Enabled']
+
         config.for_cop('Metrics/LineLength')['Max']
       end
 

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

@@ -86,7 +86,7 @@ module RuboCop
       end
 
       # Returns true if the round/square/curly brackets of the given node are
-      # on different lines, and each item within is on its own line, and the
+      # on different lines, each item within is on its own line, and the
       # closing bracket is on its own line.
       def multiline?(node)
         # No need to process anything if the whole node is not multiline

data/lib/rubocop/cop/naming/class_and_module_camel_case.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Naming
-      # This cops checks for class and module names with
+      # This cop checks for class and module names with
       # an underscore in them.
       #
       # @example

data/lib/rubocop/cop/naming/constant_name.rb

@@ -21,7 +21,7 @@ module RuboCop
         MSG = 'Use SCREAMING_SNAKE_CASE for constants.'.freeze
         # Use POSIX character classes, so we allow accented characters rather
         # than just standard ASCII characters
-        SNAKE_CASE = /^[[:digit:][:upper:]_]+$/
+        SNAKE_CASE = /^[[:digit:][:upper:]_]+$/.freeze
 
         def_node_matcher :class_or_struct_return_method?, <<-PATTERN
           (send

data/lib/rubocop/cop/naming/file_name.rb

@@ -33,7 +33,7 @@ module RuboCop
                             'called `%<namespace>s`.'.freeze
         MSG_REGEX = '`%<basename>s` should match `%<regex>s`.'.freeze
 
-        SNAKE_CASE = /^[\da-z_.?!]+$/
+        SNAKE_CASE = /^[\da-z_.?!]+$/.freeze
 
         def investigate(processed_source)
           file_path = processed_source.file_path

data/lib/rubocop/cop/naming/method_name.rb

@@ -25,6 +25,8 @@ module RuboCop
         MSG = 'Use %<style>s for method names.'.freeze
 
         def on_def(node)
+          return if node.operator_method?
+
           check_name(node, node.method_name, node.loc.name)
         end
         alias on_defs on_def

data/lib/rubocop/cop/naming/variable_number.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module Naming
       # This cop makes sure that all numbered variables use the
-      # configured style, snake_case, normalcase or non_integer,
+      # configured style, snake_case, normalcase, or non_integer,
       # for their numbering.
       #
       # @example EnforcedStyle: snake_case

data/lib/rubocop/cop/offense.rb

@@ -177,7 +177,7 @@ module RuboCop
 
       # @api public
       #
-      # Returns `-1`, `0` or `+1`
+      # Returns `-1`, `0`, or `+1`
       # if this offense is less than, equal to, or greater than `other`.
       #
       # @return [Integer]

data/lib/rubocop/cop/performance/regexp_match.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Performance
-      # In Ruby 2.4, `String#match?`, `Regexp#match?` and `Symbol#match?`
+      # In Ruby 2.4, `String#match?`, `Regexp#match?`, and `Symbol#match?`
       # have been added. The methods are faster than `match`.
       # Because the methods avoid creating a `MatchData` object or saving
       # backref.

data/lib/rubocop/cop/performance/sample.rb

@@ -3,8 +3,9 @@
 module RuboCop
   module Cop
     module Performance
-      # This cop is used to identify usages of `shuffle.first`, `shuffle.last`
-      # and `shuffle[]` and change them to use `sample` instead.
+      # This cop is used to identify usages of `shuffle.first`,
+      # `shuffle.last`, and `shuffle[]` and change them to use
+      # `sample` instead.
       #
       # @example
       #   # bad

data/lib/rubocop/cop/performance/start_with.rb

@@ -26,7 +26,7 @@ module RuboCop
 
         def literal_at_start?(regex_str)
           # is this regexp 'literal' in the sense of only matching literal
-          # chars, rather than using metachars like . and * and so on?
+          # chars, rather than using metachars like `.` and `*` and so on?
           # also, is it anchored at the start of the string?
           # (tricky: \s, \d, and so on are metacharacters, but other characters
           #  escaped with a slash are just literals. LITERAL_REGEX takes all

data/lib/rubocop/cop/performance/string_replacement.rb

@@ -22,7 +22,7 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
-        DETERMINISTIC_REGEX = /\A(?:#{LITERAL_REGEX})+\Z/
+        DETERMINISTIC_REGEX = /\A(?:#{LITERAL_REGEX})+\Z/.freeze
         DELETE = 'delete'.freeze
         TR = 'tr'.freeze
         BANG = '!'.freeze

data/lib/rubocop/cop/rails/date.rb

@@ -6,19 +6,19 @@ module RuboCop
       # This cop checks for the correct use of Date methods,
       # such as Date.today, Date.current etc.
       #
-      # Using Date.today is dangerous, because it doesn't know anything about
-      # Rails time zone. You must use Time.zone.today instead.
+      # Using `Date.today` is dangerous, because it doesn't know anything about
+      # Rails time zone. You must use `Time.zone.today` instead.
       #
-      # The cop also reports warnings when you are using 'to_time' method,
+      # The cop also reports warnings when you are using `to_time` method,
       # because it doesn't know about Rails time zone either.
       #
       # Two styles are supported for this cop. When EnforcedStyle is 'strict'
-      # then the Date methods (today, current, yesterday, tomorrow)
-      # are prohibited and the usage of both 'to_time'
-      # and 'to_time_in_current_zone' is reported as warning.
+      # then the Date methods `today`, `current`, `yesterday`, and `tomorrow`
+      # are prohibited and the usage of both `to_time`
+      # and 'to_time_in_current_zone' are reported as warning.
       #
-      # When EnforcedStyle is 'flexible' then only 'Date.today' is prohibited
-      # and only 'to_time' is reported as warning.
+      # When EnforcedStyle is 'flexible' then only `Date.today` is prohibited
+      # and only `to_time` is reported as warning.
       #
       # @example EnforcedStyle: strict
       #   # bad

data/lib/rubocop/cop/rails/dynamic_find_by.rb

@@ -27,7 +27,7 @@ module RuboCop
       #   User.find_by!(email: email)
       class DynamicFindBy < Cop
         MSG = 'Use `%<static_name>s` instead of dynamic `%<method>s`.'.freeze
-        METHOD_PATTERN = /^find_by_(.+?)(!)?$/
+        METHOD_PATTERN = /^find_by_(.+?)(!)?$/.freeze
 
         def on_send(node)
           method_name = node.method_name.to_s

data/lib/rubocop/cop/rails/exit.rb

@@ -3,15 +3,15 @@
 module RuboCop
   module Cop
     module Rails
-      # This cop enforces that 'exit' calls are not used within a rails app.
-      # Valid options are instead to raise an error, break, return or some
+      # This cop enforces that `exit` calls are not used within a rails app.
+      # Valid options are instead to raise an error, break, return, or some
       # other form of stopping execution of current request.
       #
-      # There are two obvious cases where 'exit' is particularly harmful:
+      # There are two obvious cases where `exit` is particularly harmful:
       #
-      # - Usage in library code for your application. Even though rails will
-      # rescue from a SystemExit and continue on, unit testing that library
-      # code will result in specs exiting (potentially silently if exit(0)
+      # - Usage in library code for your application. Even though Rails will
+      # rescue from a `SystemExit` and continue on, unit testing that library
+      # code will result in specs exiting (potentially silently if `exit(0)`
       # is used.)
       # - Usage in application code outside of the web process could result in
       # the program exiting, which could result in the code failing to run and
@@ -52,9 +52,8 @@ module RuboCop
           arg_nodes.size <= 1
         end
 
-        # Only register if exit is being called explicitly on
-        # Kernel or Process or if receiver node is nil for plain
-        # `exit` calls.
+        # Only register if exit is being called explicitly on `Kernel`,
+        # `Process`, or if receiver node is nil for plain `exit` calls.
         def right_receiver?(receiver_node)
           return true unless receiver_node
 

data/lib/rubocop/cop/rails/output_safety.rb

@@ -3,10 +3,10 @@
 module RuboCop
   module Cop
     module Rails
-      # This cop checks for the use of output safety calls like html_safe,
-      # raw, and safe_concat. These methods do not escape content. They
+      # This cop checks for the use of output safety calls like `html_safe`,
+      # `raw`, and `safe_concat`. These methods do not escape content. They
       # simply return a SafeBuffer containing the content as is. Instead,
-      # use safe_join to join content and escape it and concat to
+      # use `safe_join` to join content and escape it and concat to
       # concatenate content and escape it, ensuring its safety.
       #
       # @example

data/lib/rubocop/cop/rails/read_write_attribute.rb

@@ -3,12 +3,13 @@
 module RuboCop
   module Cop
     module Rails
-      # This cop checks for the use of the read_attribute or write_attribute
-      # methods, and recommends square brackets instead.
+      # This cop checks for the use of the `read_attribute` or `write_attribute`
+      # methods and recommends square brackets instead.
       #
       # If an attribute is missing from the instance (for example, when
-      # initialized by a partial `select`) then read_attribute will return nil,
-      # but square brackets will raise an ActiveModel::MissingAttributeError.
+      # initialized by a partial `select`) then `read_attribute`
+      # will return nil, but square brackets will raise
+      # an `ActiveModel::MissingAttributeError`.
       #
       # Explicitly raising an error in this situation is preferable, and that
       # is why rubocop recommends using square brackets.

data/lib/rubocop/cop/rails/refute_methods.rb

@@ -21,20 +21,20 @@ module RuboCop
         MSG = 'Prefer `%<assert_method>s` over `%<refute_method>s`.'.freeze
 
         CORRECTIONS = {
-          refute:             'assert_not',
-          refute_empty:       'assert_not_empty',
-          refute_equal:       'assert_not_equal',
-          refute_in_delta:    'assert_not_in_delta',
-          refute_in_epsilon:  'assert_not_in_epsilon',
-          refute_includes:    'assert_not_includes',
+          refute: 'assert_not',
+          refute_empty: 'assert_not_empty',
+          refute_equal: 'assert_not_equal',
+          refute_in_delta: 'assert_not_in_delta',
+          refute_in_epsilon: 'assert_not_in_epsilon',
+          refute_includes: 'assert_not_includes',
           refute_instance_of: 'assert_not_instance_of',
-          refute_kind_of:     'assert_not_kind_of',
-          refute_nil:         'assert_not_nil',
-          refute_operator:    'assert_not_operator',
-          refute_predicate:   'assert_not_predicate',
-          refute_respond_to:  'assert_not_respond_to',
-          refute_same:        'assert_not_same',
-          refute_match:       'assert_no_match'
+          refute_kind_of: 'assert_not_kind_of',
+          refute_nil: 'assert_not_nil',
+          refute_operator: 'assert_not_operator',
+          refute_predicate: 'assert_not_predicate',
+          refute_respond_to: 'assert_not_respond_to',
+          refute_same: 'assert_not_same',
+          refute_match: 'assert_no_match'
         }.freeze
 
         OFFENSIVE_METHODS = CORRECTIONS.keys.freeze

data/lib/rubocop/cop/rails/reversible_migration.rb

@@ -169,6 +169,7 @@ module RuboCop
         def on_block(node)
           return unless within_change_method?(node)
           return if within_reversible_or_up_only_block?(node)
+          return if node.body.nil?
 
           check_change_table_node(node.send_node, node.body)
         end
@@ -238,7 +239,7 @@ module RuboCop
             elsif block.send_type?
               check_change_table_offense(arg, block)
             else
-              block.each_child_node do |child_node|
+              block.each_child_node(:send) do |child_node|
                 check_change_table_offense(arg, child_node)
               end
             end