ruby-lsp 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0761510f35a450cb8ba4b2875dc50826abdc12c07158cd9ee442c863dae5292
-  data.tar.gz: 7906c0f49b975b75f09c96e0d28222f344963eca363a6a08b29ba0aa697b2084
+  metadata.gz: dba33af47ce558162b73c39422465b451e4af9e835d9446ff90414de0f44fd66
+  data.tar.gz: fb9b769fceb2563b2392b6395cb65a17511e5dee9614d8158fb28c5bd5628843
 SHA512:
-  metadata.gz: aaf45a911c54ce8a3e2e0051beb5941016b689a2e13bbbf2d438cda04ce315560d0af9f206cd2ee8bb136989dbd6863068c5d4c5d52d5b9372584beda7973815
-  data.tar.gz: 828569fe84d0e0ff5cf714b194926c07f30ae58cc23bf8e31bed1aa3b930406c9670561631e8c7ff9f151d01a12dc321c3ca85979923dfb6e88023fa7cab1528
+  metadata.gz: 53b879df720b44940dc838245a174bebc08849d6673a9076b612df90a47036e69fdc367cc7e0dc3df934a762758e36cebea2d6c84e4b3e992023f2bf9056b14f
+  data.tar.gz: 65856714024b1329d693cc49eb3e846af1b7737dfd4f914ddb2b677ddada993cca65f81ec9447605325380aee2564930ee2401efc87e57f9d11e92600533d9ca

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.3

data/lib/ruby_lsp/setup_bundler.rb

@@ -1,6 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "sorbet-runtime"
 require "bundler"
 require "fileutils"
 
@@ -16,6 +17,14 @@ module RubyLsp
     def initialize(project_path)
       @project_path = project_path
       @dependencies = T.let(load_dependencies, T::Hash[String, T.untyped])
+      @custom_bundle_dependencies = T.let(
+        if File.exist?(".ruby-lsp/Gemfile.lock")
+          Bundler::LockfileParser.new(Bundler.read_file(".ruby-lsp/Gemfile.lock")).dependencies
+        else
+          {}
+        end,
+        T::Hash[String, T.untyped],
+      )
     end
 
     sig { void }
@@ -30,6 +39,11 @@ module RubyLsp
       # Do not setup a custom bundle if both `ruby-lsp` and `debug` are already in the Gemfile
       if @dependencies["ruby-lsp"] && @dependencies["debug"]
         warn("Ruby LSP> Skipping custom bundle setup since both `ruby-lsp` and `debug` are already in the Gemfile")
+
+        # If the user decided to add the `ruby-lsp` and `debug` to their Gemfile after having already run the Ruby LSP,
+        # then we need to remove the `.ruby-lsp` folder, otherwise we will run `bundle install` for the top level and
+        # try to execute the Ruby LSP using the custom bundle, which will fail since the gems are not installed there
+        FileUtils.rm_r(".ruby-lsp") if Dir.exist?(".ruby-lsp")
         run_bundle_install
         return
       end
@@ -111,7 +125,13 @@ module RubyLsp
       command << "BUNDLE_PATH=#{File.expand_path(path, Dir.pwd)} " if path
       command << "BUNDLE_GEMFILE=#{bundle_gemfile} " if bundle_gemfile
 
-      if @dependencies["ruby-lsp"] && @dependencies["debug"]
+      # If both `ruby-lsp` and `debug` are already in the Gemfile, then we shouldn't try to upgrade them or else we'll
+      # produce undesired source control changes. If the custom bundle was just created and either `ruby-lsp` or `debug`
+      # weren't a part of the Gemfile, then we need to run `bundle install` for the first time to generate the
+      # Gemfile.lock with them included or else Bundler will complain that they're missing. We can only update if the
+      # custom `.ruby-lsp/Gemfile.lock` already exists and includes both gems
+      if (@dependencies["ruby-lsp"] && @dependencies["debug"]) ||
+          @custom_bundle_dependencies["ruby-lsp"].nil? || @custom_bundle_dependencies["debug"].nil?
         # Install gems using the custom bundle
         command << "bundle install "
       else

metadata

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