DEBUG

Author: vinistock

Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "bundler", "~> 4.0.0.beta2"
+gem "bundler", "~> 4.0.0"
 gem "minitest", "~> 5.25"
 gem "test-unit", require: false
 

Gemfile.lock

@@ -135,7 +135,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 4.0.0.beta2)
+  bundler (~> 4.0.0)
   debug (~> 1.9)
   minitest (~> 5.25)
   mocha (~> 2.3)
@@ -212,4 +212,4 @@ CHECKSUMS
   yard-sorbet (0.9.0) sha256=03d1aa461b9e9c82b886919a13aa3e09fcf4d1852239d2967ed97e92723ffe21
 
 BUNDLED WITH
-  4.0.0.beta2
+  4.0.0

test/integration_test.rb

@@ -126,7 +126,7 @@ def test_uses_same_bundler_version_as_main_app
           stringio
 
         BUNDLED WITH
-          4.0.0.beta1
+          4.0.0
       LOCKFILE
       File.write(File.join(dir, "Gemfile.lock"), lockfile_contents)
 
@@ -140,7 +140,7 @@ def test_uses_same_bundler_version_as_main_app
         launch(dir, "ruby-lsp")
       end
 
-      assert_match(/BUNDLED WITH\n\s*4.0.0.beta1/, File.read(File.join(dir, ".ruby-lsp", "Gemfile.lock")))
+      assert_match(/BUNDLED WITH\n\s*4.0.0/, File.read(File.join(dir, ".ruby-lsp", "Gemfile.lock")))
     end
   end
 
@@ -165,7 +165,7 @@ def test_does_not_use_custom_binstubs_if_they_are_in_the_path
           stringio
 
         BUNDLED WITH
-          4.0.0.beta1
+          4.0.0
       LOCKFILE
       File.write(File.join(dir, "Gemfile.lock"), lockfile_contents)
 
@@ -187,7 +187,7 @@ def test_does_not_use_custom_binstubs_if_they_are_in_the_path
         launch(dir, "ruby-lsp", { "PATH" => "#{bin_path}#{File::PATH_SEPARATOR}#{ENV["PATH"]}" })
       end
 
-      assert_match(/BUNDLED WITH\n\s*4.0.0.beta1/, File.read(File.join(dir, ".ruby-lsp", "Gemfile.lock")))
+      assert_match(/BUNDLED WITH\n\s*4.0.0/, File.read(File.join(dir, ".ruby-lsp", "Gemfile.lock")))
     end
   end
 
@@ -233,7 +233,7 @@ def test_launch_mode_with_full_bundle
           stringio
 
         BUNDLED WITH
-          2.5.7
+          4.0.0
       LOCKFILE
       File.write(File.join(dir, "Gemfile.lock"), lockfile_contents)
 
@@ -353,7 +353,7 @@ def test_launch_mode_update_does_not_modify_main_lockfile
           ruby-lsp-rails
 
         BUNDLED WITH
-           4.0.0.beta1
+           4.0.0
       LOCKFILE
       File.write(File.join(dir, "Gemfile.lock"), lockfile_contents)
 
@@ -421,7 +421,7 @@ def test_launching_an_older_server_version
     in_temp_dir do |dir|
       File.write(File.join(dir, "Gemfile"), <<~RUBY)
         source "https://rubygems.org"
-        gem "ruby-lsp", "0.23.0"
+        gem "ruby-lsp", "0.24.0"
       RUBY
 
       Bundler.with_unbundled_env do
@@ -437,21 +437,10 @@ def test_launching_an_older_server_version
   private
 
   def launch(workspace_path, exec = "ruby-lsp-launcher", extra_env = {})
-    specification = Gem::Specification.find_by_name("ruby-lsp")
-    paths = [specification.full_gem_path]
-    paths.concat(specification.dependencies.filter_map { |dep| dep.to_spec&.full_gem_path })
-
-    load_path = $LOAD_PATH.filter_map do |path|
-      next unless paths.any? { |gem_path| path.start_with?(gem_path) } || !path.start_with?(@bundle_path)
-
-      ["-I", File.expand_path(path)]
-    end.uniq.flatten
-
     stdin, stdout, stderr, wait_thr = Open3 #: as untyped
       .popen3(
         extra_env,
         Gem.ruby,
-        *load_path,
         File.join(__dir__, "..", "exe", exec),
       )
     stdin.sync = true
@@ -472,9 +461,9 @@ def launch(workspace_path, exec = "ruby-lsp-launcher", extra_env = {})
     })
 
     # First message is the log of initializing Ruby LSP
-    read_message(stdout)
+    read_message(stdout, stderr)
     # Verify that initialization didn't fail
-    initialize_response = read_message(stdout)
+    initialize_response = read_message(stdout, stderr)
     refute(initialize_response[:error], initialize_response.dig(:error, :message))
 
     send_message(stdin, { id: 2, method: "shutdown" })
@@ -504,8 +493,10 @@ def send_message(stdin, message)
     stdin.flush
   end
 
-  def read_message(stdout)
+  def read_message(stdout, stderr)
     headers = stdout.gets("\r\n\r\n")
+    flunk(stderr.read) unless headers
+
     length = headers[/Content-Length: (\d+)/i, 1].to_i
     JSON.parse(stdout.read(length), symbolize_names: true)
   end