ruby-lsp 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dba33af47ce558162b73c39422465b451e4af9e835d9446ff90414de0f44fd66
-  data.tar.gz: fb9b769fceb2563b2392b6395cb65a17511e5dee9614d8158fb28c5bd5628843
+  metadata.gz: 4825b35aef41194e36092d705d02735786950d140842c20d210ae79ece322a00
+  data.tar.gz: 980bb51fca93844ec0e2bcf2ce57779441fd90a243bf8dab1c30d6dec683e438
 SHA512:
-  metadata.gz: 53b879df720b44940dc838245a174bebc08849d6673a9076b612df90a47036e69fdc367cc7e0dc3df934a762758e36cebea2d6c84e4b3e992023f2bf9056b14f
-  data.tar.gz: 65856714024b1329d693cc49eb3e846af1b7737dfd4f914ddb2b677ddada993cca65f81ec9447605325380aee2564930ee2401efc87e57f9d11e92600533d9ca
+  metadata.gz: 5ce7d7401bf7a817a90b6cabeb3d2da7bcc7115d5cb2bf38d5866d4e30061eab615e1fc5366059e7c46630701e11345eb00ac8a09d171d17864ec7fae2ef5a58
+  data.tar.gz: cb90d3684d0ea67aa35b53ff694821ecac2b30d43a878a6b24ac6bed873c8ed1eb284fb94a01f4295abda13a612dc0c757e233e0e6a96b2ab70e08c1ce2ddaf1

