wip

Shopify · Dec 19, 2024 · eff4f8d · eff4f8d
1 parent 64dc1a5
commit eff4f8d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -22,7 +22,7 @@ gem "rails", "8.0.0"
 # temporary
 gem "ruby-lsp", github: "Shopify/ruby-lsp", branch: "main"
 
-platforms :mingw, :x64_mingw, :mswin, :jruby do
-  gem "tzinfo"
-  gem "tzinfo-data"
-end
+# platforms :mingw, :x64_mingw, :mswin, :jruby do
+  # gem "tzinfo"
+  # gem "tzinfo-data"
+# end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -259,8 +259,6 @@ GEM
     timeout (0.4.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2024.1)
-      tzinfo (>= 1.0.0)
     unicode-display_width (2.6.0)
     uri (1.0.1)
     useragent (0.16.10)
@@ -294,8 +292,6 @@ DEPENDENCIES
   sorbet-static-and-runtime
   sqlite3
   tapioca (~> 0.13)
-  tzinfo
-  tzinfo-data
 
 BUNDLED WITH
    2.5.19
diff --git a/lib/ruby_lsp/ruby_lsp_rails/definition.rb b/lib/ruby_lsp/ruby_lsp_rails/definition.rb
@@ -145,7 +145,7 @@ def collect_definitions(name)
 
         methods.each do |target_method|
           location = target_method.location
-          file_path = target_method.file_path
+          file_path = T.must(target_method.file_path)
 
           @response_builder << Interface::Location.new(
             uri: URI::Generic.from_path(path: file_path).to_s,

diff --git a/test/ruby_lsp_rails/indexing_enhancement_test.rb b/test/ruby_lsp_rails/indexing_enhancement_test.rb
@@ -20,7 +20,7 @@ def populated_index
 
       def setup
         @index = self.class.populated_index
-        @indexable_path = RubyIndexer::IndexablePath.new(nil, "/fake.rb")
+        @indexable_path = URI::Generic.from_path(path: "/fake.rb")
       end
 
       def teardown