rubocop 1.71.2 → 1.74.0

data/lib/rubocop/rspec/shared_contexts.rb

@@ -80,6 +80,21 @@ RSpec.shared_context 'maintain registry' do
   end
 end
 
+RSpec.shared_context 'maintain default configuration' do
+  around(:each) do |example|
+    # Make a copy of the current configuration that will not change when source hash changes
+    default_configuration = RuboCop::ConfigLoader.default_configuration
+    config = RuboCop::Config.create(
+      default_configuration.to_h.clone,
+      default_configuration.loaded_path
+    )
+
+    example.run
+
+    RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, config)
+  end
+end
+
 # This context assumes nothing and defines `cop`, among others.
 RSpec.shared_context 'config' do # rubocop:disable Metrics/BlockLength
   ### Meant to be overridden at will

data/lib/rubocop/rspec/support.rb

@@ -15,6 +15,7 @@ RSpec.configure do |config|
   config.include_context 'isolated bundler', :isolated_bundler
   config.include_context 'lsp', :lsp
   config.include_context 'maintain registry', :restore_registry
+  config.include_context 'maintain default configuration', :restore_configuration
   config.include_context 'ruby 2.0', :ruby20
   config.include_context 'ruby 2.1', :ruby21
   config.include_context 'ruby 2.2', :ruby22

data/lib/rubocop/server/cache.rb

@@ -2,8 +2,10 @@
 
 require 'digest'
 require 'pathname'
+require 'yaml'
 require_relative '../cache_config'
 require_relative '../config_finder'
+require_relative '../path_util'
 
 #
 # This code is based on https://github.com/fohte/rubocop-daemon.
@@ -50,9 +52,11 @@ module RuboCop
           end.find(&:exist?)
           version_data = lockfile_path&.read || RuboCop::Version::STRING
           config_data = Pathname(ConfigFinder.find_config_path(Dir.pwd)).read
-          todo_data = (rubocop_todo = Pathname('.rubocop_todo.yml')).exist? ? rubocop_todo.read : ''
+          yaml = YAML.safe_load(config_data, permitted_classes: [Regexp, Symbol], aliases: true)
+          inherit_from_data = inherit_from_data(yaml)
+          require_data = require_data(yaml)
 
-          Digest::SHA1.hexdigest(version_data + config_data + todo_data)
+          Digest::SHA1.hexdigest(version_data + config_data + inherit_from_data + require_data)
         end
         # rubocop:enable Metrics/AbcSize
 
@@ -164,6 +168,35 @@ module RuboCop
         def write_version_file(version)
           version_path.write(version)
         end
+
+        def inherit_from_data(yaml)
+          return '' unless (inherit_from_paths = yaml['inherit_from'])
+
+          Array(inherit_from_paths).map do |path|
+            next if PathUtil.remote_file?(path)
+
+            path = Pathname(path)
+
+            path.exist? ? path.read : ''
+          end.join
+        end
+
+        def require_data(yaml)
+          return '' unless (require_paths = yaml['require'])
+
+          Array(require_paths).map do |path|
+            # NOTE: This targets only relative or absolute path specifications.
+            # For example, specifications like `require: rubocop-performance`,
+            # which can be loaded from `$LOAD_PATH`, are ignored.
+            next unless path.start_with?('.', '/')
+
+            # NOTE: `.so` files are not typically specified, so only `.rb` files are targeted.
+            path = "#{path}.rb" unless path.end_with?('.rb')
+            path = Pathname(path)
+
+            path.exist? ? path.read : ''
+          end.join
+        end
       end
     end
   end

data/lib/rubocop/server/cli.rb

@@ -86,7 +86,7 @@ module RuboCop
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
 
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength:
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
       def run_command(server_command, detach:)
         case server_command
         when '--server'
@@ -107,7 +107,7 @@ module RuboCop
           Server::ClientCommand::Status.new.run
         end
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength:
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
 
       def fetch_cache_root_path_from(arguments)
         cache_root = arguments.detect { |argument| argument.start_with?('--cache-root') }

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.71.2'
+    STRING = '1.74.0'
 
     MSG = '%<version>s (using %<parser_version>s, ' \
           'rubocop-ast %<rubocop_ast_version>s, ' \
@@ -63,9 +63,21 @@ module RuboCop
     end
 
     # @api private
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
     def self.extension_versions(env)
+      plugins = config_for_pwd(env).loaded_plugins
+      plugin_versions = plugins.filter_map do |plugin|
+        next if Plugin::BUILTIN_INTERNAL_PLUGINS.key?(plugin.about.name)
+        next unless (plugin_name = plugin.about.name)
+
+        "  - #{plugin_name} #{plugin.about.version}"
+      end
+
+      # TODO: It needs to be maintained for a while to ensure compatibility with extensions that
+      # don't support plugins. It should be removed in future once the old style becomes obsolete.
       features = config_for_pwd(env).loaded_features.sort
-      features.filter_map do |loaded_feature|
+      features -= plugins.map { |plugin| plugin.about.name }
+      feature_versions = features.filter_map do |loaded_feature|
         next unless (match = loaded_feature.match(/rubocop-(?<feature>.*)/))
 
         # Get the expected name of the folder containing the extension code.
@@ -84,7 +96,10 @@ module RuboCop
 
         "  - #{loaded_feature} #{feature_version}"
       end
+
+      plugin_versions + feature_versions
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
     # @api private
     def self.target_ruby_version(env)

data/lib/rubocop.rb

@@ -148,7 +148,6 @@ 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/utils/regexp_ranges'
 
 require_relative 'rubocop/cop/migration/department_name'
 
@@ -304,6 +303,7 @@ require_relative 'rubocop/cop/lint/constant_definition_in_block'
 require_relative 'rubocop/cop/lint/constant_overwritten_in_rescue'
 require_relative 'rubocop/cop/lint/constant_reassignment'
 require_relative 'rubocop/cop/lint/constant_resolution'
+require_relative 'rubocop/cop/lint/cop_directive_syntax'
 require_relative 'rubocop/cop/lint/debugger'
 require_relative 'rubocop/cop/lint/deprecated_class_methods'
 require_relative 'rubocop/cop/lint/deprecated_constants'
@@ -384,6 +384,7 @@ require_relative 'rubocop/cop/lint/redundant_require_statement'
 require_relative 'rubocop/cop/lint/redundant_safe_navigation'
 require_relative 'rubocop/cop/lint/redundant_splat_expansion'
 require_relative 'rubocop/cop/lint/redundant_string_coercion'
+require_relative 'rubocop/cop/lint/redundant_type_conversion'
 require_relative 'rubocop/cop/lint/redundant_with_index'
 require_relative 'rubocop/cop/lint/redundant_with_object'
 require_relative 'rubocop/cop/lint/refinement_import_methods'
@@ -405,6 +406,7 @@ require_relative 'rubocop/cop/lint/shadowed_exception'
 require_relative 'rubocop/cop/lint/shadowing_outer_local_variable'
 require_relative 'rubocop/cop/lint/struct_new_override'
 require_relative 'rubocop/cop/lint/suppressed_exception'
+require_relative 'rubocop/cop/lint/suppressed_exception_in_number_conversion'
 require_relative 'rubocop/cop/lint/symbol_conversion'
 require_relative 'rubocop/cop/lint/syntax'
 require_relative 'rubocop/cop/lint/to_enum_arguments'
@@ -425,6 +427,7 @@ require_relative 'rubocop/cop/lint/uri_escape_unescape'
 require_relative 'rubocop/cop/lint/uri_regexp'
 require_relative 'rubocop/cop/lint/useless_access_modifier'
 require_relative 'rubocop/cop/lint/useless_assignment'
+require_relative 'rubocop/cop/lint/useless_constant_scoping'
 require_relative 'rubocop/cop/lint/useless_defined'
 require_relative 'rubocop/cop/lint/useless_else_without_rescue'
 require_relative 'rubocop/cop/lint/useless_method_definition'
@@ -506,6 +509,7 @@ require_relative 'rubocop/cop/style/combinable_loops'
 require_relative 'rubocop/cop/style/command_literal'
 require_relative 'rubocop/cop/style/comment_annotation'
 require_relative 'rubocop/cop/style/commented_keyword'
+require_relative 'rubocop/cop/style/comparable_between'
 require_relative 'rubocop/cop/style/comparable_clamp'
 require_relative 'rubocop/cop/style/concat_array_literals'
 require_relative 'rubocop/cop/style/conditional_assignment'
