ruby-lsp 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d58ee884d1824478d6c0823475b061ca15ac7b28046969a98b0e27643fb943a0
-  data.tar.gz: c90b7a8dbcd675625a28d23cc42d8821b6fe701ce66fb417f885a013c289cd61
+  metadata.gz: 5488592df860b1fd1439a1b2780a7d0da850fcb9b9164713fbf5ce07b6e67270
+  data.tar.gz: '055789cf32db04550a7bd4f602a4e3d69a96760698c567450eceffde5a7ef152'
 SHA512:
-  metadata.gz: e39e30da28ef6118ab12fd1f4d82ca701f1f4f7e3a0f14c51df99b7adc118f81e018aee031e3f36b92423bd20771c82ed4275b3276a4fe6b03a13246acc53070
-  data.tar.gz: f2d5fa3658bc0bc89ab6fd714f26565b916ef25787e82affdcdd0ff68a3fc31b2a3ffc62fe31ca09c07052e5fe0667fe59bcbfc48d8a563cd893b9c247409dac
+  metadata.gz: a3f710de0df843d8c45499b5f818433b9d25b56547d19b2a7cd3896b73ff29c6a6e2be35d091df7d9a7058d9d0d3994dc63898328efa689a198faf864ef61ffc
+  data.tar.gz: cc97f72b359d8125269d17cac6d0c8313ca7e2debcae54a81beb270f620b12b100ec89a2bf9c9a82990bb41411a9acf37f76909c09b561bf53eb7fcd74d407b6

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.2
+0.7.4

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"]
+
+  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)
 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
+        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/setup_bundler.rb

@@ -17,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 }
@@ -31,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
@@ -112,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol