Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions rust/rubydex/src/indexing/ruby_indexer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -644,13 +644,30 @@ impl<'a> RubyIndexer<'a> {
let (comments, flags) = self.find_comments_for(offset.start());
let lexical_nesting_id = self.parent_lexical_scope_id();
let superclass = superclass_node.as_ref().and_then(|n| {
self.index_constant_reference(n, false).map(|id| {
self.local_graph.add_constant_reference(ConstantReference::new(
// Try direct constant reference first
if let Some(id) = self.index_constant_reference(n, false) {
return Some(self.local_graph.add_constant_reference(ConstantReference::new(
id,
self.uri_id,
Offset::from_prism_location(&n.location()),
))
})
)));
}

// For call nodes (e.g. `ActiveRecord::Migration[7.0]`), try the receiver constant
if let ruby_prism::Node::CallNode { .. } = n {
let call = n.as_call_node().unwrap();
if let Some(receiver) = call.receiver()
&& let Some(id) = self.index_constant_reference(&receiver, false)
{
return Some(self.local_graph.add_constant_reference(ConstantReference::new(
id,
self.uri_id,
Offset::from_prism_location(&receiver.location()),
)));
}
}

None
});

if let Some(superclass_node) = superclass_node
Expand Down
9 changes: 4 additions & 5 deletions rust/rubydex/src/indexing/ruby_indexer_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4865,26 +4865,25 @@ mod superclass_tests {
[
"dynamic-ancestor: Dynamic superclass (1:13-1:24)",
"dynamic-ancestor: Dynamic superclass (2:13-2:16)",
"dynamic-ancestor: Dynamic superclass (3:21-3:49)",
"dynamic-constant-reference: Dynamic constant reference (4:13-4:16)",
"dynamic-ancestor: Dynamic superclass (4:13-4:21)",
]
);

assert_definition_at!(&context, "1:1-1:29", Class, |def| {
assert!(def.superclass_ref().is_none(),);
assert!(def.superclass_ref().is_none());
});

assert_definition_at!(&context, "2:1-2:21", Class, |def| {
assert!(def.superclass_ref().is_none(),);
assert!(def.superclass_ref().is_none());
});

assert_definition_at!(&context, "3:1-3:54", Class, |def| {
assert!(def.superclass_ref().is_none(),);
assert!(def.superclass_ref().is_some());
});

assert_definition_at!(&context, "4:1-4:26", Class, |def| {
assert!(def.superclass_ref().is_none(),);
assert!(def.superclass_ref().is_none());
});
}
}
Expand Down
Loading