Upgrade ruby-lsp requirement to v0.19

Shopify · Oct 2, 2024 · ba2e34a · ba2e34a
1 parent 51df5ac
commit ba2e34a
Show file tree

Hide file tree

Showing 5 changed files with 642 additions and 323 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     ruby-lsp-rails (0.3.16)
-      ruby-lsp (>= 0.18.4, < 0.19.0)
+      ruby-lsp (>= 0.19.0, < 0.20.0)
 
 GEM
   remote: https://rubygems.org/
@@ -148,7 +148,7 @@ GEM
     parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
-    prism (1.0.0)
+    prism (1.1.0)
     psych (5.1.2)
       stringio
     public_suffix (5.0.5)
@@ -228,9 +228,9 @@ GEM
       rubocop (~> 1.51)
     rubocop-sorbet (0.8.3)
       rubocop (>= 0.90.0)
-    ruby-lsp (0.18.4)
+    ruby-lsp (0.19.0)
       language_server-protocol (~> 3.17.0)
-      prism (~> 1.0)
+      prism (>= 1.1, < 2.0)
       rbs (>= 3, < 4)
       sorbet-runtime (>= 0.5.10782)
     ruby-progressbar (1.13.0)

diff --git a/lib/ruby_lsp/ruby_lsp_rails/addon.rb b/lib/ruby_lsp/ruby_lsp_rails/addon.rb
@@ -48,7 +48,7 @@ def rails_runner_client
       sig { override.params(global_state: GlobalState, message_queue: Thread::Queue).void }
       def activate(global_state, message_queue)
         @global_state = global_state
-        $stderr.puts("Activating Ruby LSP Rails add-on v#{VERSION}")
+        $stderr.puts("Activating Ruby LSP Rails add-on v#{version}")
         register_additional_file_watchers(global_state: global_state, message_queue: message_queue)
         @global_state.index.register_enhancement(IndexingEnhancement.new)
 
@@ -60,6 +60,10 @@ def activate(global_state, message_queue)
       def deactivate
         @rails_runner_client.shutdown
       end
+      sig { override.returns(String) }
+      def version
+        VERSION
+      end
 
       # Creates a new CodeLens listener. This method is invoked on every CodeLens request
       sig do

diff --git a/lib/ruby_lsp/ruby_lsp_rails/indexing_enhancement.rb b/lib/ruby_lsp/ruby_lsp_rails/indexing_enhancement.rb
@@ -60,6 +60,7 @@ def handle_association(index, owner, node, file_path)
           name_arg.location,
           name_arg.location,
           nil,
+          index.configuration.encoding,
           [RubyIndexer::Entry::Signature.new([])],
           RubyIndexer::Entry::Visibility::PUBLIC,
           owner,
@@ -72,6 +73,7 @@ def handle_association(index, owner, node, file_path)
           name_arg.location,
           name_arg.location,
           nil,
+          index.configuration.encoding,
           [RubyIndexer::Entry::Signature.new([RubyIndexer::Entry::RequiredParameter.new(name: name.to_sym)])],
           RubyIndexer::Entry::Visibility::PUBLIC,
           owner,

diff --git a/ruby-lsp-rails.gemspec b/ruby-lsp-rails.gemspec
@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
     Dir["lib/**/*", "LICENSE.txt", "Rakefile", "README.md"]
   end
 
-  spec.add_dependency("ruby-lsp", ">= 0.18.4", "< 0.19.0")
+  spec.add_dependency("ruby-lsp", ">= 0.19.0", "< 0.20.0")
 end