wip

Author: andyw8

Gemfile

@@ -19,3 +19,4 @@ gem "sorbet-static-and-runtime", platforms: :ruby
 gem "tapioca", "~> 0.12", require: false, platforms: :ruby
 gem "psych", "~> 5.1", require: false
 gem "rails"
+gem "ruby-lsp", github: "Shopify/ruby-lsp"

Gemfile.lock

@@ -1,11 +1,20 @@
+GIT
+  remote: https://github.com/Shopify/ruby-lsp.git
+  revision: c1ae8fdcdb238d128a519fdde02741a011e47c74
+  specs:
+    ruby-lsp (0.14.0)
+      language_server-protocol (~> 3.17.0)
+      prism (>= 0.19.0, < 0.22)
+      sorbet-runtime (>= 0.5.10782)
+
 PATH
   remote: .
   specs:
     ruby-lsp-rails (0.2.9)
       actionpack (>= 6.0)
       activerecord (>= 6.0)
       railties (>= 6.0)
-      ruby-lsp (>= 0.14.0, < 0.15.0)
+      ruby-lsp
       sorbet-runtime (>= 0.5.9897)
 
 GEM
@@ -221,10 +230,6 @@ GEM
       rubocop (~> 1.51)
     rubocop-sorbet (0.7.7)
       rubocop (>= 0.90.0)
-    ruby-lsp (0.14.0)
-      language_server-protocol (~> 3.17.0)
-      prism (>= 0.19.0, < 0.22)
-      sorbet-runtime (>= 0.5.10782)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sorbet (0.5.11249)
@@ -286,6 +291,7 @@ DEPENDENCIES
   rubocop-rake (~> 0.6.0)
   rubocop-shopify (~> 2.14)
   rubocop-sorbet (~> 0.7)
+  ruby-lsp!
   ruby-lsp-rails!
   sorbet-static-and-runtime
   sqlite3

README.md

@@ -52,6 +52,8 @@ See the [documentation](https://shopify.github.io/ruby-lsp-rails) for more in-de
 
 ## How It Works
 
+TODO: Update
+
 This gem consists of two components that enable enhanced Rails functionality in the editor:
 
 1. A Rack app that automatically exposes APIs when Rails server is running

lib/ruby-lsp-rails.rb

@@ -5,7 +5,6 @@
 require "pathname"
 
 require "ruby_lsp_rails/version"
-require "ruby_lsp_rails/railtie"
 
 module RubyLsp
   # # Supported features

lib/ruby_lsp/ruby_lsp_rails/addon.rb

@@ -3,7 +3,7 @@
 
 require "ruby_lsp/addon"
 
-require_relative "rails_client"
+require_relative "runner_client"
 require_relative "hover"
 require_relative "code_lens"
 
@@ -12,18 +12,20 @@ module Rails
     class Addon < ::RubyLsp::Addon
       extend T::Sig
 
-      sig { returns(RailsClient) }
+      sig { returns(RunnerClient) }
       def client
-        @client ||= T.let(RailsClient.new, T.nilable(RailsClient))
+        @client ||= T.let(RunnerClient.new, T.nilable(RunnerClient))
       end
 
       sig { override.params(message_queue: Thread::Queue).void }
       def activate(message_queue)
-        client.check_if_server_is_running!
+        # @client ||= T.let(RunnerClient.new, T.nilable(RunnerClient))
       end
 
       sig { override.void }
-      def deactivate; end
+      def deactivate
+        T.must(@client).shutdown
+      end
 
       # Creates a new CodeLens listener. This method is invoked on every CodeLens request
       sig do
@@ -46,7 +48,7 @@ def create_code_lens_listener(response_builder, uri, dispatcher)
         ).void
       end
       def create_hover_listener(response_builder, nesting, index, dispatcher)
-        Hover.new(client, response_builder, nesting, index, dispatcher)
+        Hover.new(T.must(client), response_builder, nesting, index, dispatcher)
       end
 
       sig { override.returns(String) }

lib/ruby_lsp/ruby_lsp_rails/hover.rb

@@ -22,7 +22,7 @@ class Hover
 
       sig do
         params(
-          client: RailsClient,
+          client: RunnerClient,
           response_builder: ResponseBuilders::Hover,
           nesting: T::Array[String],
           index: RubyIndexer::Index,

lib/ruby_lsp_rails/rack_app.rb

@@ -24,6 +24,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.0", "< 0.15.0")
+  spec.add_dependency("ruby-lsp") # , ">= 0.13.0", "< 0.14.0")
   spec.add_dependency("sorbet-runtime", ">= 0.5.9897")
 end