Skip to content

ide: fix goto def visibility issues #1357

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 1 commit into from
Sep 24, 2026
Merged

ide: fix goto def visibility issues #1357

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
140 changes: 132 additions & 8 deletions crates/squawk_ide/src/ast_nav.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
///
/// There shouldn't be any dependency on Salsa.
use squawk_syntax::{
SyntaxNode, SyntaxToken,
SyntaxKind, SyntaxNode, SyntaxToken,
ast::{self, AstNode},
};
use std::iter;

use crate::name;
use crate::symbols::Name;

pub(crate) fn find_cte_with_table(
Expand Down Expand Up @@ -319,19 +320,119 @@ pub(crate) fn unwrap_paren_expr(expr: ast::Expr) -> impl Iterator<Item = ast::Ex
}
}

pub(crate) fn merge_using_from_item(merge: &ast::Merge) -> Option<ast::FromItem> {
match merge.using_on_clause()?.from_list_item()? {
ast::FromListItem::FromItem(from_item) => Some(from_item),
ast::FromListItem::JoinExpr(_) => None,
}
}

pub(crate) fn iter_from_clause(
from_clause: &ast::FromClause,
) -> impl Iterator<Item = ast::FromItem> {
iter_from_items(from_clause.items())
}

// A FROM item can't see its siblings, unless it's lateral, then it can see
// the items before it. An `on` clause can only see the items in its own join.
pub(crate) fn visible_from_items(
from_items: impl Iterator<Item = ast::FromItem>,
node: &SyntaxNode,
) -> Vec<ast::FromItem> {
let mut from_items = from_items.peekable();
if let Some(from_item) = from_items.peek()
&& let Some(join_expr) = enclosing_on_clause_join_expr(node, from_item)
{
return iter_join_expr(&join_expr).collect();
}
let mut visible = vec![];
collect_visible_from_items(from_items, node, &mut visible);
visible
}

fn enclosing_on_clause_join_expr(
node: &SyntaxNode,
from_item: &ast::FromItem,
) -> Option<ast::JoinExpr> {
let from_list = enclosing_from_list(from_item.syntax())?;
node.ancestors()
.filter_map(ast::OnClause::cast)
.filter_map(|on_clause| {
let join = on_clause.syntax().parent().and_then(ast::Join::cast)?;
join.syntax().parent().and_then(ast::JoinExpr::cast)
})
.find(|join_expr| enclosing_from_list(join_expr.syntax()).as_ref() == Some(&from_list))
}

fn enclosing_from_list(node: &SyntaxNode) -> Option<SyntaxNode> {
node.ancestors().find(|ancestor| {
ast::FromClause::can_cast(ancestor.kind())
|| ast::UsingClause::can_cast(ancestor.kind())
|| ast::UsingOnClause::can_cast(ancestor.kind())
})
}

fn collect_visible_from_items(
from_items: impl Iterator<Item = ast::FromItem>,
node: &SyntaxNode,
visible: &mut Vec<ast::FromItem>,
) {
for from_item in from_items {
if !from_item
.syntax()
.text_range()
.contains_range(node.text_range())
{
visible.push(from_item);
continue;
}
hide_disallowed_lateral_items(&from_item, visible);
if let ast::FromItem::ParenFromItem(paren) = &from_item
&& let Some(paren_expr) = paren.paren_expr()
{
collect_visible_from_items(
iter_from_items(paren_expr.from_list_item().into_iter()),
node,
visible,
);
} else if !is_lateral_from_item(&from_item) {
visible.clear();
}
return;
}
}

fn hide_disallowed_lateral_items(from_item: &ast::FromItem, visible: &mut Vec<ast::FromItem>) {
let Some(join) = from_item.syntax().parent().and_then(ast::Join::cast) else {
return;
};
if !matches!(
join.join_type(),
Some(ast::JoinType::JoinRight(_) | ast::JoinType::JoinFull(_))
) {
return;
}
let Some(lhs) = join
.syntax()
.parent()
.and_then(ast::JoinExpr::cast)
.and_then(|join_expr| join_expr.from_list_item())
else {
return;
};
let hidden: Vec<_> = iter_from_items(std::iter::once(lhs)).collect();
visible.retain(|from_item| !hidden.contains(from_item));
}

fn is_lateral_from_item(from_item: &ast::FromItem) -> bool {
match from_item {
ast::FromItem::ExprFromItem(_)
| ast::FromItem::FunctionFromItem(_)
| ast::FromItem::JsonTableFromItem(_)
| ast::FromItem::RowsFromItem(_)
| ast::FromItem::XmlTableFromItem(_) => true,
ast::FromItem::GraphTableFromItem(_)
| ast::FromItem::ParenFromItem(_)
| ast::FromItem::RelationFromItem(_) => from_item
.syntax()
.children_with_tokens()
.any(|it| it.kind() == SyntaxKind::LATERAL_KW),
}
}

