Skip to content

ide: fix goto def for func call inside func #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 1 commit into from
Jan 31, 2026
Merged

ide: fix goto def for func call inside func #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions crates/squawk_ide/src/classify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fn is_special_fn(kind: SyntaxKind) -> bool {
}

pub(crate) fn classify_name_ref(name_ref: &ast::NameRef) -> Option<NameRefClass> {
let mut in_call_expr = false;
let mut in_function_name = false;
let mut in_arg_list = false;
let mut in_column_list = false;
let mut in_where_clause = false;
Expand Down Expand Up @@ -546,17 +546,15 @@ pub(crate) fn classify_name_ref(name_ref: &ast::NameRef) -> Option<NameRefClass>
return Some(NameRefClass::Table);
}
if let Some(create_trigger) = ast::CreateTrigger::cast(ancestor.clone())
&& in_call_expr
&& !in_arg_list
&& in_function_name
{
if create_trigger.procedure_token().is_some() {
return Some(NameRefClass::ProcedureCall);
}
return Some(NameRefClass::FunctionCall);
}
if let Some(create_event_trigger) = ast::CreateEventTrigger::cast(ancestor.clone())
&& in_call_expr
&& !in_arg_list
&& in_function_name
{
if create_event_trigger.procedure_token().is_some() {
return Some(NameRefClass::ProcedureCall);
Expand All @@ -576,9 +574,11 @@ pub(crate) fn classify_name_ref(name_ref: &ast::NameRef) -> Option<NameRefClass>
in_arg_list = true;
}
if ast::CallExpr::can_cast(ancestor.kind()) {
in_call_expr = true;
if !in_arg_list {
in_function_name = true;
}
}
if ast::DefaultConstraint::can_cast(ancestor.kind()) && in_call_expr && !in_arg_list {
if ast::DefaultConstraint::can_cast(ancestor.kind()) && in_function_name {
return Some(NameRefClass::FunctionCall);
}
if ast::OnClause::can_cast(ancestor.kind()) {
Expand All @@ -588,7 +588,7 @@ pub(crate) fn classify_name_ref(name_ref: &ast::NameRef) -> Option<NameRefClass>
in_from_clause = true;
}
if ast::Select::can_cast(ancestor.kind()) {
if in_call_expr && !in_arg_list && !in_special_sql_fn {
if in_function_name && !in_special_sql_fn {
return Some(NameRefClass::SelectFunctionCall);
}
if in_from_clause && !in_on_clause {
Expand Down
17 changes: 17 additions & 0 deletions crates/squawk_ide/src/goto_definition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3621,6 +3621,23 @@ select a$0(t, 1) from t;
);
}

#[test]
fn goto_function_call_nested() {
assert_snapshot!(goto("
create function f() returns int8
as 'select 1'
language sql;
select format('foo%d', f$0());
"), @r"
╭▸
2 │ create function f() returns int8
│ ─ 2. destination
‡
5 │ select format('foo%d', f());
╰╴ ─ 1. source
");
}

#[test]
fn goto_field_style_function_call() {
assert_snapshot!(goto("
Expand Down
Loading