Merge branch 'main' into andyw8/class-methods-block

Author: andyw8

Gemfile

@@ -23,5 +23,3 @@ platforms :mingw, :x64_mingw, :mswin, :jruby do
   gem "tzinfo"
   gem "tzinfo-data"
 end
-
-gem "ruby-lsp", github: "Shopify/ruby-lsp", branch: "11-14-allow_indexing_enhancements_to_create_namespaces"

Gemfile.lock

@@ -1,19 +1,8 @@
-GIT
-  remote: https://github.com/Shopify/ruby-lsp.git
-  revision: bb3a5b25da4ba2931278fdeb1f0fbdf40b8545c3
-  branch: 11-14-allow_indexing_enhancements_to_create_namespaces
-  specs:
-    ruby-lsp (0.21.4)
-      language_server-protocol (~> 3.17.0)
-      prism (>= 1.2, < 2.0)
-      rbs (>= 3, < 4)
-      sorbet-runtime (>= 0.5.10782)
-
 PATH
   remote: .
   specs:
     ruby-lsp-rails (0.3.26)
-      ruby-lsp (>= 0.21.2, < 0.22.0)
+      ruby-lsp (>= 0.22.0, < 0.23.0)
 
 GEM
   remote: https://rubygems.org/
@@ -140,8 +129,6 @@ GEM
     nio4r (2.7.4)
     nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x64-mingw-ucrt)
-      racc (~> 1.4)
     nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
@@ -225,6 +212,11 @@ GEM
       rubocop (~> 1.51)
     rubocop-sorbet (0.8.7)
       rubocop (>= 1)
+    ruby-lsp (0.22.0)
+      language_server-protocol (~> 3.17.0)
+      prism (>= 1.2, < 2.0)
+      rbs (>= 3, < 4)
+      sorbet-runtime (>= 0.5.10782)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     securerandom (0.3.1)
@@ -242,7 +234,6 @@ GEM
       sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
     sqlite3 (2.1.0-arm64-darwin)
-    sqlite3 (2.1.0-x64-mingw-ucrt)
     sqlite3 (2.1.0-x86_64-darwin)
     sqlite3 (2.1.0-x86_64-linux-gnu)
     stringio (3.1.2)
@@ -275,7 +266,6 @@ GEM
 
 PLATFORMS
   arm64-darwin
-  x64-mingw-ucrt
   x86_64-darwin
   x86_64-linux
 
@@ -289,7 +279,6 @@ DEPENDENCIES
   rubocop-rake (~> 0.6.0)
   rubocop-shopify (~> 2.15)
   rubocop-sorbet (~> 0.8)
-  ruby-lsp!
   ruby-lsp-rails!
   sorbet-static-and-runtime
   sqlite3

lib/ruby_lsp/ruby_lsp_rails/runner_client.rb

@@ -44,7 +44,6 @@ def create_client(outgoing_queue)
 
       class InitializationError < StandardError; end
       class MessageError < StandardError; end
-      class IncompleteMessageError < MessageError; end
       class EmptyMessageError < MessageError; end
 
       extend T::Sig

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.21.2", "< 0.22.0")
+  spec.add_dependency("ruby-lsp", ">= 0.22.0", "< 0.23.0")
 end