rubocop 1.92.0 → 1.92.1

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

@@ -101,17 +101,19 @@ module RuboCop
         end
 
         def find_previous_older_sibling(node) # rubocop:disable Metrics
-          search_node(node).left_siblings.reverse.find do |sibling|
+          oldest = nil
+          search_node(node).left_siblings.reverse_each do |sibling|
             next unless sibling.is_a?(AST::Node)
 
-            sibling = sibling_node(sibling)
-            break unless sibling&.send_type? && sibling.method?(node.method_name)
-            break unless sibling.arguments? && !sibling.receiver
-            break unless in_same_section?(sibling, node)
-            break unless node.first_argument.str_type? && sibling.first_argument.str_type?
+            required = sibling_node(sibling)
+            break unless required&.send_type? && required.method?(node.method_name)
+            break unless required.arguments? && !required.receiver
+            break unless in_same_section?(required, node)
+            break unless node.first_argument.str_type? && required.first_argument.str_type?
 
-            node.first_argument.value < sibling.first_argument.value
+            oldest = sibling if node.first_argument.value < required.first_argument.value
           end
+          oldest
         end
 
         def own_lines?(node)
@@ -124,9 +126,15 @@ module RuboCop
         def autocorrect(corrector, node, previous_older_sibling)
           range1 = range_with_comments_and_lines(previous_older_sibling)
           range2 = range_with_comments_and_lines(node.parent.if_type? ? node.parent : node)
+          source = range2.source
+
+          unless source.end_with?("\n")
+            source += "\n"
+            range2 = range2.with(begin_pos: range2.begin_pos - 1)
+          end
 
           corrector.remove(range2)
-          corrector.insert_before(range1, range2.source)
+          corrector.insert_before(range1.begin, source)
         end
 
         def search_node(node)

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

@@ -56,16 +56,22 @@ module RuboCop
           add_offense(rescue_node) do |corrector|
             # The heredoc body would be left behind when the rescue body is moved.
             next if heredoc_end(node)
+            next if inside_corrected_rescue_body?(rescue_node)
 
             parenthesized = parenthesized?(rescue_node)
 
             correct_rescue_block(corrector, rescue_node, parenthesized)
             ParenthesesCorrector.correct(corrector, rescue_node.parent) if parenthesized
+            ignore_node(rescue_node)
           end
         end
 
         private
 
+        def inside_corrected_rescue_body?(node)
+          node.each_ancestor(:resbody).any? { |resbody| ignored_node?(resbody.parent) }
+        end
+
         def parenthesized?(node)
           node.parent && parentheses?(node.parent)
         end

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

@@ -64,6 +64,10 @@ module RuboCop
           undef unless until when while yield
         ].freeze
 
+        def self.autocorrect_incompatible_with
+          [Layout::MultilineMethodArgumentLineBreaks]
+        end
+
         # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def on_send(node)
           return if allow_send? && !node.method?(:public_send)

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

@@ -78,6 +78,11 @@ module RuboCop
             NOT_SUPPORTED_ENDLESS_METHOD_BODY_TYPES.include?(body_node.type)
         end
 
+        # The body gets parenthesized when it becomes endless, so it is no longer a command.
+        def command_body_in_argument?(body)
+          !require_parentheses?(body) && super
+        end
+
         def correct_to_multiline(corrector, node)
           if (body = node.body) && body.begin_type? && body.parenthesized_call?
             break_line_before(corrector, node, body)

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

@@ -41,6 +41,12 @@ module RuboCop
         MSG = "Don't extend an instance initialized by `Struct.new`. " \
               'Use a block to customize the struct.'
 
+        # When the closing parenthesis of `Struct.new` is on its own line, omitting the
+        # parentheses in the same pass leaves a line break before the appended `do`.
+        def self.autocorrect_incompatible_with
+          [Style::MethodCallWithArgsParentheses]
+        end
+
         def on_class(node)
           return unless struct_constructor?(node.parent_class)
           return if defines_constants?(node.body)

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

@@ -166,7 +166,7 @@ module RuboCop
         PATTERN
 
         def self.autocorrect_incompatible_with
-          [Layout::SpaceBeforeBlockBraces]
+          [Layout::SpaceBeforeBlockBraces, Style::TrailingCommaInArguments]
         end
 
         # rubocop:disable-next Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

data/lib/rubocop/lsp/routes.rb

@@ -25,12 +25,6 @@ module RuboCop
       # via `executeCommandProvider` so it knows which commands it can invoke.
       EXECUTE_COMMANDS = %w[rubocop.formatAutocorrects rubocop.formatAutocorrectsAll].freeze
 
-      def self.handle(name, &block)
-        define_method(:"handle_#{name}", &block)
-      end
-
-      private_class_method :handle
-
       def initialize(server)
         @server = server
 
@@ -44,6 +38,29 @@ module RuboCop
         method(name)
       end
 
+      def handle_unsupported_method(request, method = request[:method])
+        @server.write(
+          id: request[:id],
+          error: LanguageServer::Protocol::Interface::ResponseError.new(
+            code: LanguageServer::Protocol::Constant::ErrorCodes::METHOD_NOT_FOUND,
+            message: "Unsupported Method: #{method}"
+          )
+        )
+        Logger.log("Unsupported Method: #{method}")
+      end
+
+      def handle_method_missing(request)
+        return unless request.key?(:id)
+
+        @server.write(id: request[:id], result: nil)
+      end
+
+      def self.handle(name, &block)
+        define_method(:"handle_#{name}", &block)
+      end
+
+      private_class_method :handle
+
       handle 'initialize' do |request|
         initialization_options = extract_initialization_options_from(request)
 
@@ -178,23 +195,6 @@ module RuboCop
         # No-op, we log everything
       end
 
-      def handle_unsupported_method(request, method = request[:method])
-        @server.write(
-          id: request[:id],
-          error: LanguageServer::Protocol::Interface::ResponseError.new(
-            code: LanguageServer::Protocol::Constant::ErrorCodes::METHOD_NOT_FOUND,
-            message: "Unsupported Method: #{method}"
-          )
-        )
-        Logger.log("Unsupported Method: #{method}")
-      end
-
-      def handle_method_missing(request)
-        return unless request.key?(:id)
-
-        @server.write(id: request[:id], result: nil)
-      end
-
       private
 
       def extract_initialization_options_from(request)

data/lib/rubocop/server/cache.rb

@@ -51,9 +51,9 @@ module RuboCop
             Pathname(project_dir).join(lockfile_name)
           end.find(&:exist?)
           version_data = lockfile_path&.read || RuboCop::Version::STRING
-          config_data = Pathname(
-            args_config_file_path || ConfigFinder.find_config_path(Dir.pwd)
-          ).read
+          config_path = Pathname(args_config_file_path || ConfigFinder.find_config_path(Dir.pwd))
+          # NOTE: A missing config file is reported by `RuboCop::CLI` with a friendly message.
+          config_data = config_path.exist? ? config_path.read : ''
           yaml = load_erb_templated_yaml(config_data)
 
           inherit_from_data = inherit_from_data(yaml)
@@ -181,7 +181,7 @@ module RuboCop
           yaml_code = ERB.new(content).result
 
           require 'yaml'
-          YAML.safe_load(yaml_code, permitted_classes: [Regexp, Symbol], aliases: true)
+          YAML.safe_load(yaml_code, permitted_classes: [Regexp, Symbol], aliases: true) || {}
         end
       end
     end

data/lib/rubocop/target_ruby.rb

@@ -100,15 +100,23 @@ module RuboCop
       def gemspec_filepath
         return @gemspec_filepath if defined?(@gemspec_filepath)
 
-        @gemspec_filepath =
-          @config.traverse_directories_upwards(@config.base_dir_for_path_parameters) do |dir|
-            # NOTE: Can't use `dir.glob` because of JRuby 9.4.8.0 incompatibility:
-            # https://github.com/jruby/jruby/issues/8358
-            candidates = Pathname.glob("#{dir}/*.gemspec")
-            # Bundler will use a gemspec whatever the filename is, as long as its the only one in
-            # the folder.
-            break candidates.first if candidates.one?
-          end
+        @gemspec_filepath = @config.traverse_directories_upwards(
+          @config.base_dir_for_path_parameters, ConfigFinder.project_root
+        ) do |dir|
+          candidates = gemspec_candidates(dir)
+
+          # Bundler will use a gemspec whatever the filename is, as long as its the only one in
+          # the folder.
+          break candidates.first if candidates.one?
+        end
+      end
+
+      def gemspec_candidates(dir)
+        # NOTE: Can't use `dir.glob` because of JRuby 9.4.8.0 incompatibility:
+        # https://github.com/jruby/jruby/issues/8358
+        Pathname.glob("#{dir}/*.gemspec")
+      rescue SystemCallError
+        []
       end
 
       def version_from_gemspec_file(file)
@@ -179,6 +187,8 @@ module RuboCop
         return unless file && File.file?(file)
 
         File.read(file).match(pattern) { |md| md[:version].to_f }
+      rescue SystemCallError
+        nil
       end
 
       def version_file
@@ -250,6 +260,8 @@ module RuboCop
           result = line.match(/^\s*ruby\s+(\d+\.\d+)[p.\d]*\s*$/)
           return result.captures.first.to_f if result
         end
+      rescue SystemCallError
+        nil
       end
 
       def bundler_lock_file_path

data/lib/rubocop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.92.0
+  version: 1.92.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -1157,7 +1157,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://rubocop.org/
-  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.92.0
+  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.92.1
   source_code_uri: https://github.com/rubocop/rubocop/
   documentation_uri: https://docs.rubocop.org/rubocop/1.92/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues