Skip to content

ide: goto def with recursive CTEs #909

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 2 commits into from
Feb 3, 2026
Merged

ide: goto def with recursive CTEs #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
398ad35
ide: goto def with recursive CTEs
sbdchd Feb 3, 2026
e0d0def
fix
sbdchd Feb 3, 2026
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
19 changes: 19 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 @@ -4110,6 +4110,25 @@ select a from y;
");
}

#[test]
fn goto_recursive_cte_reference_inside_cte() {
assert_snapshot!(goto("
with recursive nums as (
select 1 as n
union all
select n + 1 from nums$0 where n < 5
)
select * from nums;
"), @r"
╭▸
2 │ with recursive nums as (
│ ──── 2. destination
‡
5 │ select n + 1 from nums where n < 5
╰╴ ─ 1. source
");
}

#[test]
fn goto_cte_with_column_list() {
assert_snapshot!(goto("
Expand Down
30 changes: 18 additions & 12 deletions crates/squawk_ide/src/resolve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,14 +1886,16 @@ fn find_column_in_create_table_as(

fn resolve_cte_table(name_ref: &ast::NameRef, cte_name: &Name) -> Option<SyntaxNodePtr> {
let with_clause = find_parent_with_clause(name_ref.syntax())?;
let is_recursive = with_clause.recursive_token().is_some();
for with_table in with_clause.with_tables() {
if let Some(name) = with_table.name()
&& Name::from_node(&name) == *cte_name
{
if with_table
.syntax()
.text_range()
.contains_range(name_ref.syntax().text_range())
if !is_recursive
&& with_table
.syntax()
.text_range()
.contains_range(name_ref.syntax().text_range())
{
continue;
}
Expand Down Expand Up @@ -1998,16 +2000,18 @@ fn resolve_cte_column(
column_name: &Name,
) -> Option<SyntaxNodePtr> {
let with_clause = find_parent_with_clause(name_ref.syntax())?;
let is_recursive = with_clause.recursive_token().is_some();

for with_table in with_clause.with_tables() {
if let Some(name) = with_table.name()
&& Name::from_node(&name) == *cte_name
{
// Skip if we're inside this CTE's definition (CTE doesn't shadow itself)
if with_table
.syntax()
.text_range()
.contains_range(name_ref.syntax().text_range())
if !is_recursive
&& with_table
.syntax()
.text_range()
.contains_range(name_ref.syntax().text_range())
{
continue;
}
Expand Down Expand Up @@ -2746,15 +2750,17 @@ fn count_columns_for_from_item(

fn count_columns_for_cte(name_ref: &ast::NameRef, cte_name: &Name) -> Option<usize> {
let with_clause = find_parent_with_clause(name_ref.syntax())?;
let is_recursive = with_clause.recursive_token().is_some();

for with_table in with_clause.with_tables() {
if let Some(name) = with_table.name()
&& Name::from_node(&name) == *cte_name
{
if with_table
.syntax()
.text_range()
.contains_range(name_ref.syntax().text_range())
if !is_recursive
&& with_table
.syntax()
.text_range()
.contains_range(name_ref.syntax().text_range())
{
return None;
}
Expand Down
Loading