Use NodeContext from RubyLSP to fix Definition targetting

Author: andyw8

lib/ruby_lsp/ruby_lsp_rails/definition.rb

@@ -43,14 +43,26 @@ class Definition
       def initialize(client, response_builder, node_context, index, dispatcher)
         @client = client
         @response_builder = response_builder
+        @node_context = node_context
         @nesting = T.let(node_context.nesting, T::Array[String])
         @index = index
 
-        dispatcher.register(self, :on_call_node_enter)
+        dispatcher.register(self, :on_call_node_enter, :on_symbol_node_enter, :on_string_node_enter)
       end
 
-      sig { params(node: Prism::CallNode).void }
-      def on_call_node_enter(node)
+      sig { params(node: Prism::SymbolNode).void }
+      def on_symbol_node_enter(node)
+        handle_dsl(node) if @node_context.call_node
+      end
+
+      sig { params(node: Prism::StringNode).void }
+      def on_string_node_enter(node)
+        handle_dsl(node) if @node_context.call_node
+      end
+
+      sig { params(node: T.any(Prism::SymbolNode, Prism::StringNode)).void }
+      def handle_dsl(node)
+        node = T.must(@node_context.call_node)
         return unless self_receiver?(node)
 
         message = node.message
@@ -61,7 +73,18 @@ def on_call_node_enter(node)
           handle_association(node)
         elsif Support::Callbacks::ALL.include?(message)
           handle_callback(node)
-        elsif message.end_with?("_path") || message.end_with?("_url")
+        end
+      end
+
+      sig { params(node: Prism::CallNode).void }
+      def on_call_node_enter(node)
+        return unless self_receiver?(node)
+
+        message = node.message
+
+        return unless message
+
+        if message.end_with?("_path") || message.end_with?("_url")
           handle_route(node)
         end
       end

test/ruby_lsp_rails/definition_test.rb

@@ -7,7 +7,7 @@ module RubyLsp
   module Rails
     class DefinitionTest < ActiveSupport::TestCase
       test "recognizes model callback with multiple symbol arguments" do
-        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 10 })
+        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 18 })
           # typed: false
 
           class TestModel
@@ -34,7 +34,7 @@ def baz; end
       end
 
       test "recognizes has_many model associations" do
-        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 4 })
+        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 14 })
           # typed: false
 
           class Organization < ActiveRecord::Base
@@ -53,7 +53,7 @@ class Organization < ActiveRecord::Base
       end
 
       test "recognizes belongs_to model associations" do
-        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 4 })
+        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 14 })
           # typed: false
 
           class Membership < ActiveRecord::Base
@@ -72,7 +72,7 @@ class Membership < ActiveRecord::Base
       end
 
       test "recognizes has_one model associations" do
-        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 4 })
+        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 11 })
           # typed: false
 
           class User < ActiveRecord::Base
@@ -91,7 +91,7 @@ class User < ActiveRecord::Base
       end
 
       test "recognizes has_and_belongs_to_many model associations" do
-        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 4 })
+        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 27 })
           # typed: false
 
           class Profile < ActiveRecord::Base
@@ -110,7 +110,7 @@ class Profile < ActiveRecord::Base
       end
 
       test "handles class_name argument for associations" do
-        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 4 })
+        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 11 })
           # typed: false
 
           class User < ActiveRecord::Base
@@ -129,7 +129,7 @@ class User < ActiveRecord::Base
       end
 
       test "recognizes controller callback with string argument" do
-        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 10 })
+        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 17 })
           # typed: false
 
           class TestController
@@ -149,7 +149,7 @@ def foo; end
       end
 
       test "recognizes job callback with string and symbol arguments" do
-        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 10 })
+        response = generate_definitions_for_source(<<~RUBY, { line: 3, character: 18 })
           # typed: false
 
           class TestJob