@@ -604,6 +608,7 @@ require_relative 'rubocop/cop/style/redundant_each'
 require_relative 'rubocop/cop/style/redundant_fetch_block'
 require_relative 'rubocop/cop/style/redundant_file_extension_in_require'
 require_relative 'rubocop/cop/style/redundant_filter_chain'
+require_relative 'rubocop/cop/style/redundant_format'
 require_relative 'rubocop/cop/style/redundant_heredoc_delimiter_quotes'
 require_relative 'rubocop/cop/style/redundant_initialize'
 require_relative 'rubocop/cop/style/redundant_interpolation_unfreeze'

data/lib/ruby_lsp/rubocop/addon.rb

@@ -2,14 +2,14 @@
 
 require_relative '../../rubocop'
 require_relative '../../rubocop/lsp/logger'
-require_relative 'wraps_built_in_lsp_runtime'
+require_relative 'runtime_adapter'
 
 module RubyLsp
   module RuboCop
     # A Ruby LSP add-on for RuboCop.
     class Addon < RubyLsp::Addon
       def initializer
-        @wraps_built_in_lsp_runtime = nil
+        @runtime_adapter = nil
       end
 
       def name
@@ -21,11 +21,8 @@ module RubyLsp
           "Activating RuboCop LSP addon #{::RuboCop::Version::STRING}.", prefix: '[RuboCop]'
         )
 
-        ::RuboCop::LSP.enable
-        @wraps_built_in_lsp_runtime = WrapsBuiltinLspRuntime.new
-
-        global_state.register_formatter('rubocop', @wraps_built_in_lsp_runtime)
-
+        @runtime_adapter = RuntimeAdapter.new
+        global_state.register_formatter('rubocop', @runtime_adapter)
         register_additional_file_watchers(global_state, message_queue)
 
         ::RuboCop::LSP::Logger.log(
@@ -34,7 +31,7 @@ module RubyLsp
       end
 
       def deactivate
-        @wraps_built_in_lsp_runtime = nil
+        @runtime_adapter = nil
       end
 
       # rubocop:disable Layout/LineLength, Metrics/MethodLength
@@ -67,9 +64,9 @@ module RubyLsp
       def workspace_did_change_watched_files(changes)
         return unless changes.any? { |change| change[:uri].end_with?('.rubocop.yml') }
 
-        @wraps_built_in_lsp_runtime.init!
+        @runtime_adapter = RuntimeAdapter.new
 
-        ::RuboCop::LSP::Logger(<<~MESSAGE, prefix: '[RuboCop]')
+        ::RuboCop::LSP::Logger.log(<<~MESSAGE, prefix: '[RuboCop]')
           Re-initialized RuboCop LSP addon #{::RuboCop::Version::STRING} due to .rubocop.yml file change.
         MESSAGE
       end

data/lib/ruby_lsp/rubocop/{wraps_built_in_lsp_runtime.rb → runtime_adapter.rb}

@@ -4,18 +4,15 @@ require_relative '../../rubocop/lsp/runtime'
 
 module RubyLsp
   module RuboCop
-    # Wrap RuboCop's built-in runtime for Ruby LSP's add-on.
-    class WrapsBuiltinLspRuntime
+    # Provides an adapter to bridge RuboCop's built-in LSP runtime with Ruby LSP's add-on.
+    # @api private
+    class RuntimeAdapter
       include RubyLsp::Requests::Support::Formatter
 
       def initialize
-        init!
-      end
-
-      def init!
-        config = ::RuboCop::ConfigStore.new
+        config_store = ::RuboCop::ConfigStore.new
 
-        @runtime = ::RuboCop::LSP::Runtime.new(config)
+        @runtime = ::RuboCop::LSP::Runtime.new(config_store)
       end
 
       def run_diagnostic(uri, document)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.71.2
+  version: 1.74.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -9,7 +9,7 @@ authors:
 - Yuji Nakayama
 bindir: exe
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -29,16 +29,30 @@ dependencies:
   name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: 3.17.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.17.0.2
+- !ruby/object:Gem::Dependency
+  name: lint_roller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +286,7 @@ files:
 - lib/rubocop/cop/internal_affairs/example_heredoc_delimiter.rb
 - lib/rubocop/cop/internal_affairs/inherit_deprecated_cop_class.rb
 - lib/rubocop/cop/internal_affairs/lambda_or_proc.rb
+- lib/rubocop/cop/internal_affairs/location_exists.rb
 - lib/rubocop/cop/internal_affairs/location_expression.rb
 - lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb
 - lib/rubocop/cop/internal_affairs/method_name_end_with.rb
@@ -282,12 +297,14 @@ files:
 - lib/rubocop/cop/internal_affairs/node_pattern_groups.rb
 - lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_processor.rb
 - lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_walker.rb
+- lib/rubocop/cop/internal_affairs/node_type_group.rb
 - lib/rubocop/cop/internal_affairs/node_type_multiple_predicates.rb
 - lib/rubocop/cop/internal_affairs/node_type_predicate.rb
 - lib/rubocop/cop/internal_affairs/numblock_handler.rb
 - lib/rubocop/cop/internal_affairs/offense_location_keyword.rb
 - lib/rubocop/cop/internal_affairs/on_send_without_on_csend.rb
 - lib/rubocop/cop/internal_affairs/operator_keyword.rb
+- lib/rubocop/cop/internal_affairs/plugin.rb
 - lib/rubocop/cop/internal_affairs/processed_source_buffer_name.rb
 - lib/rubocop/cop/internal_affairs/redundant_context_config_parameter.rb
 - lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb
@@ -419,6 +436,7 @@ files:
 - lib/rubocop/cop/lint/constant_overwritten_in_rescue.rb
 - lib/rubocop/cop/lint/constant_reassignment.rb
 - lib/rubocop/cop/lint/constant_resolution.rb
+- lib/rubocop/cop/lint/cop_directive_syntax.rb
 - lib/rubocop/cop/lint/debugger.rb
 - lib/rubocop/cop/lint/deprecated_class_methods.rb
 - lib/rubocop/cop/lint/deprecated_constants.rb
@@ -498,6 +516,7 @@ files:
 - lib/rubocop/cop/lint/redundant_safe_navigation.rb
 - lib/rubocop/cop/lint/redundant_splat_expansion.rb
 - lib/rubocop/cop/lint/redundant_string_coercion.rb
+- lib/rubocop/cop/lint/redundant_type_conversion.rb
 - lib/rubocop/cop/lint/redundant_with_index.rb
 - lib/rubocop/cop/lint/redundant_with_object.rb
 - lib/rubocop/cop/lint/refinement_import_methods.rb
@@ -520,6 +539,7 @@ files:
 - lib/rubocop/cop/lint/shared_mutable_default.rb
 - lib/rubocop/cop/lint/struct_new_override.rb
 - lib/rubocop/cop/lint/suppressed_exception.rb
+- lib/rubocop/cop/lint/suppressed_exception_in_number_conversion.rb
 - lib/rubocop/cop/lint/symbol_conversion.rb
 - lib/rubocop/cop/lint/syntax.rb
 - lib/rubocop/cop/lint/to_enum_arguments.rb
@@ -540,6 +560,7 @@ files:
 - lib/rubocop/cop/lint/uri_regexp.rb
 - lib/rubocop/cop/lint/useless_access_modifier.rb
 - lib/rubocop/cop/lint/useless_assignment.rb
+- lib/rubocop/cop/lint/useless_constant_scoping.rb
 - lib/rubocop/cop/lint/useless_defined.rb
 - lib/rubocop/cop/lint/useless_else_without_rescue.rb
 - lib/rubocop/cop/lint/useless_method_definition.rb
@@ -708,6 +729,7 @@ files:
 - lib/rubocop/cop/style/command_literal.rb
 - lib/rubocop/cop/style/comment_annotation.rb
 - lib/rubocop/cop/style/commented_keyword.rb
+- lib/rubocop/cop/style/comparable_between.rb
 - lib/rubocop/cop/style/comparable_clamp.rb
 - lib/rubocop/cop/style/concat_array_literals.rb
 - lib/rubocop/cop/style/conditional_assignment.rb
@@ -865,6 +887,7 @@ files:
 - lib/rubocop/cop/style/redundant_fetch_block.rb
 - lib/rubocop/cop/style/redundant_file_extension_in_require.rb
 - lib/rubocop/cop/style/redundant_filter_chain.rb
+- lib/rubocop/cop/style/redundant_format.rb
 - lib/rubocop/cop/style/redundant_freeze.rb
 - lib/rubocop/cop/style/redundant_heredoc_delimiter_quotes.rb
 - lib/rubocop/cop/style/redundant_initialize.rb
@@ -950,7 +973,6 @@ files:
 - lib/rubocop/cop/team.rb
 - lib/rubocop/cop/util.rb
 - lib/rubocop/cop/utils/format_string.rb
-- lib/rubocop/cop/utils/regexp_ranges.rb
 - lib/rubocop/cop/variable_force.rb
 - lib/rubocop/cop/variable_force/assignment.rb
 - lib/rubocop/cop/variable_force/branch.rb
@@ -1008,6 +1030,11 @@ files:
 - lib/rubocop/options.rb
 - lib/rubocop/path_util.rb
 - lib/rubocop/platform.rb
+- lib/rubocop/plugin.rb
+- lib/rubocop/plugin/configuration_integrator.rb
+- lib/rubocop/plugin/load_error.rb
+- lib/rubocop/plugin/loader.rb
+- lib/rubocop/plugin/not_supported_error.rb
 - lib/rubocop/rake_task.rb
 - lib/rubocop/remote_config.rb
 - lib/rubocop/result_cache.rb
@@ -1043,15 +1070,15 @@ files:
 - lib/rubocop/warning.rb
 - lib/rubocop/yaml_duplication_checker.rb
 - lib/ruby_lsp/rubocop/addon.rb
-- lib/ruby_lsp/rubocop/wraps_built_in_lsp_runtime.rb
+- lib/ruby_lsp/rubocop/runtime_adapter.rb
 homepage: https://github.com/rubocop/rubocop
 licenses:
 - MIT
 metadata:
   homepage_uri: https://rubocop.org/
-  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.71.2
+  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.74.0
   source_code_uri: https://github.com/rubocop/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.71/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.74/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
   rubygems_mfa_required: 'true'
 rdoc_options: []

data/lib/rubocop/cop/utils/regexp_ranges.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Utils
-      # Helper to abstract complexity of building range pairs
-      # with octal escape reconstruction (needed for regexp_parser < 2.7).
-      class RegexpRanges
-        attr_reader :root
-
-        def initialize(root)
-          @root = root
-          @compound_token = []
-          @pairs = []
-          @populated = false
-        end
-
-        def compound_token
-          populate_all unless @populated
-
-          @compound_token
-        end
-
-        def pairs
-          populate_all unless @populated
-
-          @pairs
-        end
-
-        private
-
-        def populate_all
-          populate(@root)
-
-          # If either bound is a compound the first one is an escape
-          # and that's all we need to work with.
-          # If there are any cops that wanted to operate on the compound
-          # expression we could wrap it with a facade class.
-          @pairs.map! { |pair| pair.map(&:first) }
-
-          @populated = true
-        end
-
-        def populate(expr)
-          expressions = expr.expressions.to_a
-
-          until expressions.empty?
-            current = expressions.shift
-
-            if escaped_octal?(current)
-              @compound_token << current
-              @compound_token.concat(pop_octal_digits(expressions))
-              # If we have all the digits we can discard.
-            end
-
-            next unless current.type == :set
-
-            process_set(expressions, current)
-            @compound_token.clear
-          end
-        end
-
-        def process_set(expressions, current)
-          case current.token
-          when :range
-            @pairs << compose_range(expressions, current)
-          when :character
-            # Child expressions may include the range we are looking for.
-            populate(current)
-          when :intersection
-            # Each child expression could have child expressions that lead to ranges.
-            current.expressions.each do |intersected|
-              populate(intersected)
-            end
-          end
-        end
-
-        def compose_range(expressions, current)
-          range_start, range_end = current.expressions
-          range_start = if @compound_token.size.between?(1, 2) && octal_digit?(range_start.text)
-                          @compound_token.dup << range_start
-                        else
-                          [range_start]
-                        end
-          range_end = [range_end]
-          range_end.concat(pop_octal_digits(expressions)) if escaped_octal?(range_end.first)
-          [range_start, range_end]
-        end
-
-        def escaped_octal?(expr)
-          expr.text.valid_encoding? && expr.text =~ /^\\[0-7]$/
-        end
-
-        def octal_digit?(char)
-          ('0'..'7').cover?(char)
-        end
-
-        def pop_octal_digits(expressions)
-          digits = []
-
-          2.times do
-            next unless (next_child = expressions.first)
-            next unless next_child.type == :literal && next_child.text =~ /^[0-7]$/
-
-            digits << expressions.shift
-          end
-
-          digits
-        end
-      end
-    end
-  end
-end