Update for latest ruby-lsp changes (#301)

* Update to work with latest ruby-lsp changes

* Pass global_state to listener

* Allow logging for now

* Use ivar for index

---------

Co-authored-by: Andy Waite <[email protected]>

Author: andyw8

Gemfile.lock

@@ -13,7 +13,7 @@ PATH
       actionpack (>= 6.0)
       activerecord (>= 6.0)
       railties (>= 6.0)
-      ruby-lsp (>= 0.14.2, < 0.15.0)
+      ruby-lsp (>= 0.16.0, < 0.17.0)
       sorbet-runtime (>= 0.5.9897)
 
 GEM
@@ -227,7 +227,7 @@ GEM
       rubocop (~> 1.51)
     rubocop-sorbet (0.8.0)
       rubocop (>= 0.90.0)
-    ruby-lsp (0.14.6)
+    ruby-lsp (0.16.0)
       language_server-protocol (~> 3.17.0)
       prism (>= 0.22.0, < 0.25)
       sorbet-runtime (>= 0.5.10782)

lib/ruby_lsp/ruby_lsp_rails/addon.rb

@@ -25,8 +25,9 @@ def initialize
         @client = T.let(NullClient.new, RunnerClient)
       end
 
-      sig { override.params(message_queue: Thread::Queue).void }
-      def activate(message_queue)
+      sig { override.params(global_state: GlobalState, message_queue: Thread::Queue).void }
+      def activate(global_state, message_queue)
+        @global_state = T.let(global_state, T.nilable(RubyLsp::GlobalState))
         $stderr.puts("Activating Ruby LSP Rails addon v#{VERSION}")
         # Start booting the real client in a background thread. Until this completes, the client will be a NullClient
         Thread.new { @client = RunnerClient.create_client }
@@ -53,12 +54,11 @@ def create_code_lens_listener(response_builder, uri, dispatcher)
         override.params(
           response_builder: ResponseBuilders::Hover,
           nesting: T::Array[String],
-          index: RubyIndexer::Index,
           dispatcher: Prism::Dispatcher,
         ).void
       end
-      def create_hover_listener(response_builder, nesting, index, dispatcher)
-        Hover.new(@client, response_builder, nesting, index, dispatcher)
+      def create_hover_listener(response_builder, nesting, dispatcher)
+        Hover.new(@client, response_builder, nesting, T.must(@global_state), dispatcher)
       end
 
       sig do
@@ -76,11 +76,11 @@ def create_document_symbol_listener(response_builder, dispatcher)
           response_builder: ResponseBuilders::CollectionResponseBuilder[Interface::Location],
           uri: URI::Generic,
           nesting: T::Array[String],
-          index: RubyIndexer::Index,
           dispatcher: Prism::Dispatcher,
         ).void
       end
-      def create_definition_listener(response_builder, uri, nesting, index, dispatcher)
+      def create_definition_listener(response_builder, uri, nesting, dispatcher)
+        index = T.must(@global_state).index
         Definition.new(response_builder, nesting, index, dispatcher)
       end
 

lib/ruby_lsp/ruby_lsp_rails/hover.rb

@@ -25,15 +25,15 @@ class Hover
           client: RunnerClient,
           response_builder: ResponseBuilders::Hover,
           nesting: T::Array[String],
-          index: RubyIndexer::Index,
+          global_state: GlobalState,
           dispatcher: Prism::Dispatcher,
         ).void
       end
-      def initialize(client, response_builder, nesting, index, dispatcher)
+      def initialize(client, response_builder, nesting, global_state, dispatcher)
         @client = client
         @response_builder = response_builder
         @nesting = nesting
-        @index = index
+        @index = T.let(global_state.index, RubyIndexer::Index)
         dispatcher.register(self, :on_constant_path_node_enter, :on_constant_read_node_enter, :on_call_node_enter)
       end
 

ruby-lsp-rails.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency("actionpack", ">= 6.0")
   spec.add_dependency("activerecord", ">= 6.0")
   spec.add_dependency("railties", ">= 6.0")
-  spec.add_dependency("ruby-lsp", ">= 0.14.2", "< 0.15.0")
+  spec.add_dependency("ruby-lsp", ">= 0.16.0", "< 0.17.0")
   spec.add_dependency("sorbet-runtime", ">= 0.5.9897")
 end