ruby-lsp 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5488592df860b1fd1439a1b2780a7d0da850fcb9b9164713fbf5ce07b6e67270
-  data.tar.gz: '055789cf32db04550a7bd4f602a4e3d69a96760698c567450eceffde5a7ef152'
+  metadata.gz: 4825b35aef41194e36092d705d02735786950d140842c20d210ae79ece322a00
+  data.tar.gz: 980bb51fca93844ec0e2bcf2ce57779441fd90a243bf8dab1c30d6dec683e438
 SHA512:
-  metadata.gz: a3f710de0df843d8c45499b5f818433b9d25b56547d19b2a7cd3896b73ff29c6a6e2be35d091df7d9a7058d9d0d3994dc63898328efa689a198faf864ef61ffc
-  data.tar.gz: cc97f72b359d8125269d17cac6d0c8313ca7e2debcae54a81beb270f620b12b100ec89a2bf9c9a82990bb41411a9acf37f76909c09b561bf53eb7fcd74d407b6
+  metadata.gz: 5ce7d7401bf7a817a90b6cabeb3d2da7bcc7115d5cb2bf38d5866d4e30061eab615e1fc5366059e7c46630701e11345eb00ac8a09d171d17864ec7fae2ef5a58
+  data.tar.gz: cb90d3684d0ea67aa35b53ff694821ecac2b30d43a878a6b24ac6bed873c8ed1eb284fb94a01f4295abda13a612dc0c757e233e0e6a96b2ab70e08c1ce2ddaf1

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/exe/ruby-lsp

@@ -25,9 +25,9 @@ if ENV["BUNDLE_GEMFILE"].nil? && File.exist?("Gemfile.lock")
   # SetupBundler to install the gems
   path = Bundler.settings["path"]
 
-  command = +"BUNDLE_GEMFILE=#{bundle_gemfile} bundle exec ruby-lsp #{ARGV.join(" ")}"
-  command.prepend("BUNDLE_PATH=#{File.expand_path(path, Dir.pwd)} ") if path
-  exit exec(command)
+  env = { "BUNDLE_GEMFILE" => bundle_gemfile }
+  env["BUNDLE_PATH"] = File.expand_path(path, Dir.pwd) if path
+  exit exec(env, "bundle exec ruby-lsp #{ARGV.join(" ")}")
 end
 
 require "sorbet-runtime"

data/lib/ruby_lsp/requests/show_syntax_tree.rb

@@ -47,7 +47,7 @@ module RubyLsp
         start_char = scanner.find_char_position(range[:start])
         end_char = scanner.find_char_position(range[:end])
 
-        queue = T.cast(@document.tree, SyntaxTree::Program).statements.body
+        queue = T.cast(@document.tree, SyntaxTree::Program).statements.body.dup
         found_nodes = []
 
         until queue.empty?

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

@@ -26,7 +26,7 @@ module RubyLsp
           params(node: T.any(SyntaxTree::ConstPathRef, SyntaxTree::ConstRef, SyntaxTree::TopConstRef)).returns(String)
         end
         def full_constant_name(node)
-          name = +node.constant.value
+          name = node.constant.value.dup
           constant = T.let(node, SyntaxTree::Node)
 
           while constant.is_a?(SyntaxTree::ConstPathRef)

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

@@ -38,7 +38,10 @@ module RubyLsp
 
       sig { params(gem_pattern: Regexp).returns(T::Boolean) }
       def direct_dependency?(gem_pattern)
-        Bundler.locked_gems.dependencies.keys.grep(gem_pattern).any?
+        Bundler.with_original_env { Bundler.default_gemfile } &&
+          Bundler.locked_gems.dependencies.keys.grep(gem_pattern).any?
+      rescue Bundler::GemfileNotFound
+        false
       end
     end
   end

data/lib/ruby_lsp/setup_bundler.rb

@@ -120,16 +120,18 @@ module RubyLsp
       # want to install it in the top level `vendor` and not `.ruby-lsp/vendor`
       path = Bundler.settings["path"]
 
-      command = +""
       # Use the absolute `BUNDLE_PATH` to prevent accidentally creating unwanted folders under `.ruby-lsp`
-      command << "BUNDLE_PATH=#{File.expand_path(path, Dir.pwd)} " if path
-      command << "BUNDLE_GEMFILE=#{bundle_gemfile} " if bundle_gemfile
+      env = {}
+      env["BUNDLE_GEMFILE"] = bundle_gemfile if bundle_gemfile
+      env["BUNDLE_PATH"] = File.expand_path(path, Dir.pwd) if path
 
       # 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
+      command = +""
+
       if (@dependencies["ruby-lsp"] && @dependencies["debug"]) ||
           @custom_bundle_dependencies["ruby-lsp"].nil? || @custom_bundle_dependencies["debug"].nil?
         # Install gems using the custom bundle
@@ -147,7 +149,7 @@ module RubyLsp
 
       # Add bundle update
       warn("Ruby LSP> Running bundle install for the custom bundle. This may take a while...")
-      system(command)
+      system(env, command)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol