rubocop 1.89.0 → 1.91.0

data/lib/rubocop/options.rb

@@ -33,6 +33,8 @@ module RuboCop
 
       define_options.parse!(args)
 
+      imply_autocorrect_for_diff
+
       @validator.validate_compatibility
 
       if @options[:stdin]
@@ -51,7 +53,16 @@ module RuboCop
 
     private
 
-    # rubocop:disable Metrics/AbcSize
+    # `--diff` is a dry run of autocorrection, so it turns autocorrection on
+    # unless the user already picked a mode with `-a`, `-A` or `-x`.
+    def imply_autocorrect_for_diff
+      return unless @options[:diff] && !@options[:autocorrect]
+
+      @options[:safe_autocorrect] = true
+      @options[:autocorrect] = true
+    end
+
+    # rubocop:disable-next Metrics/AbcSize
     def define_options
       OptionParser.new do |opts|
         opts.banner = rainbow.wrap('Usage: rubocop [options] [file1, file2, ...]').bright
@@ -71,7 +82,6 @@ module RuboCop
         add_profile_options(opts) if RUBY_ENGINE == 'ruby' && !Platform.windows?
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     def add_check_options(opts) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       section(opts, 'Basic Options') do # rubocop:disable Metrics/BlockLength
@@ -93,12 +103,17 @@ module RuboCop
         option(opts, '--enable-pending-cops')
         option(opts, '--disable-all-cops')
         option(opts, '--enable-all-cops')
+        option(opts, '--[no-]preview')
         option(opts, '--ignore-disable-comments')
         option(opts, '--force-exclusion')
         option(opts, '--only-recognized-file-types')
         option(opts, '--ignore-parent-exclusion')
         option(opts, '--ignore-unrecognized-cops')
         option(opts, '--force-default-config')
+        option(opts, '--changed [REVISION]') do |revision|
+          @options[:changed] = revision || ChangedFiles::DEFAULT_REVISION
+          @validator.validate_changed_revision(revision)
+        end
         option(opts, '-s', '--stdin FILE')
         option(opts, '--editor-mode')
         option(opts, '-P', '--[no-]parallel')
@@ -132,10 +147,11 @@ module RuboCop
         option(opts, '--display-only-fail-level-offenses')
         option(opts, '--display-only-correctable')
         option(opts, '--display-only-safe-correctable')
+        option(opts, '--display-suppressed')
       end
     end
 
-    # rubocop:todo Naming/InclusiveLanguage
+    # rubocop:todo Naming/InclusiveLanguage -- `--auto-correct` is the deprecated flag name
     # the autocorrect command-line arguments map to the autocorrect @options values like so:
     #                            :fix_layout  :autocorrect  :safe_autocorrect  :autocorrect_all
     # -x, --fix-layout           true         true          -                  -
@@ -161,6 +177,8 @@ module RuboCop
         end
 
         option(opts, '--disable-uncorrectable')
+
+        option(opts, '--diff')
       end
     end
     # rubocop:enable Naming/InclusiveLanguage
@@ -173,6 +191,8 @@ module RuboCop
           @options.replace(ConfigRegeneration.new.options.merge(@options))
         end
 
+        option(opts, '--report-unused-todo-entries')
+
         option(opts, '--exclude-limit COUNT') { @validator.validate_exclude_limit_option }
         option(opts, '--no-exclude-limit')
 
@@ -382,7 +402,7 @@ module RuboCop
       %i[only except].each { |opt| OptionsValidator.validate_cop_list(@options[opt]) }
     end
 
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable-next Metrics/AbcSize
     def validate_compatibility # rubocop:disable Metrics/MethodLength
       if only_includes_redundant_disable?
         raise OptionArgumentError, 'Lint/RedundantCopDisableDirective cannot be used with --only.'
@@ -398,6 +418,8 @@ module RuboCop
       validate_display_only_failed_and_display_only_correctable
       validate_display_only_correctable_and_autocorrect
       validate_lsp_and_editor_mode
+      validate_diff
+      validate_changed_and_stdin
       validate_enable_all_cops_and_disable_all_cops
       disable_parallel_when_invalid_option_combo
 
@@ -405,7 +427,6 @@ module RuboCop
 
       raise OptionArgumentError, "Incompatible cli options: #{incompatible_options.inspect}"
     end
-    # rubocop:enable Metrics/AbcSize
 
     def validate_auto_gen_config
       return if @options.key?(:auto_gen_config)
@@ -446,6 +467,20 @@ module RuboCop
             '--display-only-failed cannot be used together with other display options.'
     end
 
+    # `--diff` promises not to write anything, and `--auto-gen-config` exists to
+    # write a file.
+    def validate_diff
+      return unless @options.key?(:diff) && @options.key?(:auto_gen_config)
+
+      raise OptionArgumentError, '--diff cannot be used with --auto-gen-config.'
+    end
+
+    def validate_changed_and_stdin
+      return unless @options.key?(:changed) && @options.key?(:stdin)
+
+      raise OptionArgumentError, '--changed cannot be used with --stdin.'
+    end
+
     def validate_lsp_and_editor_mode
       return if !@options.key?(:lsp) || !@options.key?(:editor_mode)
 
@@ -510,6 +545,17 @@ module RuboCop
       @incompatible_options ||= @options.keys & Options::EXITING_OPTIONS
     end
 
+    # OptionParser hands `--changed lib/` the path as the revision, which is a
+    # natural thing to type, so point at the fix rather than at git's error.
+    def validate_changed_revision(revision)
+      return unless revision && File.exist?(revision)
+
+      raise OptionArgumentError,
+            "--changed takes a git revision, but `#{revision}` is a path. Write the revision " \
+            "as `--changed=#{revision}` if that is really what you meant, or drop it to " \
+            'compare against HEAD.'
+    end
+
     def validate_exclude_limit_option
       return if /^\d+$/.match?(@options[:exclude_limit])
 
@@ -527,7 +573,7 @@ module RuboCop
 
   # This module contains help texts for command line options.
   # @api private
-  # rubocop:disable Metrics/ModuleLength
+  # rubocop:disable-next Metrics/ModuleLength
   module OptionsHelp
     MAX_EXCL = RuboCop::Options::DEFAULT_MAXIMUM_EXCLUSION_ITEMS.to_s
     FORMATTER_OPTION_LIST = RuboCop::Formatter::FormatterSet::BUILTIN_FORMATTERS_FOR_KEYS.keys
@@ -545,6 +591,8 @@ module RuboCop
       regenerate_todo:                  ['Regenerate the TODO configuration file using',
                                          'the last configuration. If there is no existing',
                                          'TODO file, acts like --auto-gen-config.'],
+      report_unused_todo_entries:       ['Also report TODO configuration file entries that',
+                                         'are no longer needed, and fail if any are found.'],
       offense_counts:                   ['Include offense counts in configuration',
                                          'file generated by --auto-gen-config.',
                                          'Default is true.'],
@@ -569,6 +617,10 @@ module RuboCop
       disable_uncorrectable:            ['Used with --autocorrect to annotate any',
                                          'offenses that do not support autocorrect',
                                          'with `rubocop:todo` comments.'],
+      diff:                             ['Print a unified diff of what autocorrection',
+                                         'would change, without writing any files.',
+                                         'Turns on safe autocorrection unless a mode',
+                                         'was already given with -a, -A or -x.'],
       no_exclude_limit:                 ['Do not set the limit for how many files to exclude.'],
       force_exclusion:                  ['Any files excluded by `Exclude` in configuration',
                                          'files will be excluded, even if given explicitly',
@@ -581,6 +633,10 @@ module RuboCop
       ignore_parent_exclusion:          ['Prevent from inheriting `AllCops/Exclude` from',
                                          'parent folders.'],
       ignore_unrecognized_cops:         ['Ignore unrecognized cops or departments in the config.'],
+      changed:                          ['Inspect only the files that differ from a git',
+                                         'revision, defaulting to HEAD. Untracked files',
+                                         'count as changed. Pass a revision with',
+                                         '`--changed=REVISION`.'],
       force_default_config:             ['Use default configuration even if configuration',
                                          'files are present in the directory tree.'],
       format:                           ['Choose an output formatter. This option',
@@ -595,6 +651,7 @@ module RuboCop
                                          'specified --format, or the default format',
                                          'if no format is specified.'],
       fail_level:                       ['Minimum severity for exit with error code.',
+                                         'Overrides `AllCops: FailLevel` in the configuration.',
                                          '  [A] autocorrect',
                                          '  [I] info',
                                          '  [R] refactor',
@@ -611,6 +668,8 @@ module RuboCop
       display_only_correctable:         ['Only output correctable offense messages.'],
       display_only_safe_correctable:    ['Only output safe-correctable offense messages',
                                          'when combined with --display-only-correctable.'],
+      display_suppressed:               ['Also output offenses suppressed by directive',
+                                         'comments. They do not affect the exit code.'],
       show_cops:                        ['Show the given cops, or all cops by',
                                          'default, and their configurations for the',
                                          'current directory.',
@@ -637,6 +696,10 @@ module RuboCop
                                          '`AllCops/DisabledByDefault` in config files.'],
       display_style_guide:              'Display style guide URLs in offense messages.',
       enable_pending_cops:              'Run with pending cops.',
+      preview:                          ['Opt in to unstable behavior: cops that are',
+                                         '`Enabled: preview`, and changes to existing',
+                                         'cops that are not the default yet.',
+                                         'Overrides `AllCops: Preview`.'],
       enable_all_cops:                  ['Run with all cops enabled, including those',
                                          'disabled by default. Overrides',
                                          '`AllCops/EnabledByDefault` and',
@@ -689,5 +752,4 @@ module RuboCop
       memory:                           'Profile rubocop memory usage.'
     }.freeze
   end
-  # rubocop:enable Metrics/ModuleLength
 end

data/lib/rubocop/path_util.rb

@@ -44,7 +44,7 @@ module RuboCop
       uri.start_with?('http://', 'https://')
     end
 
-    SMART_PATH_CACHE = {} # rubocop:disable Style/MutableConstant
+    SMART_PATH_CACHE = {} # rubocop:disable Style/MutableConstant -- a cache, written to at runtime
     private_constant :SMART_PATH_CACHE
 
     def smart_path(path)
@@ -63,7 +63,7 @@ module RuboCop
         end
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    # rubocop:disable-next Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def match_path?(pattern, path)
       case pattern
       when String
@@ -89,7 +89,6 @@ module RuboCop
         end
       end
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     # Returns true for an absolute Unix or Windows path.
     def absolute?(path)

data/lib/rubocop/plugin/configuration_integrator.rb

@@ -59,7 +59,11 @@ module RuboCop
 
               plugin_config.make_excludes_absolute
 
-              ConfigLoader.merge_with_default(plugin_config, plugin_config_path)
+              # `unset_nil: false` keeps `AllCops` keys declared with a nil value by a plugin
+              # (e.g. `TargetRailsVersion: ~` of rubocop-rails); `merge_all_cop_settings` above
+              # carries such keys into each subsequent plugin's config, where `unset_nil: true`
+              # would delete them from the combined configuration.
+              ConfigLoader.merge_with_default(plugin_config, plugin_config_path, unset_nil: false)
             end
           end
         end
@@ -88,7 +92,7 @@ module RuboCop
           result
         end
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def load_plugin_rubocop_config(plugin, runner_context)
           rules = plugin.rules(runner_context)
 
@@ -105,7 +109,6 @@ module RuboCop
             raise "Plugin `#{plugin_name}' failed to load with error: #{error_message}"
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         # This is how we ensure "first-in wins": plugins can override AllCops settings that are
         # set by RuboCop's default configuration, but once a plugin sets an AllCop setting, they

data/lib/rubocop/plugin/loader.rb

@@ -8,7 +8,7 @@ module RuboCop
     # A class for loading and resolving plugins.
     # @api private
     class Loader
-      # rubocop:disable Layout/LineLength
+      # rubocop:disable Layout/LineLength -- the comment on each key does not wrap
       DEFAULT_PLUGIN_CONFIG = {
         'enabled' => true,
         'require_path' => nil, # If not set, will be set to the plugin name

data/lib/rubocop/rake_task.rb

@@ -74,7 +74,7 @@ module RuboCop
 
     def setup_subtasks(name, *args, &task_block) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       namespace(name) do
-        # rubocop:todo Naming/InclusiveLanguage
+        # rubocop:todo-next Naming/InclusiveLanguage -- the deprecated flag spelling is the subject here
         task(:auto_correct, *args) do |_, task_args|
           require 'rainbow'
           warn Rainbow(
@@ -86,7 +86,6 @@ module RuboCop
             perform('--autocorrect')
           end
         end
-        # rubocop:enable Naming/InclusiveLanguage
 
         desc "Autocorrect RuboCop offenses (only when it's safe)."
         task(:autocorrect, *args) do |_, task_args|

data/lib/rubocop/remote_config.rb

@@ -49,9 +49,9 @@ module RuboCop
       http.use_ssl = uri.instance_of?(URI::HTTPS)
 
       generate_request(uri) do |request|
-        handle_response(http.request(request), limit, &block)
+        handle_response(http.request(request), uri, limit, &block)
       rescue SocketError => e
-        handle_response(e, limit, &block)
+        handle_response(e, uri, limit, &block)
       end
     end
 
@@ -64,12 +64,12 @@ module RuboCop
       yield request
     end
 
-    def handle_response(response, limit, &block)
+    def handle_response(response, uri, limit, &block)
       case response
       when Net::HTTPSuccess, Net::HTTPNotModified, SocketError
         yield response
       when Net::HTTPRedirection
-        request(URI.parse(response['location']), limit - 1, &block)
+        request(URI.join(uri, response['location']), limit - 1, &block)
       else
         begin
           response.error!

data/lib/rubocop/result_cache.rb

@@ -123,7 +123,7 @@ module RuboCop
     end
 
     def valid?
-      File.exist?(@path)
+      !@checksum_unavailable && File.exist?(@path)
     end
 
     def load
@@ -132,6 +132,8 @@ module RuboCop
     end
 
     def save(offenses)
+      return if @checksum_unavailable
+
       dir = File.dirname(@path)
 
       begin
@@ -176,14 +178,23 @@ module RuboCop
     end
 
     def file_checksum(file, config_store)
+      stat = File.stat(file)
+      return unavailable_checksum unless stat.file?
+
       digester = Digest::SHA1.new
-      mode = File.stat(file).mode
-      digester.update("#{file}#{mode}#{config_store.for_file(file).signature}")
+      digester.update("#{file}#{stat.mode}#{config_store.for_file(file).signature}")
       digester.file(file)
       digester.hexdigest
     rescue Errno::ENOENT
-      # Spurious files that come and go should not cause a crash, at least not
-      # here.
+      # Spurious files that come and go should not cause a crash, at least not here.
+      unavailable_checksum
+    end
+
+    # Every file that fails to checksum shares this sentinel value, so the cache entry
+    # must be neither saved nor considered valid, or one file's cached results could be
+    # served as another's.
+    def unavailable_checksum
+      @checksum_unavailable = true
       '_'
     end
 

data/lib/rubocop/rspec/expect_offense.rb

@@ -117,7 +117,7 @@ module RuboCop
         source
       end
 
-      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable-next Metrics/AbcSize
       def expect_offense(source, file = nil, severity: nil, chomp: false, **replacements)
         expected_annotations = parse_annotations(source, **replacements)
         source = expected_annotations.plain_source
@@ -138,9 +138,8 @@ module RuboCop
 
         @offenses
       end
-      # rubocop:enable Metrics/AbcSize
 
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+      # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
       def expect_correction(correction, loop: true, source: nil)
         if source
           expected_annotations = parse_annotations(source, raise_error: false)
@@ -177,7 +176,6 @@ module RuboCop
         expect(new_source).to eq(correction)
         expect(@processed_source).to be_valid_syntax, 'Expected correction to be valid syntax'
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
 
       def expect_no_corrections
         raise '`expect_no_corrections` must follow `expect_offense`' unless @processed_source

data/lib/rubocop/rspec/shared_contexts.rb

@@ -6,7 +6,7 @@ require 'tmpdir'
 # or stubbing Dir.pwd get a fresh value.
 RSpec.configure { |c| c.before { RuboCop::PathUtil.reset_pwd } }
 
-# rubocop:disable Metrics/BlockLength
+# rubocop:disable-next Metrics/BlockLength
 RSpec.shared_context 'isolated environment' do
   around do |example|
     Dir.mktmpdir do |tmpdir|
@@ -69,7 +69,6 @@ RSpec.shared_context 'isolated environment' do
     end
   end
 end
-# rubocop:enable Metrics/BlockLength
 
 # Workaround for https://github.com/rubocop/rubocop/issues/12978,
 # there should already be no gemfile in the temp directory
@@ -136,6 +135,8 @@ RSpec.shared_context 'config' do # rubocop:disable Metrics/BlockLength
 
   let(:gem_versions) { {} }
 
+  let(:path_sourced_gems) { [] }
+
   ### Utilities
 
   def source_range(range, buffer: source_buffer)
@@ -180,6 +181,7 @@ RSpec.shared_context 'config' do # rubocop:disable Metrics/BlockLength
         **gem_versions.transform_values { |value| Gem::Version.new(value) }
       }
     )
+    allow(config).to receive(:path_sourced_gems_in_target).and_return(path_sourced_gems)
 
     config
   end

data/lib/rubocop/runner.rb

@@ -53,7 +53,7 @@ module RuboCop
       Lint/RedundantCopDisableDirective RedundantCopDisableDirective Lint
     ].freeze
 
-    attr_reader :errors, :warnings
+    attr_reader :errors, :warnings, :diffs
     attr_writer :aborting
 
     def initialize(options, config_store)
@@ -63,15 +63,18 @@ module RuboCop
       @warnings = []
       @aborting = false
       @inspected_files = []
+      @diffs = []
       @report_queue = {}
     end
 
     def run(paths)
+      @inspection_team_by_config = {}.compare_by_identity
+
       # Compute the cache source checksum once to avoid potential
       # inconsistencies between workers.
       ResultCache.source_checksum
 
-      target_files = find_target_files(paths)
+      target_files = only_changed(find_target_files(paths))
       build_project_index(target_files)
 
       if @options[:list_target_files]
@@ -93,6 +96,16 @@ module RuboCop
 
     private
 
+    # The project index is deliberately built from the unfiltered file list:
+    # cross-file offenses must not depend on which files happen to have changed.
+    def only_changed(target_files)
+      return target_files unless @options[:changed]
+
+      changed = ChangedFiles.new(@options[:changed]).paths
+
+      target_files.select { |file| changed.include?(file) }.freeze
+    end
+
     def find_target_files(paths)
       target_finder = TargetFinder.new(@config_store, @options)
       mode = if @options[:only_recognized_file_types]
@@ -203,8 +216,7 @@ module RuboCop
     end
 
     def run_in_parallel?(files)
-      return false if @options[:auto_gen_config]
-      return false unless @options[:parallel]
+      return false unless parallel_supported_by_options?
 
       if files.size <= 1
         puts 'Skipping parallel inspection: only a single file needs inspection' if @options[:debug]
@@ -218,6 +230,13 @@ module RuboCop
       true
     end
 
+    # `--auto-gen-config` needs the offenses of every file in one place, and
+    # `--diff` collects the diffs in this process, where a worker's copy of
+    # them would be lost.
+    def parallel_supported_by_options?
+      @options[:parallel] && !@options[:auto_gen_config] && !@options[:diff]
+    end
+
     def project_index_disables_parallel?
       return false if @project_index.nil? || !Gem.win_platform?
 
@@ -264,7 +283,8 @@ module RuboCop
       file_offense_cache(file) do
         source, offenses = do_inspection_loop(file)
         offenses = add_redundant_disables(file, offenses.compact.sort, source)
-        offenses.sort.reject(&:disabled?).freeze
+        offenses = offenses.reject(&:disabled?) unless @options[:display_suppressed]
+        offenses.sort.freeze
       end
     end
 
@@ -321,7 +341,13 @@ module RuboCop
     end
 
     def check_for_redundant_disables?(source)
-      return false if source.disabled_line_ranges.empty? || except_redundant_cop_disable_directive?
+      return false if except_redundant_cop_disable_directive?
+      # Detached `disable-next` directives produce no disabled ranges but must
+      # still be reported as redundant.
+      if source.disabled_line_ranges.empty? &&
+         source.comment_config.detached_next_directives.empty?
+        return false
+      end
 
       !@options[:only]
     end
@@ -370,6 +396,7 @@ module RuboCop
     def do_inspection_loop(file)
       # We can reuse the prism result since the source did not change yet.
       processed_source = get_processed_source(file, @prism_result)
+      original_source = processed_source.raw_source
       # This variable is 2d array used to track corrected offenses after each
       # inspection iteration. This is used to output meaningful infinite loop
       # error message.
@@ -382,11 +409,7 @@ module RuboCop
       # once. The corrections are kept in memory while iterating and written
       # back to the file when the loop is done.
       iterate_until_no_changes(processed_source, offenses_by_iteration) do
-        # The offenses that couldn't be corrected will be found again so we
-        # only keep the corrected ones in order to avoid duplicate reporting.
-        !offenses_by_iteration.empty? && offenses_by_iteration.last.select!(&:corrected?)
-        team, new_offenses, updated_source_file = inspect_iteration(processed_source)
-        offenses_by_iteration.push(new_offenses)
+        team, updated_source_file = inspect_and_correct(processed_source, offenses_by_iteration)
 
         # We have to reprocess the source to pickup the changes. Since the
         # change could (theoretically) introduce parsing errors, we break the
@@ -402,15 +425,49 @@ module RuboCop
       # Return summary of corrected offenses after all iterations
       [processed_source, offenses_by_iteration.flatten.uniq]
     ensure
-      # Write the file once, even when the loop was left through an exception
-      # (e.g. an infinite correction loop), like the per-iteration writes
-      # used to be.
-      File.write(file, corrected_source) if corrected_source
+      finalize_corrections(file, original_source, corrected_source)
+    end
+
+    def inspect_and_correct(processed_source, offenses_by_iteration)
+      # The offenses that couldn't be corrected will be found again so we
+      # only keep the corrected ones in order to avoid duplicate reporting.
+      !offenses_by_iteration.empty? && offenses_by_iteration.last.select!(&:corrected?)
+      team, new_offenses, updated_source_file = inspect_iteration(processed_source)
+      offenses_by_iteration.push(new_offenses)
+
+      [team, updated_source_file]
+    end
+
+    # Write the file once, even when the loop was left through an exception
+    # (e.g. an infinite correction loop), like the per-iteration writes used
+    # to be. Under `--diff` nothing is written at all.
+    def finalize_corrections(file, original_source, corrected_source)
+      if @options[:diff]
+        record_diff(file, original_source, corrected_source)
+      elsif corrected_source
+        File.write(file, corrected_source)
+      end
+    end
+
+    # `--diff` reports what autocorrection would do instead of doing it. With
+    # `--stdin` the corrected source is handed back through the options rather
+    # than deferred, so that is where the new source comes from.
+    def record_diff(file, original_source, corrected_source)
+      new_source = @options[:stdin] || corrected_source
+      return unless original_source && new_source
+
+      # The original source is the file as it is on disk, so the corrected one
+      # has to go through the same line ending conversion `File.write` would
+      # apply, or on Windows every single line reads as changed.
+      new_source = emulate_write_read_cycle(new_source)
+
+      diff = UnifiedDiff.new(PathUtil.smart_path(file), original_source, new_source).to_s
+      @diffs << diff unless diff.empty?
     end
 
     def inspect_iteration(processed_source)
       team = mobilize_team(processed_source)
-      team.defer_corrections = in_memory_corrections_possible?
+      team.defer_corrections = @options[:diff] || in_memory_corrections_possible?
       offenses, updated_source_file = inspect_file(processed_source, team)
       [team, offenses, updated_source_file]
     end
@@ -496,15 +553,8 @@ module RuboCop
 
     def mobilize_team(processed_source)
       config = @config_store.for_file(processed_source.path)
-      team = Cop::Team.mobilize(mobilized_cop_classes(config), config, @options)
-
-      if @project_index
-        team.cops.each do |cop|
-          cop.project_index = @project_index
-        end
-      end
-
-      team
+      @inspection_team_by_config ||= {}.compare_by_identity
+      @inspection_team_by_config[config] ||= assemble_team(config)
     end
 
     def mobilized_cop_classes(config)
@@ -600,16 +650,11 @@ module RuboCop
     end
 
     def minimum_severity_to_fail
-      @minimum_severity_to_fail ||= begin
-        # Unless given explicitly as `fail_level`, `:info` severity offenses do not fail
-        name = @options[:fail_level] || :refactor
-
-        # autocorrect is a fake level - use the default
-        RuboCop::Cop::Severity.new(name == :autocorrect ? :refactor : name)
-      end
+      @minimum_severity_to_fail ||=
+        RuboCop::Cop::Severity.minimum_to_fail(@options, @config_store.for_pwd)
     end
 
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable-next Metrics/MethodLength
     def get_processed_source(file, prism_result, source: nil)
       config = @config_store.for_file(file)
       ruby_version = config.target_ruby_version
@@ -643,25 +688,26 @@ module RuboCop
       processed_source.registry = mobilized_cop_classes(config)
       processed_source
     end
-    # rubocop:enable Metrics/MethodLength
 
     # A Cop::Team instance is stateful and may change when inspecting.
     # The "standby" team for a given config is an initialized but
     # otherwise dormant team that can be used for config- and option-
     # level caching in ResultCache.
     def standby_team(config)
-      @team_by_config ||= {}.compare_by_identity
-      @team_by_config[config] ||= begin
-        team = Cop::Team.mobilize(mobilized_cop_classes(config), config, @options)
-
-        if @project_index
-          team.cops.each do |cop|
-            cop.project_index = @project_index
-          end
-        end
+      @standby_team_by_config ||= {}.compare_by_identity
+      @standby_team_by_config[config] ||= assemble_team(config)
+    end
 
-        team
+    def assemble_team(config)
+      team = Cop::Team.mobilize(mobilized_cop_classes(config), config, @options)
+
+      if @project_index
+        team.cops.each do |cop|
+          cop.project_index = @project_index
+        end
       end
+
+      team
     end
   end
 end