data/README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://github.com/Shopify/ruby-lsp/workflows/CI/badge.svg)](https://github.com/Shopify/ruby-lsp/actions/workflows/ci.yml)
 [![Ruby LSP extension](https://img.shields.io/badge/VS%20Code-Ruby%20LSP-success?logo=visual-studio-code)](https://marketplace.visualstudio.com/items?itemName=Shopify.ruby-lsp)
-[![Ruby DX Slack](https://img.shields.io/badge/Slack-Ruby%20DX-success?logo=slack)](https://join.slack.com/t/ruby-dx/shared_invite/zt-1s6f4y15t-v9jedZ9YUPQLM91TEJ4Gew)
+[![Ruby DX Slack](https://img.shields.io/badge/Slack-Ruby%20DX-success?logo=slack)](https://join.slack.com/t/ruby-dx/shared_invite/zt-1zjp7lmgk-zL7bGvze8gj5hFaYS~r5vg)
 
 # Ruby LSP
 
@@ -9,7 +9,7 @@ for Ruby, used to improve rich features in editors. It is a part of a wider goal
 experience to Ruby developers using modern standards for cross-editor features, documentation and debugging.
 
 Want to discuss Ruby developer experience? Consider joining the public
-[Ruby DX Slack workspace](https://join.slack.com/t/ruby-dx/shared_invite/zt-1s6f4y15t-v9jedZ9YUPQLM91TEJ4Gew).
+[Ruby DX Slack workspace](https://join.slack.com/t/ruby-dx/shared_invite/zt-1zjp7lmgk-zL7bGvze8gj5hFaYS~r5vg).
 
 ## Usage
 

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.5

data/exe/ruby-lsp

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# We should make sure that, if we're running on a bundler project, that it has a Gemfile.lock
+if File.exist?("Gemfile") && !File.exist?("Gemfile.lock")
+  warn("Project contains a Gemfile, but no Gemfile.lock. Run `bundle install` to lock gems and restart the server")
+  exit(78)
+end
+
 # When we're running without bundler, then we need to make sure the custom bundle is fully configured and re-execute
 # using `BUNDLE_GEMFILE=.ruby-lsp/Gemfile bundle exec ruby-lsp` so that we have access to the gems that are a part of
 # the application's bundle
@@ -12,7 +18,16 @@ if ENV["BUNDLE_GEMFILE"].nil? && File.exist?("Gemfile.lock")
   # However, we still want to run the server with `bundle exec`. We need to make sure we're pointing to the right
   # `Gemfile`
   bundle_gemfile = File.exist?(".ruby-lsp/Gemfile") ? ".ruby-lsp/Gemfile" : "Gemfile"
-  exit exec("BUNDLE_GEMFILE=#{bundle_gemfile} bundle exec ruby-lsp #{ARGV.join(" ")}")
+
+  # In addition to BUNDLE_GEMFILE, we also need to make sure that BUNDLE_PATH is absolute and not relative. For example,
+  # if BUNDLE_PATH is `vendor/bundle`, we want the top level `vendor/bundle` and not `.ruby-lsp/vendor/bundle`.
+  # Expanding to get the absolute path ensures we're pointing to the correct folder, which is the same one we use in
+  # SetupBundler to install the gems
+  path = Bundler.settings["path"]
+
+  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/executor.rb

@@ -170,10 +170,15 @@ module RubyLsp
       when "textDocument/definition"
         definition(uri, request.dig(:params, :position))
       when "rubyLsp/textDocument/showSyntaxTree"
-        { ast: Requests::ShowSyntaxTree.new(@store.get(uri)).run }
+        show_syntax_tree(uri, request.dig(:params, :range))
       end
     end
 
+    sig { params(uri: String, range: T.nilable(Document::RangeShape)).returns({ ast: String }) }
+    def show_syntax_tree(uri, range)
+      { ast: Requests::ShowSyntaxTree.new(@store.get(uri), range).run }
+    end
+
     sig { params(uri: String, position: Document::PositionShape).returns(T.nilable(Interface::Location)) }
     def definition(uri, position)
       document = @store.get(uri)

data/lib/ruby_lsp/requests/code_lens.rb

@@ -7,9 +7,6 @@ module RubyLsp
   module Requests
     # ![Code lens demo](../../code_lens.gif)
     #
-    # This feature is currently experimental. Clients will need to pass `experimentalFeaturesEnabled`
-    # in the initialization options to enable it.
-    #
     # The
     # [code lens](https://microsoft.github.io/language-server-protocol/specification#textDocument_codeLens)
     # request informs the editor of runnable commands such as tests

data/lib/ruby_lsp/requests/show_syntax_tree.rb

@@ -7,7 +7,7 @@ module RubyLsp
     #
     # Show syntax tree is a custom [LSP
     # request](https://microsoft.github.io/language-server-protocol/specification#requestMessage) that displays the AST
-    # for the current document in a new tab.
+    # for the current document or for the current selection in a new tab.
     #
     # # Example
     #
@@ -20,14 +20,57 @@ module RubyLsp
     class ShowSyntaxTree < BaseRequest
       extend T::Sig
 
+      sig { params(document: Document, range: T.nilable(Document::RangeShape)).void }
+      def initialize(document, range)
+        super(document)
+
+        @range = range
+      end
+
       sig { override.returns(String) }
       def run
         return "Document contains syntax error" if @document.syntax_error?
+        return ast_for_range if @range
 
         output_string = +""
         PP.pp(@document.tree, output_string)
         output_string
       end
+
+      private
+
+      sig { returns(String) }
+      def ast_for_range
+        range = T.must(@range)
+
+        scanner = @document.create_scanner
+        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.dup
+        found_nodes = []
+
+        until queue.empty?
+          node = queue.shift
+          next unless node
+
+          loc = node.location
+
+          # If the node is fully covered by the selection, then we found one of the nodes to be displayed and don't want
+          # to continue descending into its children
+          if (start_char..end_char).cover?(loc.start_char..loc.end_char)
+            found_nodes << node
+          else
+            queue.unshift(*node.child_nodes)
+          end
+        end
+
+        found_nodes.map do |node|
+          output_string = +""
+          PP.pp(node, output_string)
+          output_string
+        end.join("\n")
+      end
     end
   end
 end

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.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol