rubocop 1.86.0 → 1.86.2

data/lib/rubocop/rspec/shared_contexts.rb

@@ -212,6 +212,27 @@ RSpec.shared_context 'lsp' do
   end
 end
 
+RSpec.shared_context 'with exclude limit tracking' do
+  around do |example|
+    Dir.mktmpdir('rubocop-exclude-limit') do |dir|
+      RuboCop::ExcludeLimit.tmp_dir = Pathname.new(dir)
+      example.run
+    ensure
+      RuboCop::ExcludeLimit.tmp_dir = nil
+    end
+  end
+
+  # Reads exclude_limit values from the tmp files written by ExcludeLimit.
+  # Returns a hash like { 'Max' => 81 } or nil if no values were written.
+  def read_exclude_limit(cop, parameter_name = nil)
+    if parameter_name
+      read_exclude_limit(cop)[parameter_name]
+    else
+      RuboCop::ExcludeLimit.read_limits(cop.class.badge.to_s)
+    end
+  end
+end
+
 RSpec.shared_context 'ruby 2.0' do
   # Prism supports parsing Ruby 3.3+.
   let(:ruby_version) { ENV['PARSER_ENGINE'] == 'parser_prism' ? 3.3 : 2.0 }

data/lib/rubocop/runner.rb

@@ -62,6 +62,8 @@ module RuboCop
       @errors = []
       @warnings = []
       @aborting = false
+      @inspected_files = []
+      @report_queue = {}
     end
 
     def run(paths)
@@ -73,7 +75,6 @@ module RuboCop
       if @options[:list_target_files]
         list_files(target_files)
       else
-        warm_cache(target_files) if @options[:parallel]
         inspect_files(target_files)
       end
     rescue Interrupt
@@ -90,21 +91,6 @@ module RuboCop
 
     private
 
-    # Warms up the RuboCop cache by forking a suitable number of RuboCop
-    # instances that each inspects its allotted group of files.
-    def warm_cache(target_files)
-      saved_options = @options.dup
-      if target_files.length <= 1
-        puts 'Skipping parallel inspection: only a single file needs inspection' if @options[:debug]
-        return
-      end
-      puts 'Running parallel inspection' if @options[:debug]
-      %i[autocorrect safe_autocorrect].each { |opt| @options[opt] = false }
-      Parallel.each(target_files) { |target_file| file_offenses(target_file) }
-    ensure
-      @options = saved_options
-    end
-
     def find_target_files(paths)
       target_finder = TargetFinder.new(@config_store, @options)
       mode = if @options[:only_recognized_file_types]
@@ -116,12 +102,15 @@ module RuboCop
       target_files.each(&:freeze).freeze
     end
 
-    def inspect_files(files)
-      inspected_files = []
-
+    def inspect_files(files) # rubocop:disable Metrics/AbcSize
       formatter_set.started(files)
+      file_iterator(files) do |file|
+        offenses = process_file(file)
+        succeeded = offenses.none? { |o| considered_failure?(o) && offense_displayed?(o) }
+        raise Parallel::Break if @options[:fail_fast] && !succeeded
 
-      each_inspected_file(files) { |file| inspected_files << file }
+        [offenses, succeeded]
+      end
     ensure
       # OPTIMIZE: Calling `ResultCache.cleanup` takes time. This optimization
       # mainly targets editors that integrates RuboCop. When RuboCop is run
@@ -129,23 +118,74 @@ module RuboCop
       if files.size > 1 && cached_run?
         ResultCache.cleanup(@config_store, @options[:debug], @options[:cache_root])
       end
-
-      formatter_set.finished(inspected_files.freeze)
+      formatter_set.finished(@inspected_files.freeze)
       formatter_set.close_output_files
     end
 
-    def each_inspected_file(files)
-      files.reduce(true) do |all_passed, file|
-        offenses = process_file(file)
-        yield file
+    def file_iterator(files, &block)
+      all_passed = true
 
-        if offenses.any? { |o| considered_failure?(o) && offense_displayed?(o) }
-          break false if @options[:fail_fast]
+      on_start = ->(file, _index) { file_started(file) }
+      on_finish = lambda do |file, index, (offenses, passed)|
+        all_passed &&= passed
+        finished_report(file, index, offenses)
+      end
 
-          next false
-        end
+      if run_in_parallel?(files)
+        parallel_file_iterator(files, on_start, on_finish, &block)
+      else
+        serial_file_iterator(files, on_start, on_finish, &block)
+      end
+
+      process_remaining_report_queue
 
-        all_passed
+      all_passed
+    end
+
+    def finished_report(file, index, offenses)
+      @report_queue[index] = [file, offenses]
+      @next_index_to_report ||= 0
+      while @report_queue.key?(@next_index_to_report)
+        process_report_queue_entry(@next_index_to_report)
+        @next_index_to_report += 1
+      end
+    end
+
+    def process_report_queue_entry(index)
+      file, offenses = @report_queue.delete(index)
+      file_finished(file, offenses)
+    end
+
+    def process_remaining_report_queue
+      @report_queue.keys.sort.each do |index|
+        process_report_queue_entry(index)
+      end
+    end
+
+    def run_in_parallel?(files)
+      return false if @options[:auto_gen_config]
+      return false unless @options[:parallel]
+
+      if files.size <= 1
+        puts 'Skipping parallel inspection: only a single file needs inspection' if @options[:debug]
+        return false
+      end
+
+      puts 'Running parallel inspection' if @options[:debug]
+      true
+    end
+
+    def parallel_file_iterator(files, on_start, on_finish, &block)
+      Parallel.each(files, start: on_start, finish: on_finish, &block)
+    end
+
+    def serial_file_iterator(files, on_start, on_finish, &block)
+      files.each_with_index do |file, index|
+        on_start.call(file, index)
+        result = yield file
+        on_finish.call(file, index, result)
+      rescue Parallel::Break
+        break
       end
     end
 
@@ -154,16 +194,13 @@ module RuboCop
     end
 
     def process_file(file)
-      file_started(file)
-      offenses = file_offenses(file)
+      file_offenses(file)
     rescue InfiniteCorrectionLoop => e
       raise e if @options[:raise_cop_error]
 
       errors << e
       warn Rainbow(e.message).red
-      offenses = e.offenses.compact.sort.freeze
-    ensure
-      file_finished(file, offenses || [])
+      e.offenses.compact.sort.freeze
     end
 
     def file_offenses(file)
@@ -250,6 +287,7 @@ module RuboCop
     end
 
     def file_finished(file, offenses)
+      @inspected_files << file
       offenses = offenses_to_report(offenses)
       formatter_set.file_finished(file, offenses)
     end
@@ -258,10 +296,6 @@ module RuboCop
       @cached_run ||=
         (@options[:cache] == 'true' ||
          (@options[:cache] != 'false' && @config_store.for_pwd.for_all_cops['UseCache'])) &&
-        # When running --auto-gen-config, there's some processing done in the
-        # cops related to calculating the Max parameters for Metrics cops. We
-        # need to do that processing and cannot use caching.
-        !@options[:auto_gen_config] &&
         # We can't cache results from code which is piped in to stdin
         !@options[:stdin]
     end
@@ -350,21 +384,9 @@ module RuboCop
 
     def inspect_file(processed_source, team = mobilize_team(processed_source))
       extracted_ruby_sources = extract_ruby_sources(processed_source)
-      offenses = []
-
-      extracted_ruby_sources.each do |extracted_ruby_source|
-        report = team.investigate(
-          extracted_ruby_source[:processed_source],
-          offset: extracted_ruby_source[:offset],
-          original: processed_source
-        )
-        @errors.concat(team.errors)
-        @warnings.concat(team.warnings)
-        offenses.concat(report.offenses)
-
-        break if team.updated_source_file?
-      end
-
+      offenses = team.investigate_fragments(extracted_ruby_sources, original: processed_source)
+      @errors.concat(team.errors)
+      @warnings.concat(team.warnings)
       [offenses, team.updated_source_file?]
     end
 

data/lib/rubocop/target_finder.rb

@@ -44,10 +44,10 @@ module RuboCop
       all_files = find_files(base_dir, File::FNM_DOTMATCH)
       base_dir_config = @config_store.for(base_dir)
 
-      target_files = if hidden_path?(base_dir)
+      target_files = if hidden_dir?(base_dir)
                        all_files.select { |file| ruby_file?(file) }
                      else
-                       all_files.select { |file| to_inspect?(file, base_dir_config) }
+                       all_files.select { |file| to_inspect?(file, base_dir, base_dir_config) }
                      end
 
       target_files.sort_by!(&order)
@@ -72,15 +72,22 @@ module RuboCop
 
     private
 
-    def to_inspect?(file, base_dir_config)
+    def to_inspect?(file, base_dir, base_dir_config)
       return false if base_dir_config.file_to_exclude?(file)
-      return true if !hidden_path?(file) && ruby_file?(file)
+      return true if !hidden_file_in_dir?(file, base_dir) && ruby_file?(file)
 
       base_dir_config.file_to_include?(file)
     end
 
-    def hidden_path?(path)
-      path.include?(HIDDEN_PATH_SUBSTRING)
+    def hidden_dir?(dir)
+      basename = File.basename(dir)
+      basename.start_with?('.') && basename != '.' && basename != '..'
+    end
+
+    def hidden_file_in_dir?(file, base_dir)
+      base_dir = "#{base_dir}#{File::SEPARATOR}" unless base_dir.end_with?(File::SEPARATOR)
+      relative = file.delete_prefix(base_dir)
+      relative.start_with?('.') || relative.include?(HIDDEN_PATH_SUBSTRING)
     end
 
     def wanted_dir_patterns(base_dir, exclude_pattern, flags)

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.86.0'
+    STRING = '1.86.2'
 
     MSG = '%<version>s (using %<parser_version>s, ' \
           'rubocop-ast %<rubocop_ast_version>s, ' \

data/lib/rubocop.rb

@@ -52,6 +52,7 @@ require_relative 'rubocop/cop/cop'
 require_relative 'rubocop/cop/commissioner'
 require_relative 'rubocop/cop/documentation'
 require_relative 'rubocop/cop/corrector'
+require_relative 'rubocop/cop/correctors'
 require_relative 'rubocop/cop/force'
 require_relative 'rubocop/cop/severity'
 require_relative 'rubocop/cop/generator'
@@ -68,109 +69,18 @@ require_relative 'rubocop/cop/variable_force/reference'
 require_relative 'rubocop/cop/variable_force/scope'
 require_relative 'rubocop/cop/variable_force/variable_table'
 
-require_relative 'rubocop/cop/mixin/array_min_size'
-require_relative 'rubocop/cop/mixin/array_syntax'
-require_relative 'rubocop/cop/mixin/alignment'
-require_relative 'rubocop/cop/mixin/allowed_identifiers'
-require_relative 'rubocop/cop/mixin/allowed_methods'
-require_relative 'rubocop/cop/mixin/allowed_pattern'
-require_relative 'rubocop/cop/mixin/allowed_receivers'
-require_relative 'rubocop/cop/mixin/forbidden_identifiers'
-require_relative 'rubocop/cop/mixin/forbidden_pattern'
-require_relative 'rubocop/cop/mixin/auto_corrector' # rubocop:todo Naming/InclusiveLanguage
-require_relative 'rubocop/cop/mixin/check_assignment'
-require_relative 'rubocop/cop/mixin/check_line_breakable'
-require_relative 'rubocop/cop/mixin/check_single_line_suitability'
-require_relative 'rubocop/cop/mixin/configurable_max'
-require_relative 'rubocop/cop/mixin/code_length' # relies on configurable_max
-require_relative 'rubocop/cop/mixin/configurable_enforced_style'
-require_relative 'rubocop/cop/mixin/configurable_formatting'
-require_relative 'rubocop/cop/mixin/configurable_naming'
-require_relative 'rubocop/cop/mixin/configurable_numbering'
-require_relative 'rubocop/cop/mixin/dig_help'
-require_relative 'rubocop/cop/mixin/documentation_comment'
-require_relative 'rubocop/cop/mixin/duplication'
-require_relative 'rubocop/cop/mixin/range_help'
-require_relative 'rubocop/cop/mixin/annotation_comment' # relies on range
-require_relative 'rubocop/cop/mixin/empty_lines_around_body' # relies on range
-require_relative 'rubocop/cop/mixin/empty_parameter'
-require_relative 'rubocop/cop/mixin/end_keyword_alignment'
-require_relative 'rubocop/cop/mixin/endless_method_rewriter'
-require_relative 'rubocop/cop/mixin/enforce_superclass'
-require_relative 'rubocop/cop/mixin/first_element_line_break'
-require_relative 'rubocop/cop/mixin/frozen_string_literal'
-require_relative 'rubocop/cop/mixin/gem_declaration'
-require_relative 'rubocop/cop/mixin/gemspec_help'
-require_relative 'rubocop/cop/mixin/hash_alignment_styles'
-require_relative 'rubocop/cop/mixin/hash_subset'
-require_relative 'rubocop/cop/mixin/hash_transform_method'
-require_relative 'rubocop/cop/mixin/integer_node'
-require_relative 'rubocop/cop/mixin/interpolation'
-require_relative 'rubocop/cop/mixin/line_length_help'
-require_relative 'rubocop/cop/mixin/match_range'
+require_relative 'rubocop/cop/mixin'
+# TODO: move to Layout module once cop lazy loading is implemented
+require_relative 'rubocop/cop/mixin/empty_lines_around_body'
+# TODO: move to Lint module once cop lazy loading is implemented
+require_relative 'rubocop/cop/mixin/unused_argument'
 require_relative 'rubocop/cop/metrics/utils/repeated_csend_discount'
 require_relative 'rubocop/cop/metrics/utils/repeated_attribute_discount'
-require_relative 'rubocop/cop/mixin/hash_shorthand_syntax'
-require_relative 'rubocop/cop/mixin/method_complexity'
-require_relative 'rubocop/cop/mixin/method_preference'
-require_relative 'rubocop/cop/mixin/min_body_length'
-require_relative 'rubocop/cop/mixin/min_branches_count'
-require_relative 'rubocop/cop/mixin/multiline_element_indentation'
-require_relative 'rubocop/cop/mixin/multiline_element_line_breaks'
-require_relative 'rubocop/cop/mixin/multiline_expression_indentation'
-require_relative 'rubocop/cop/mixin/multiline_literal_brace_layout'
-require_relative 'rubocop/cop/mixin/negative_conditional'
-require_relative 'rubocop/cop/mixin/heredoc'
-require_relative 'rubocop/cop/mixin/nil_methods'
-require_relative 'rubocop/cop/mixin/on_normal_if_unless'
-require_relative 'rubocop/cop/mixin/ordered_gem_node'
-require_relative 'rubocop/cop/mixin/parentheses'
-require_relative 'rubocop/cop/mixin/percent_array'
-require_relative 'rubocop/cop/mixin/percent_literal'
-require_relative 'rubocop/cop/mixin/preceding_following_alignment'
-require_relative 'rubocop/cop/mixin/preferred_delimiters'
-require_relative 'rubocop/cop/mixin/rational_literal'
-require_relative 'rubocop/cop/mixin/require_library'
-require_relative 'rubocop/cop/mixin/rescue_node'
-require_relative 'rubocop/cop/mixin/safe_assignment'
-require_relative 'rubocop/cop/mixin/space_after_punctuation'
-require_relative 'rubocop/cop/mixin/space_before_punctuation'
-require_relative 'rubocop/cop/mixin/surrounding_space'
-require_relative 'rubocop/cop/mixin/statement_modifier'
-require_relative 'rubocop/cop/mixin/string_help'
-require_relative 'rubocop/cop/mixin/string_literals_help'
-require_relative 'rubocop/cop/mixin/symbol_help'
-require_relative 'rubocop/cop/mixin/target_ruby_version'
-require_relative 'rubocop/cop/mixin/trailing_body'
-require_relative 'rubocop/cop/mixin/trailing_comma'
-require_relative 'rubocop/cop/mixin/uncommunicative_name'
-require_relative 'rubocop/cop/mixin/unused_argument'
-require_relative 'rubocop/cop/mixin/visibility_help'
-require_relative 'rubocop/cop/mixin/comments_help' # relies on visibility_help
-require_relative 'rubocop/cop/mixin/def_node' # relies on visibility_help
 
 require_relative 'rubocop/cop/utils/format_string'
 
 require_relative 'rubocop/cop/migration/department_name'
 
-require_relative 'rubocop/cop/correctors/alignment_corrector'
-require_relative 'rubocop/cop/correctors/condition_corrector'
-require_relative 'rubocop/cop/correctors/each_to_for_corrector'
-require_relative 'rubocop/cop/correctors/empty_line_corrector'
-require_relative 'rubocop/cop/correctors/for_to_each_corrector'
-require_relative 'rubocop/cop/correctors/if_then_corrector'
-require_relative 'rubocop/cop/correctors/lambda_literal_to_method_corrector'
-require_relative 'rubocop/cop/correctors/line_break_corrector'
-require_relative 'rubocop/cop/correctors/multiline_literal_brace_corrector'
-require_relative 'rubocop/cop/correctors/ordered_gem_corrector'
-require_relative 'rubocop/cop/correctors/parentheses_corrector'
-require_relative 'rubocop/cop/correctors/percent_literal_corrector'
-require_relative 'rubocop/cop/correctors/punctuation_corrector'
-require_relative 'rubocop/cop/correctors/require_library_corrector'
-require_relative 'rubocop/cop/correctors/space_corrector'
-require_relative 'rubocop/cop/correctors/string_literal_corrector'
-require_relative 'rubocop/cop/correctors/unused_arg_corrector'
-
 require_relative 'rubocop/cop/bundler/duplicated_gem'
 require_relative 'rubocop/cop/bundler/duplicated_group'
 require_relative 'rubocop/cop/bundler/gem_comment'
@@ -824,6 +734,7 @@ require_relative 'rubocop/cli/command/auto_generate_config'
 require_relative 'rubocop/cli/command/execute_runner'
 require_relative 'rubocop/cli/command/init_dotfile'
 require_relative 'rubocop/cli/command/lsp'
+require_relative 'rubocop/cli/command/list_enabled_cops_for'
 require_relative 'rubocop/cli/command/mcp'
 require_relative 'rubocop/cli/command/show_cops'
 require_relative 'rubocop/cli/command/show_docs_url'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.86.0
+  version: 1.86.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -57,14 +57,14 @@ dependencies:
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
@@ -207,6 +207,7 @@ files:
 - lib/rubocop/cli/command/base.rb
 - lib/rubocop/cli/command/execute_runner.rb
 - lib/rubocop/cli/command/init_dotfile.rb
+- lib/rubocop/cli/command/list_enabled_cops_for.rb
 - lib/rubocop/cli/command/lsp.rb
 - lib/rubocop/cli/command/mcp.rb
 - lib/rubocop/cli/command/show_cops.rb
@@ -245,6 +246,7 @@ files:
 - lib/rubocop/cop/commissioner.rb
 - lib/rubocop/cop/cop.rb
 - lib/rubocop/cop/corrector.rb
+- lib/rubocop/cop/correctors.rb
 - lib/rubocop/cop/correctors/alignment_corrector.rb
 - lib/rubocop/cop/correctors/condition_corrector.rb
 - lib/rubocop/cop/correctors/each_to_for_corrector.rb
@@ -596,6 +598,7 @@ files:
 - lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb
 - lib/rubocop/cop/metrics/utils/repeated_csend_discount.rb
 - lib/rubocop/cop/migration/department_name.rb
+- lib/rubocop/cop/mixin.rb
 - lib/rubocop/cop/mixin/alignment.rb
 - lib/rubocop/cop/mixin/allowed_identifiers.rb
 - lib/rubocop/cop/mixin/allowed_methods.rb
@@ -1114,7 +1117,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://rubocop.org/
-  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.86.0
+  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.86.2
   source_code_uri: https://github.com/rubocop/rubocop/
   documentation_uri: https://docs.rubocop.org/rubocop/1.86/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues