ruby-lsp 0.11.2 → 0.12.1

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

@@ -43,15 +43,18 @@ module RubyLsp
         def compute_delta(token)
           row = token.location.start_line - 1
           column = token.location.start_column
-          delta_line = row - @current_row
 
-          delta_column = column
-          delta_column -= @current_column if delta_line == 0
+          begin
+            delta_line = row - @current_row
 
-          [delta_line, delta_column, token.length, token.type, encode_modifiers(token.modifier)]
-        ensure
-          @current_row = row
-          @current_column = column
+            delta_column = column
+            delta_column -= @current_column if delta_line == 0
+
+            [delta_line, delta_column, token.length, token.type, encode_modifiers(token.modifier)]
+          ensure
+            @current_row = row
+            @current_column = column
+          end
         end
 
         # Encode an array of modifiers to positions onto a bit flag

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

@@ -10,39 +10,39 @@ module RubyLsp
 
           ANNOTATIONS = T.let(
             {
-              "abstract!" => Annotation.new(arity: 0),
-              "absurd" => Annotation.new(arity: 1, receiver: true),
-              "all" => Annotation.new(arity: (2..), receiver: true),
-              "any" => Annotation.new(arity: (2..), receiver: true),
-              "assert_type!" => Annotation.new(arity: 2, receiver: true),
-              "attached_class" => Annotation.new(arity: 0, receiver: true),
-              "bind" => Annotation.new(arity: 2, receiver: true),
-              "cast" => Annotation.new(arity: 2, receiver: true),
-              "class_of" => Annotation.new(arity: 1, receiver: true),
-              "enums" => Annotation.new(arity: 0),
-              "interface!" => Annotation.new(arity: 0),
-              "let" => Annotation.new(arity: 2, receiver: true),
-              "mixes_in_class_methods" => Annotation.new(arity: 1),
-              "must" => Annotation.new(arity: 1, receiver: true),
-              "must_because" => Annotation.new(arity: 1, receiver: true),
-              "nilable" => Annotation.new(arity: 1, receiver: true),
-              "noreturn" => Annotation.new(arity: 0, receiver: true),
-              "requires_ancestor" => Annotation.new(arity: 0),
-              "reveal_type" => Annotation.new(arity: 1, receiver: true),
-              "sealed!" => Annotation.new(arity: 0),
-              "self_type" => Annotation.new(arity: 0, receiver: true),
-              "sig" => Annotation.new(arity: 0),
-              "type_member" => Annotation.new(arity: (0..1)),
-              "type_template" => Annotation.new(arity: 0),
-              "unsafe" => Annotation.new(arity: 1),
-              "untyped" => Annotation.new(arity: 0, receiver: true),
+              abstract!: Annotation.new(arity: 0),
+              absurd: Annotation.new(arity: 1, receiver: true),
+              all: Annotation.new(arity: (2..), receiver: true),
+              any: Annotation.new(arity: (2..), receiver: true),
+              assert_type!: Annotation.new(arity: 2, receiver: true),
+              attached_class: Annotation.new(arity: 0, receiver: true),
+              bind: Annotation.new(arity: 2, receiver: true),
+              cast: Annotation.new(arity: 2, receiver: true),
+              class_of: Annotation.new(arity: 1, receiver: true),
+              enums: Annotation.new(arity: 0),
+              interface!: Annotation.new(arity: 0),
+              let: Annotation.new(arity: 2, receiver: true),
+              mixes_in_class_methods: Annotation.new(arity: 1),
+              must: Annotation.new(arity: 1, receiver: true),
+              must_because: Annotation.new(arity: 1, receiver: true),
+              nilable: Annotation.new(arity: 1, receiver: true),
+              noreturn: Annotation.new(arity: 0, receiver: true),
+              requires_ancestor: Annotation.new(arity: 0),
+              reveal_type: Annotation.new(arity: 1, receiver: true),
+              sealed!: Annotation.new(arity: 0),
+              self_type: Annotation.new(arity: 0, receiver: true),
+              sig: Annotation.new(arity: 0),
+              type_member: Annotation.new(arity: (0..1)),
+              type_template: Annotation.new(arity: 0),
+              unsafe: Annotation.new(arity: 1),
+              untyped: Annotation.new(arity: 0, receiver: true),
             },
-            T::Hash[String, Annotation],
+            T::Hash[Symbol, Annotation],
           )
 
           sig do
             params(
-              node: YARP::CallNode,
+              node: Prism::CallNode,
             ).returns(T::Boolean)
           end
           def annotation?(node)

data/lib/ruby_lsp/requests/workspace_symbol.rb

@@ -73,14 +73,14 @@ module RubyLsp
 
       private
 
-      sig { params(entry: RubyIndexer::Index::Entry).returns(T.nilable(Integer)) }
+      sig { params(entry: RubyIndexer::Entry).returns(T.nilable(Integer)) }
       def kind_for_entry(entry)
         case entry
-        when RubyIndexer::Index::Entry::Class
+        when RubyIndexer::Entry::Class
           Constant::SymbolKind::CLASS
-        when RubyIndexer::Index::Entry::Module
+        when RubyIndexer::Entry::Module
           Constant::SymbolKind::NAMESPACE
-        when RubyIndexer::Index::Entry::Constant
+        when RubyIndexer::Entry::Constant
           Constant::SymbolKind::CONSTANT
         end
       end

data/lib/ruby_lsp/requests.rb

@@ -51,7 +51,6 @@ module RubyLsp
       autoload :SemanticTokenEncoder, "ruby_lsp/requests/support/semantic_token_encoder"
       autoload :Annotation, "ruby_lsp/requests/support/annotation"
       autoload :Sorbet, "ruby_lsp/requests/support/sorbet"
-      autoload :HighlightTarget, "ruby_lsp/requests/support/highlight_target"
       autoload :RailsDocumentClient, "ruby_lsp/requests/support/rails_document_client"
       autoload :Common, "ruby_lsp/requests/support/common"
       autoload :FormatterRunner, "ruby_lsp/requests/support/formatter_runner"

data/lib/ruby_lsp/setup_bundler.rb

@@ -20,17 +20,11 @@ module RubyLsp
 
     FOUR_HOURS = T.let(4 * 60 * 60, Integer)
 
-    sig { params(project_path: String, branch: T.nilable(String)).void }
-    def initialize(project_path, branch: nil)
+    sig { params(project_path: String, options: T.untyped).void }
+    def initialize(project_path, **options)
       @project_path = project_path
-      @branch = branch
-
-      # Custom bundle paths
-      @custom_dir = T.let(Pathname.new(".ruby-lsp").expand_path(Dir.pwd), Pathname)
-      @custom_gemfile = T.let(@custom_dir + "Gemfile", Pathname)
-      @custom_lockfile = T.let(@custom_dir + "Gemfile.lock", Pathname)
-      @lockfile_hash_path = T.let(@custom_dir + "main_lockfile_hash", Pathname)
-      @last_updated_path = T.let(@custom_dir + "last_updated", Pathname)
+      @branch = T.let(options[:branch], T.nilable(String))
+      @experimental = T.let(options[:experimental], T.nilable(T::Boolean))
 
       # Regular bundle paths
       @gemfile = T.let(
@@ -43,12 +37,21 @@ module RubyLsp
       )
       @lockfile = T.let(@gemfile ? Bundler.default_lockfile : nil, T.nilable(Pathname))
 
+      @gemfile_name = T.let(@gemfile&.basename&.to_s || "Gemfile", String)
+
+      # Custom bundle paths
+      @custom_dir = T.let(Pathname.new(".ruby-lsp").expand_path(Dir.pwd), Pathname)
+      @custom_gemfile = T.let(@custom_dir + @gemfile_name, Pathname)
+      @custom_lockfile = T.let(@custom_dir + (@lockfile&.basename || "Gemfile.lock"), Pathname)
+      @lockfile_hash_path = T.let(@custom_dir + "main_lockfile_hash", Pathname)
+      @last_updated_path = T.let(@custom_dir + "last_updated", Pathname)
+
       @dependencies = T.let(load_dependencies, T::Hash[String, T.untyped])
     end
 
-    # Setups up the custom bundle and returns the `BUNDLE_GEMFILE` and `BUNDLE_PATH` that should be used for running the
-    # server
-    sig { returns([String, T.nilable(String)]) }
+    # Sets up the custom bundle and returns the `BUNDLE_GEMFILE`, `BUNDLE_PATH` and `BUNDLE_APP_CONFIG` that should be
+    # used for running the server
+    sig { returns([String, T.nilable(String), T.nilable(String)]) }
     def setup!
       raise BundleNotLocked if @gemfile&.exist? && !@lockfile&.exist?
 
@@ -118,7 +121,7 @@ module RubyLsp
       # If there's a top level Gemfile, we want to evaluate from the custom bundle. We get the source from the top level
       # Gemfile, so if there isn't one we need to add a default source
       if @gemfile&.exist?
-        parts << "eval_gemfile(File.expand_path(\"../Gemfile\", __dir__))"
+        parts << "eval_gemfile(File.expand_path(\"../#{@gemfile_name}\", __dir__))"
       else
         parts.unshift('source "https://rubygems.org"')
       end
@@ -156,7 +159,7 @@ module RubyLsp
       dependencies
     end
 
-    sig { params(bundle_gemfile: T.nilable(Pathname)).returns([String, T.nilable(String)]) }
+    sig { params(bundle_gemfile: T.nilable(Pathname)).returns([String, T.nilable(String), T.nilable(String)]) }
     def run_bundle_install(bundle_gemfile = @gemfile)
       # If the user has a custom bundle path configured, we need to ensure that we will use the absolute and not
       # relative version of it when running `bundle install`. This is necessary to avoid installing the gems under the
@@ -170,6 +173,9 @@ module RubyLsp
       env["BUNDLE_GEMFILE"] = bundle_gemfile.to_s
       env["BUNDLE_PATH"] = expanded_path if expanded_path
 
+      local_config_path = File.join(Dir.pwd, ".bundle")
+      env["BUNDLE_APP_CONFIG"] = local_config_path if Dir.exist?(local_config_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
@@ -185,7 +191,9 @@ module RubyLsp
         command.prepend("(")
         command << " && bundle update "
         command << "ruby-lsp " unless @dependencies["ruby-lsp"]
-        command << "debug" unless @dependencies["debug"]
+        command << "debug " unless @dependencies["debug"]
+        command << "--pre" if @experimental
+        command.delete_suffix!(" ")
         command << ")"
 
         @last_updated_path.write(Time.now.iso8601)
@@ -199,8 +207,9 @@ module RubyLsp
 
       # Add bundle update
       warn("Ruby LSP> Running bundle install for the custom bundle. This may take a while...")
+      warn("Ruby LSP> Command: #{command}")
       system(env, command)
-      [bundle_gemfile.to_s, expanded_path]
+      [bundle_gemfile.to_s, expanded_path, env["BUNDLE_APP_CONFIG"]]
     end
 
     sig { returns(T::Boolean) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
@@ -25,45 +25,46 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.17.0
 - !ruby/object:Gem::Dependency
-  name: sorbet-runtime
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5685
+        version: 0.15.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5685
+        version: 0.15.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 - !ruby/object:Gem::Dependency
-  name: yarp
+  name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.5.5685
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.5.5685
 description: An opinionated language server for Ruby
 email:
 - ruby@shopify.com
 executables:
 - ruby-lsp
 - ruby-lsp-check
+- ruby-lsp-doctor
 extensions: []
 extra_rdoc_files: []
 files:
@@ -72,10 +73,13 @@ files:
 - VERSION
 - exe/ruby-lsp
 - exe/ruby-lsp-check
+- exe/ruby-lsp-doctor
 - lib/core_ext/uri.rb
 - lib/rubocop/cop/ruby_lsp/use_language_server_aliases.rb
+- lib/rubocop/cop/ruby_lsp/use_register_with_handler_method.rb
 - lib/ruby-lsp.rb
 - lib/ruby_indexer/lib/ruby_indexer/configuration.rb
+- lib/ruby_indexer/lib/ruby_indexer/entry.rb
 - lib/ruby_indexer/lib/ruby_indexer/index.rb
 - lib/ruby_indexer/lib/ruby_indexer/indexable_path.rb
 - lib/ruby_indexer/lib/ruby_indexer/prefix_tree.rb
@@ -85,12 +89,12 @@ files:
 - lib/ruby_indexer/test/configuration_test.rb
 - lib/ruby_indexer/test/constant_test.rb
 - lib/ruby_indexer/test/index_test.rb
+- lib/ruby_indexer/test/method_test.rb
 - lib/ruby_indexer/test/prefix_tree_test.rb
 - lib/ruby_indexer/test/test_case.rb
 - lib/ruby_lsp/addon.rb
 - lib/ruby_lsp/check_docs.rb
 - lib/ruby_lsp/document.rb
-- lib/ruby_lsp/event_emitter.rb
 - lib/ruby_lsp/executor.rb
 - lib/ruby_lsp/internal.rb
 - lib/ruby_lsp/listener.rb
@@ -118,7 +122,6 @@ files:
 - lib/ruby_lsp/requests/support/common.rb
 - lib/ruby_lsp/requests/support/dependency_detector.rb
 - lib/ruby_lsp/requests/support/formatter_runner.rb
-- lib/ruby_lsp/requests/support/highlight_target.rb
 - lib/ruby_lsp/requests/support/rubocop_diagnostic.rb
 - lib/ruby_lsp/requests/support/rubocop_diagnostics_runner.rb
 - lib/ruby_lsp/requests/support/rubocop_formatting_runner.rb
@@ -153,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: An opinionated language server for Ruby