rubocop 1.89.0 → 1.90.0

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

@@ -100,7 +100,7 @@ module RuboCop
           comment_line?(processed_source[node.first_line - 2])
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def groupable_accessor?(node)
           return true unless (previous_expression = node.left_siblings.last)
 
@@ -122,7 +122,6 @@ module RuboCop
             previous_expression.access_modifier? ||
             node.first_line - previous_expression.last_line > 1 # there is a space between nodes
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         def class_send_elements(class_node)
           class_def = class_node.body

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

@@ -197,7 +197,7 @@ module RuboCop
           send_classifications.all? { |_, c, _, _| all_classifications.include?(c) }
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         def add_forward_all_offenses(node, send_classifications, forwardable_args)
           rest_arg, kwrest_arg, block_arg = *forwardable_args
           registered_block_arg_offense = false
@@ -220,13 +220,12 @@ module RuboCop
 
           register_forward_all_offense(node, node.arguments, rest_arg || kwrest_arg)
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
         def forward_all_first_argument(node)
           node.arguments.reverse_each.find(&:forwarded_restarg_type?)
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength
         def add_post_ruby_32_offenses(def_node, send_classifications, forwardable_args)
           return unless use_anonymous_forwarding?
           return unless all_forwarding_offenses_correctable?(send_classifications)
@@ -250,7 +249,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
         def non_splat_or_block_pass_lvar_references(body)
           body.each_descendant(:lvar, :lvasgn).filter_map do |lvar|
@@ -473,7 +471,7 @@ module RuboCop
 
           private
 
-          # rubocop:disable Metrics/CyclomaticComplexity
+          # rubocop:disable-next Metrics/CyclomaticComplexity
           def can_forward_all?
             return false if any_arg_referenced?
             return false if ruby_30_or_lower_optarg?
@@ -483,7 +481,6 @@ module RuboCop
 
             no_additional_args? || (target_ruby_version >= 3.0 && no_post_splat_args?)
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
 
           # def foo(a = 41, ...) is a syntax error in 3.0.
           def ruby_30_or_lower_optarg?

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

@@ -31,7 +31,7 @@ module RuboCop
         MSG = 'Use `%<preferred>s`.'
         RESTRICT_ON_SEND = %i[[]].freeze
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def on_send(node)
           return unless node.arguments.size == 1 && node.first_argument.int_type?
 
@@ -49,7 +49,6 @@ module RuboCop
             corrector.replace(offense_range, preferred_value(node, preferred))
           end
         end
-        # rubocop:enable Metrics/AbcSize
         alias on_csend on_send
 
         private

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

@@ -70,7 +70,7 @@ module RuboCop
             (send _ :& _))
         PATTERN
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def on_send(node)
           return unless node.receiver&.begin_type?
           return unless (preferred_method = preferred_method(node))
@@ -88,7 +88,6 @@ module RuboCop
             corrector.replace(node, preferred)
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ClassLength
+# rubocop:disable-next Metrics/ClassLength
 module RuboCop
   module Cop
     module Style
@@ -344,7 +344,7 @@ module RuboCop
           node.respond_to?(:block_node) && node.block_node
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable-next Metrics/CyclomaticComplexity
         def get_blocks(node, &block)
           case node.type
           when :block, :numblock, :itblock
@@ -368,9 +368,8 @@ module RuboCop
             node.each_child_node { |child| get_blocks(child, &block) }
           end
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
 
-        # rubocop:disable Metrics/CyclomaticComplexity -- inlined special_method checks to avoid double evaluation
+        # rubocop:disable-next Metrics/CyclomaticComplexity -- inlined special_method checks to avoid double evaluation
         def proper_block_style?(node)
           return true if require_do_end?(node)
 
@@ -385,7 +384,6 @@ module RuboCop
           when :always_braces       then node.braces?
           end
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
 
         def require_do_end?(node)
           return false if node.braces? || node.multiline?
@@ -507,4 +505,3 @@ module RuboCop
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

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

@@ -98,7 +98,7 @@ module RuboCop
             node.elsif_conditional? && min_branches_count?(node)
         end
 
-        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable-next Metrics/MethodLength
         def find_target(node)
           case node.type
           when :begin
@@ -116,7 +116,6 @@ module RuboCop
             find_target_in_send_node(node)
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         def find_target_in_send_node(node)
           case node.method_name
@@ -181,7 +180,7 @@ module RuboCop
           conditions << condition if condition
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable-next Metrics/CyclomaticComplexity
         def condition_from_send_node(node, target)
           case node.method_name
           when :is_a?
@@ -196,7 +195,6 @@ module RuboCop
             condition_from_include_or_cover_node(node, target)
           end
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
 
         def condition_from_equality_node(node, target)
           condition = condition_from_binary_op(node.receiver, node.first_argument, target)

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

@@ -194,7 +194,7 @@ module RuboCop
             "#{node.body.children.first.const_name}"
         end
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def remove_end(corrector, body)
           remove_begin_pos = if same_line?(body.loc.name, body.loc.end)
                                body.loc.name.end_pos
@@ -206,7 +206,6 @@ module RuboCop
 
           corrector.remove(range)
         end
-        # rubocop:enable Metrics/AbcSize
 
         def unindent(corrector, node)
           return unless node.body.children.last

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

@@ -64,7 +64,7 @@ module RuboCop
 
         MSG = 'Combine this loop with the previous loop.'
 
-        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable-next Metrics/CyclomaticComplexity
         def on_block(node)
           return unless node.parent&.begin_type?
           return unless collection_looping_method?(node)
@@ -77,7 +77,6 @@ module RuboCop
             combine_with_left_sibling(corrector, node)
           end
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
 
         alias on_numblock on_block
         alias on_itblock on_block

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

@@ -30,7 +30,7 @@ module RuboCop
           'Use `push` with elements as arguments without array brackets instead of `%<current>s`.'
         RESTRICT_ON_SEND = %i[concat].freeze
 
-        # rubocop:disable Metrics
+        # rubocop:disable-next Metrics
         def on_send(node)
           return if node.arguments.empty?
           return unless node.arguments.all?(&:array_type?)
@@ -68,7 +68,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics
         alias on_csend on_send
 
         private

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

@@ -448,7 +448,7 @@ module RuboCop
       # Helper module to provide common methods to ConditionalAssignment
       # correctors
       module ConditionalCorrectorHelper
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+        # rubocop:disable-next Metrics/AbcSize, Metrics/CyclomaticComplexity
         def remove_whitespace_in_branches(corrector, branch, condition, column)
           branch.each_node do |child|
             next if child.source_range.nil?
@@ -468,7 +468,6 @@ module RuboCop
 
           corrector.remove_preceding(condition.loc.end, condition.loc.end.column - column)
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
         def same_line?(node1, node2)
           RuboCop::Cop::Util.same_line?(node1, node2)

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

@@ -82,7 +82,7 @@ module RuboCop
           end
         end
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def visibility_declaration?(node)
           node.parent.each_child_node(:send).any? do |child|
             next false unless (arguments = visibility_declaration_for(child))
@@ -98,7 +98,6 @@ module RuboCop
             constant_values.include?(node.name)
           end
         end
-        # rubocop:enable Metrics/AbcSize
       end
     end
   end

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

@@ -25,7 +25,7 @@ module RuboCop
         MSG = 'Include a copyright notice matching /%<notice>s/ before any code.'
         AUTOCORRECT_EMPTY_WARNING = 'An AutocorrectNotice must be defined in your RuboCop config'
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def on_new_investigation
           return if notice.empty? || notice_found?(processed_source)
 
@@ -43,7 +43,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 

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

@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      # Checks for directive scopes that can be expressed with the tighter
+      # `disable-next` form: a `disable`/`enable` pair wrapping exactly one
+      # statement, or a `push`/`pop` that only disables cops around exactly
+      # one statement. A statement-scoped directive cannot drift as the
+      # surrounding code changes and needs no closing boundary.
+      #
+      # @safety
+      #   The autocorrection is unsafe because the suppression scope shrinks
+      #   from the whole region to the statement: offenses of the suppressed
+      #   cops located on the directive lines themselves resurface.
+      #
+      # @example
+      #   # bad
+      #   # rubocop:disable Metrics/AbcSize
+      #   def foo
+      #   end
+      #   # rubocop:enable Metrics/AbcSize
+      #
+      #   # good
+      #   # rubocop:disable-next Metrics/AbcSize
+      #   def foo
+      #   end
+      #
+      #   # bad
+      #   # rubocop:push -Metrics/AbcSize
+      #   def foo
+      #   end
+      #   # rubocop:pop
+      #
+      #   # good
+      #   # rubocop:disable-next Metrics/AbcSize
+      #   def foo
+      #   end
+      #
+      #   # good - the region spans more than one statement
+      #   # rubocop:disable Metrics/AbcSize
+      #   def foo
+      #   end
+      #
+      #   def bar
+      #   end
+      #   # rubocop:enable Metrics/AbcSize
+      #
+      class DirectiveScope < Base
+        include RangeHelp
+        extend AutoCorrector
+
+        MSG_PAIR = 'Use `%<mode>s-next` instead of a `%<mode>s`/`enable` pair ' \
+                   'around a single statement.'
+        MSG_PUSH_POP = 'Use `disable-next` instead of `push`/`pop` around a single statement.'
+
+        def on_new_investigation
+          processed_source.comments.each do |comment|
+            directive = DirectiveComment.new(comment)
+            next unless comment_config.comment_only_line?(directive.line_number)
+
+            if plain_disable?(directive)
+              check_pair(directive)
+            elsif disable_only_push?(directive)
+              check_push_pop(directive)
+            end
+          end
+        end
+
+        private
+
+        def comment_config
+          processed_source.comment_config
+        end
+
+        def plain_disable?(directive)
+          directive.disabled? && !directive.disable_next?
+        end
+
+        def disable_only_push?(directive)
+          directive.push? && !directive.push_args.empty? && directive.push_args.keys == ['-']
+        end
+
+        def check_pair(directive)
+          enable = single_statement_closing_directive(directive)
+          return unless enable&.enabled?
+          return unless enable.raw_cop_names.sort == directive.raw_cop_names.sort
+
+          message = format(MSG_PAIR, mode: directive.mode)
+          add_offense(directive.comment, message: message) do |corrector|
+            convert_pair(corrector, directive, enable)
+          end
+        end
+
+        def convert_pair(corrector, directive, enable)
+          replacement = directive.comment.text.sub(/\b#{directive.mode}\b/,
+                                                   "#{directive.mode}-next")
+          corrector.replace(directive.comment, replacement)
+          remove_line(corrector, enable.comment)
+        end
+
+        def check_push_pop(directive)
+          pop = single_statement_closing_directive(directive)
+          return unless pop&.pop?
+
+          add_offense(directive.comment, message: MSG_PUSH_POP) do |corrector|
+            corrector.replace(directive.comment, disable_next_replacement(directive))
+            remove_line(corrector, pop.comment)
+          end
+        end
+
+        # The directive closing this one's scope, when that scope wraps
+        # exactly one statement - `nil` otherwise.
+        def single_statement_closing_directive(directive)
+          closing_line = single_closing_line(directive)
+          return nil unless closing_line
+
+          closing_comment = processed_source.comment_at_line(closing_line)
+          return nil unless closing_comment
+          return nil unless wraps_single_statement?(directive, closing_line)
+
+          DirectiveComment.new(closing_comment)
+        end
+
+        # The single line on which every disabled range opened by this
+        # directive ends, or `nil` when the ranges disagree or never close.
+        # For a `disable` that is the `enable` line; for a `push` it is the
+        # line before the `pop`.
+        def single_closing_line(directive)
+          ranges = ranges_opened_by(directive)
+          return nil if ranges.empty?
+
+          ends = ranges.map(&:end).uniq
+          return nil unless ends.size == 1 && ends.first.to_f.finite?
+
+          directive.push? ? ends.first + 1 : ends.first
+        end
+
+        def ranges_opened_by(directive)
+          comment_config.cop_disabled_line_ranges.each_value.flat_map do |ranges|
+            ranges.select do |range|
+              range.respond_to?(:directive) && range.directive.comment.equal?(directive.comment)
+            end
+          end
+        end
+
+        # The region wraps a single statement only when the directive sits
+        # immediately above it and the closing directive immediately below -
+        # any other line inside the region (a comment, a blank line) may
+        # carry offenses of the suppressed cops that the tighter scope
+        # would no longer cover.
+        def wraps_single_statement?(directive, closing_line)
+          scope = comment_config.statement_scope_after(directive.line_number)
+
+          !scope.nil? && scope.begin == directive.line_number + 1 && scope.end + 1 == closing_line
+        end
+
+        def disable_next_replacement(directive)
+          cops = directive.push_args['-'].join(', ')
+          reason = directive.reason
+          text = "# rubocop:disable-next #{cops}"
+          reason ? "#{text} -- #{reason}" : text
+        end
+
+        def remove_line(corrector, comment)
+          corrector.remove(range_by_whole_lines(comment.source_range, include_final_newline: true))
+        end
+      end
+    end
+  end
+end

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

@@ -19,6 +19,12 @@ module RuboCop
       # allowlisting all other cops. `AllowedCops` and `DisallowedCops` should not
       # both be set at the same time; if `DisallowedCops` is set, it takes precedence.
       #
+      # With `AllowTrailingComment` set to `true`, a disable directive carrying
+      # a `--` trailing justification comment is allowed, so a team can require
+      # every disable to be documented instead of banning them outright. Enable
+      # directives are not checked in this mode, since they end a suppression
+      # rather than start one.
+      #
       # This cop cannot be disabled via directive comments when it is explicitly
       # enabled with `Enabled: true`. This prevents users from bypassing the cop
       # with `# rubocop:disable Style/DisableCopsWithinSourceCodeDirective`.
@@ -52,16 +58,28 @@ module RuboCop
       #   foo
       #   # rubocop:enable Metrics/AbcSize
       #
+      # @example AllowTrailingComment: true
+      #   # bad
+      #   x = 0 # rubocop:disable Layout/SpaceAroundOperators
+      #
+      #   # good
+      #   x = 0 # rubocop:disable Layout/SpaceAroundOperators -- would misalign the table
+      #
       class DisableCopsWithinSourceCodeDirective < Base
         extend AutoCorrector
 
         # rubocop:enable Lint/RedundantCopDisableDirective
         MSG = 'RuboCop disable/enable directives are not permitted.'
         MSG_FOR_COPS = 'RuboCop disable/enable directives for %<cops>s are not permitted.'
+        MSG_MISSING_REASON = 'RuboCop disable directives without a `--` justification ' \
+                             'comment are not permitted.'
 
         def on_new_investigation
           processed_source.comments.each do |comment|
-            directive_cops = directive_cops(comment)
+            directive = DirectiveComment.new(comment)
+            next if allow_trailing_comment? && (directive.reason || directive.enabled?)
+
+            directive_cops = directive_cops(directive)
             disallowed_cops = compute_disallowed_cops(directive_cops)
 
             next unless disallowed_cops.any?
@@ -85,13 +103,7 @@ module RuboCop
         end
 
         def register_offense(comment, directive_cops, disallowed_cops)
-          message = if any_cops_allowed? || disallowed_cops_config.any?
-                      format(MSG_FOR_COPS, cops: "`#{disallowed_cops.join('`, `')}`")
-                    else
-                      MSG
-                    end
-
-          add_offense(comment, message: message) do |corrector|
+          add_offense(comment, message: offense_message(disallowed_cops)) do |corrector|
             replacement = ''
 
             if directive_cops.length != disallowed_cops.length
@@ -103,11 +115,25 @@ module RuboCop
           end
         end
 
-        def directive_cops(comment)
-          match_captures = DirectiveComment.new(comment).match_captures
+        def offense_message(disallowed_cops)
+          if allow_trailing_comment?
+            MSG_MISSING_REASON
+          elsif any_cops_allowed? || disallowed_cops_config.any?
+            format(MSG_FOR_COPS, cops: "`#{disallowed_cops.join('`, `')}`")
+          else
+            MSG
+          end
+        end
+
+        def directive_cops(directive)
+          match_captures = directive.match_captures
           match_captures && match_captures[1] ? match_captures[1].split(',').map(&:strip) : []
         end
 
+        def allow_trailing_comment?
+          cop_config['AllowTrailingComment']
+        end
+
         def allowed_cops
           @allowed_cops ||= Array(cop_config['AllowedCops']).to_set
         end

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

@@ -42,7 +42,7 @@ module RuboCop
         MSG = 'Do not use empty `case` condition, instead use an `if` expression.'
         NOT_SUPPORTED_PARENT_TYPES = %i[return break next send csend yield super].freeze
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def on_case(case_node)
           if case_node.condition || NOT_SUPPORTED_PARENT_TYPES.include?(case_node.parent&.type)
             return
@@ -56,7 +56,6 @@ module RuboCop
 
           add_offense(case_node.loc.keyword) { |corrector| autocorrect(corrector, case_node) }
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         private
 

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

@@ -228,7 +228,7 @@ module RuboCop
           "Prefer #{message_text(style)} over #{message_text(detected_style)}."
         end
 
-        # rubocop:disable Style/FormatStringToken
+        # rubocop:disable-next Style/FormatStringToken
         def message_text(style)
           {
             annotated: 'annotated tokens (like `%<foo>s`)',
@@ -236,7 +236,6 @@ module RuboCop
             unannotated: 'unannotated tokens (like `%s`)'
           }[style]
         end
-        # rubocop:enable Style/FormatStringToken
 
         def tokens(str_node, &block)
           return if str_node.source == '__FILE__'

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

@@ -196,7 +196,7 @@ module RuboCop
           end
         end
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def autocorrect(corrector, node, condition, replacement, guard)
           corrector.replace(node.loc.keyword.join(condition.source_range), replacement)
 
@@ -217,7 +217,6 @@ module RuboCop
             corrector.remove(range_of_branch_to_remove(node, guard))
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         def heredoc?(argument)
           argument.respond_to?(:heredoc?) && argument.heredoc?

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

@@ -76,7 +76,7 @@ module RuboCop
         alias on_numblock on_block
         alias on_itblock on_block
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def check_unused_block_args(node, key, value)
           return if node.body.nil?
 
@@ -96,7 +96,6 @@ module RuboCop
             register_each_args_offense(node, message, 'each_value', unused_range)
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         def on_block_pass(node)
           kv_each_with_block_pass(node.parent) do |target, method|

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

@@ -217,7 +217,7 @@ module RuboCop
           acceptable_19_syntax_symbol?(pair.key.source)
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable-next Metrics/CyclomaticComplexity
         def acceptable_19_syntax_symbol?(sym_name)
           sym_name.delete_prefix!(':')
 
@@ -237,7 +237,6 @@ module RuboCop
           (sym_name.start_with?("'") && sym_name.end_with?("'")) ||
             (sym_name.start_with?('"') && sym_name.end_with?('"'))
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
 
         def check(pairs, delim, msg)
           pairs.each do |pair|

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

@@ -136,7 +136,7 @@ module RuboCop
 
         private
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def check_branches(node, branches)
           # return if any branch is empty. An empty branch can be an `if`
           # without an `else` or a branch that contains only comments.
@@ -168,7 +168,6 @@ module RuboCop
 
           check_expressions(node, heads, :before_condition)
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         def duplicated_expressions?(node, expressions)
           unique_expressions = expressions.uniq
@@ -189,7 +188,7 @@ module RuboCop
           end
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         def check_expressions(node, expressions, insert_position)
           return if expressions.any?(&:nil?)
 
@@ -213,7 +212,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
         def correct_assignment(corrector, node, expression, insert_position)
           indentation = indentation_of(node.parent)

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

@@ -64,7 +64,7 @@ module RuboCop
 
         MSG = 'Convert `if` nested inside `else` to `elsif`.'
 
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def on_if(node)
           return if node.ternary? || node.unless?
 
@@ -81,7 +81,6 @@ module RuboCop
             ignore_node(node)
           end
         end
-        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         private