pub(crate) fn iter_join_expr(join_expr: &ast::JoinExpr) -> impl Iterator<Item = ast::FromItem> {
iter_from_items(std::iter::once(ast::FromListItem::JoinExpr(
join_expr.clone(),
Expand Down Expand Up @@ -371,3 +472,26 @@ impl Iterator for FromItemIter {
None
}
}

pub(crate) enum RoutineKind {
Function,
Procedure,
}

pub(crate) fn enclosing_routine_name(
node: &SyntaxNode,
) -> Option<(Name, ast::PathSegment, RoutineKind)> {
node.ancestors().find_map(|ancestor| {
let (path, kind) =
if let Some(create_function) = ast::CreateFunction::cast(ancestor.clone()) {
(create_function.name()?.path()?, RoutineKind::Function)
} else {
(
ast::CreateProcedure::cast(ancestor)?.name()?.path()?,
RoutineKind::Procedure,
)
};
let (_, routine_name) = name::schema_and_name_definition(&path)?;
Some((routine_name, path.segment()?, kind))
})
}
62 changes: 39 additions & 23 deletions crates/squawk_ide/src/classify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{location::LocationKind, name, symbols::Name};
use crate::{ast_nav, location::LocationKind, symbols::Name};
use squawk_syntax::{
SyntaxKind, SyntaxNode,
ast::{self, AstNode, LitKind},
Expand Down Expand Up @@ -508,13 +508,19 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
let mut in_returning_clause = false;
let mut in_set_clause = false;
let mut in_set_expr = false;
let mut in_using_clause = false;
let mut in_where_clause = false;
let mut in_when_clause = false;
let mut in_when_condition = false;
for ancestor in parent.ancestors() {
if ast::ArgList::can_cast(ancestor.kind()) {
in_arg_list = true;
}
if ast::UsingClause::can_cast(ancestor.kind())
|| ast::UsingOnClause::can_cast(ancestor.kind())
{
in_using_clause = true;
}
if ast::WhenCondition::can_cast(ancestor.kind()) {
in_when_condition = true;
}
Expand Down Expand Up @@ -575,7 +581,11 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
}
}
if ast::Merge::can_cast(ancestor.kind()) {
if in_returning_clause || in_on_clause || in_when_clause {
if in_returning_clause
|| in_on_clause
|| in_when_clause
|| (in_using_clause && in_arg_list)
{
if is_function_call || is_schema_table_col {
return Some(NameRefClass::Schema);
} else {
Expand All @@ -602,6 +612,17 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
return Some(NameRefClass::PolicyQualifiedColumnTable);
}
}
if ast::ReturnStmt::can_cast(ancestor.kind())
&& ast_nav::enclosing_routine_name(&ancestor).is_some_and(|(routine_name, _, _)| {
Name::from_node(&base_name_ref) == routine_name
})
{
if is_function_call || is_schema_table_col {
return Some(NameRefClass::Schema);
} else {
return Some(NameRefClass::SelectQualifiedColumnTable);
}
}
}
return Some(NameRefClass::Schema);
}
Expand Down Expand Up @@ -716,8 +737,8 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
}
if ast::ReturnStmt::can_cast(ancestor.kind()) {
if let Some(ast::Expr::NameRef(base)) = field_expr.base()
&& enclosing_routine_name(&ancestor)
.is_some_and(|routine_name| Name::from_node(&base) == routine_name)
&& ast_nav::enclosing_routine_name(&ancestor)
.is_some_and(|(routine_name, _, _)| Name::from_node(&base) == routine_name)
{
return Some(NameRefClass::SelectColumn);
}
Expand Down Expand Up @@ -1065,7 +1086,10 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
in_returning_clause = true;
}
if ast::Delete::can_cast(ancestor.kind()) {
if in_returning_clause || in_where_clause {
if in_returning_clause
|| in_where_clause
|| (in_using_clause && (in_on_clause || in_arg_list))
{
return Some(NameRefClass::DeleteColumn);
}
if in_using_clause {
Expand All @@ -1074,7 +1098,11 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
break;
}
if ast::Update::can_cast(ancestor.kind()) {
if in_returning_clause || in_where_clause || in_set_clause {
if in_returning_clause
|| in_where_clause
|| in_set_clause
|| (in_from_clause && (in_on_clause || in_arg_list))
{
return Some(NameRefClass::UpdateColumn);
}
if in_from_clause {
Expand All @@ -1086,7 +1114,11 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
in_when_clause = true;
}
if ast::Merge::can_cast(ancestor.kind()) {
if in_when_clause || in_returning_clause || in_on_clause {
if in_when_clause
|| in_returning_clause
|| in_on_clause
|| (in_using_clause && in_arg_list)
{
return Some(NameRefClass::MergeColumn);
}
if in_using_clause {
Expand All @@ -1103,22 +1135,6 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
has_table_name_ref.then_some(NameRefClass::Table)
}

fn enclosing_routine_name(node: &SyntaxNode) -> Option<Name> {
for ancestor in node.ancestors() {
if let Some(create_function) = ast::CreateFunction::cast(ancestor.clone()) {
let (_, routine_name) =
name::schema_and_name_definition(&create_function.name()?.path()?)?;
return Some(routine_name);
}
if let Some(create_procedure) = ast::CreateProcedure::cast(ancestor) {
let (_, routine_name) =
name::schema_and_name_definition(&create_procedure.name()?.path()?)?;
return Some(routine_name);
}
}
None
}

fn is_grouping_or_distinct_el(node: &SyntaxNode) -> bool {
node.ancestors()
.skip(1)
Expand Down
Loading
Loading