From 3f241f61df01997cbc6d1ce82d642440d524a003 Mon Sep 17 00:00:00 2001
From: Andy Waite <13400+andyw8@users.noreply.github.com>
Date: Tue, 17 Dec 2024 17:10:51 -0500
Subject: [PATCH] WIP

---
 Gemfile                |  1 +
 Gemfile.lock           | 23 +++++++++++++++--------
 ruby-lsp-rails.gemspec |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 17006b00..f853d854 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,7 @@ gem "sorbet-static-and-runtime", platforms: :ruby
 gem "tapioca", "~> 0.13", require: false, platforms: :ruby
 gem "psych", "~> 5.1", require: false
 gem "rails", "8.0.0"
+gem "ruby-lsp", github: "Shopify/ruby-lsp", branch: "andyw8/add-test-helper-methods-from-rails-addon"
 
 platforms :mingw, :x64_mingw, :mswin, :jruby do
   gem "tzinfo"
diff --git a/Gemfile.lock b/Gemfile.lock
index 8574b806..c4e59cec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,19 @@
+GIT
+  remote: https://github.com/Shopify/ruby-lsp.git
+  revision: 7084ab27fd3008b4e0f57ee2a01c7af257a02c54
+  branch: andyw8/add-test-helper-methods-from-rails-addon
+  specs:
+    ruby-lsp (0.23.0)
+      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.27)
-      ruby-lsp (>= 0.22.0, < 0.23.0)
+      ruby-lsp (>= 0.22.0, <= 0.23.0)
 
 GEM
   remote: https://rubygems.org/
@@ -102,7 +113,7 @@ GEM
       reline (>= 0.4.2)
     json (2.7.6)
     language_server-protocol (3.17.0.3)
-    logger (1.6.1)
+    logger (1.6.3)
     loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -186,7 +197,7 @@ GEM
     rbi (0.2.1)
       prism (~> 1.0)
       sorbet-runtime (>= 0.5.9204)
-    rbs (3.6.1)
+    rbs (3.7.0)
       logger
     rdoc (6.7.0)
       psych (>= 4.0.0)
@@ -214,11 +225,6 @@ 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)
@@ -283,6 +289,7 @@ DEPENDENCIES
   rubocop-rake (~> 0.6.0)
   rubocop-shopify (~> 2.15)
   rubocop-sorbet (~> 0.8)
+  ruby-lsp!
   ruby-lsp-rails!
   sorbet-static-and-runtime
   sqlite3
diff --git a/ruby-lsp-rails.gemspec b/ruby-lsp-rails.gemspec
index 98bcc8ae..0c596233 100644
--- 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.22.0", "< 0.23.0")
+  spec.add_dependency("ruby-lsp", ">= 0.22.0", "<= 0.23.0")
 end