ruby-lsp 0.23.4 → 0.23.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8b49e72ac08f80faf14e0ed347d4af75f2d55b7465f14412e1e0900f422783f
-  data.tar.gz: 0b496376c25068929d275d71a87c414a7ecf185b3dbf6dfba27ccdc8c1b0a61f
+  metadata.gz: 924e57270229eb4d0b709b01023d16f414591f8ea40c3b8a51ae6fb6cd09cc4f
+  data.tar.gz: 72f4f544baf412f8580fe28287ba5324c7f646a9436797ebea59f34f3712d62e
 SHA512:
-  metadata.gz: '0791955260be2f7374522ef551b0636bd87a9947b3b20818d8e0f06dc5046b0b0c7c85beb5c69af2d146c998b2ce4298d7d1bf141be4d71bc5aacf07e0f7c151'
-  data.tar.gz: e08f19fc4dd44035cb4e569daf1eab628caec729e903353eaf1ec97aa7644e80552fa903da4d739f696e6de704d7939aebb4685781d81a88b1375a4ab1137225
+  metadata.gz: 650cf172b8b1408f5498cb2010c2f94b3ef0a4bc93212ef63e24c2177ef5996455625a1bb64fe51f75322a42625e9ebcf156f95f5412c44839fe4957df4c957f
+  data.tar.gz: ce9b866443836810fe5884c2f977d4fd91fe020023ff547a9d60e525715ce388429aa7a901b0acc84876d68cada8f30dac2836494b7403fd8c2e845bea86ce79

data/VERSION

@@ -1 +1 @@
-0.23.4
+0.23.5

data/exe/ruby-lsp-launcher

@@ -7,6 +7,7 @@
 # !!!!!!!
 
 setup_error = nil
+install_error = nil
 
 # Read the initialize request before even starting the server. We need to do this to figure out the workspace URI.
 # Editors are not required to spawn the language server process on the same directory as the workspace URI, so we need
@@ -45,12 +46,6 @@ rescue Errno::ECHILD
   # In theory, the child process can finish before we even get to the wait call, but that is not an error
 end
 
-error_path = File.join(".ruby-lsp", "install_error")
-
-install_error = if File.exist?(error_path)
-  Marshal.load(File.read(error_path))
-end
-
 begin
   bundle_env_path = File.join(".ruby-lsp", "bundle_env")
   # We can't require `bundler/setup` because that file prematurely exits the process if setup fails. However, we can't
@@ -67,6 +62,14 @@ begin
 
     require "bundler"
     Bundler.ui.level = :silent
+
+    # This Marshal load can only happen after requiring Bundler because it will load a custom error class from Bundler
+    # itself. If we try to load before requiring, the class will not be defined and loading will fail
+    error_path = File.join(".ruby-lsp", "install_error")
+    install_error = if File.exist?(error_path)
+      Marshal.load(File.read(error_path))
+    end
+
     Bundler.setup
     $stderr.puts("Composed Bundle set up successfully")
   end

data/lib/ruby_lsp/requests/support/rubocop_diagnostic.rb

@@ -31,7 +31,7 @@ module RubyLsp
 
         # TODO: avoid passing document once we have alternative ways to get at
         # encoding and file source
-        sig { params(document: RubyDocument, offense: RuboCop::Cop::Offense, uri: URI::Generic).void }
+        sig { params(document: RubyDocument, offense: ::RuboCop::Cop::Offense, uri: URI::Generic).void }
         def initialize(document, offense, uri)
           @document = document
           @offense = offense
@@ -48,7 +48,7 @@ module RubyLsp
           code_actions
         end
 
-        sig { params(config: RuboCop::Config).returns(Interface::Diagnostic) }
+        sig { params(config: ::RuboCop::Config).returns(Interface::Diagnostic) }
         def to_lsp_diagnostic(config)
           # highlighted_area contains the begin and end position of the first line
           # This ensures that multiline offenses don't clutter the editor
@@ -90,7 +90,7 @@ module RubyLsp
           RUBOCOP_TO_LSP_SEVERITY[@offense.severity.name]
         end
 
-        sig { params(config: RuboCop::Config).returns(T.nilable(Interface::CodeDescription)) }
+        sig { params(config: ::RuboCop::Config).returns(T.nilable(Interface::CodeDescription)) }
         def code_description(config)
           cop = RuboCopRunner.find_cop_by_name(@offense.cop_name)
           return unless cop

data/lib/ruby_lsp/requests/support/rubocop_runner.rb

@@ -40,10 +40,10 @@ module RubyLsp
           For more details, run RuboCop on the command line.
         EOS
 
-        sig { params(rubocop_error: T.any(RuboCop::ErrorWithAnalyzedFileLocation, StandardError)).void }
+        sig { params(rubocop_error: T.any(::RuboCop::ErrorWithAnalyzedFileLocation, StandardError)).void }
         def initialize(rubocop_error)
           message = case rubocop_error
-          when RuboCop::ErrorWithAnalyzedFileLocation
+          when ::RuboCop::ErrorWithAnalyzedFileLocation
             format(MESSAGE, "for the #{rubocop_error.cop.name} cop")
           when StandardError
             format(MESSAGE, rubocop_error.message)
@@ -53,7 +53,7 @@ module RubyLsp
       end
 
       # :nodoc:
-      class RuboCopRunner < RuboCop::Runner
+      class RuboCopRunner < ::RuboCop::Runner
         extend T::Sig
 
         class ConfigurationError < StandardError; end
@@ -68,14 +68,14 @@ module RubyLsp
           T::Array[String],
         )
 
-        sig { returns(T::Array[RuboCop::Cop::Offense]) }
+        sig { returns(T::Array[::RuboCop::Cop::Offense]) }
         attr_reader :offenses
 
         sig { returns(::RuboCop::Config) }
         attr_reader :config_for_working_directory
 
         begin
-          RuboCop::Options.new.parse(["--raise-cop-error"])
+          ::RuboCop::Options.new.parse(["--raise-cop-error"])
           DEFAULT_ARGS << "--raise-cop-error"
         rescue OptionParser::InvalidOption
           # older versions of RuboCop don't support this flag
@@ -85,7 +85,7 @@ module RubyLsp
         sig { params(args: String).void }
         def initialize(*args)
           @options = T.let({}, T::Hash[Symbol, T.untyped])
-          @offenses = T.let([], T::Array[RuboCop::Cop::Offense])
+          @offenses = T.let([], T::Array[::RuboCop::Cop::Offense])
           @errors = T.let([], T::Array[String])
           @warnings = T.let([], T::Array[String])
 
@@ -113,9 +113,9 @@ module RubyLsp
           # RuboCop rescues interrupts and then sets the `@aborting` variable to true. We don't want them to be rescued,
           # so here we re-raise in case RuboCop received an interrupt.
           raise Interrupt if aborting?
-        rescue RuboCop::Runner::InfiniteCorrectionLoop => error
+        rescue ::RuboCop::Runner::InfiniteCorrectionLoop => error
           raise Formatting::Error, error.message
-        rescue RuboCop::ValidationError => error
+        rescue ::RuboCop::ValidationError => error
           raise ConfigurationError, error.message
         rescue StandardError => error
           raise InternalRuboCopError, error
@@ -129,25 +129,25 @@ module RubyLsp
         class << self
           extend T::Sig
 
-          sig { params(cop_name: String).returns(T.nilable(T.class_of(RuboCop::Cop::Base))) }
+          sig { params(cop_name: String).returns(T.nilable(T.class_of(::RuboCop::Cop::Base))) }
           def find_cop_by_name(cop_name)
             cop_registry[cop_name]&.first
           end
 
           private
 
-          sig { returns(T::Hash[String, [T.class_of(RuboCop::Cop::Base)]]) }
+          sig { returns(T::Hash[String, [T.class_of(::RuboCop::Cop::Base)]]) }
           def cop_registry
             @cop_registry ||= T.let(
-              RuboCop::Cop::Registry.global.to_h,
-              T.nilable(T::Hash[String, [T.class_of(RuboCop::Cop::Base)]]),
+              ::RuboCop::Cop::Registry.global.to_h,
+              T.nilable(T::Hash[String, [T.class_of(::RuboCop::Cop::Base)]]),
             )
           end
         end
 
         private
 
-        sig { params(_file: String, offenses: T::Array[RuboCop::Cop::Offense]).void }
+        sig { params(_file: String, offenses: T::Array[::RuboCop::Cop::Offense]).void }
         def file_finished(_file, offenses)
           @offenses = offenses
         end

data/lib/ruby_lsp/server.rb

@@ -339,7 +339,7 @@ module RubyLsp
         if defined?(Requests::Support::RuboCopFormatter)
           begin
             @global_state.register_formatter("rubocop", Requests::Support::RuboCopFormatter.new)
-          rescue RuboCop::Error => e
+          rescue ::RuboCop::Error => e
             # The user may have provided unknown config switches in .rubocop or
             # is trying to load a non-existent config file.
             send_message(Notification.window_show_message(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.23.4
+  version: 0.23.5
 platform: ruby
 authors:
 - Shopify