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
12 changes: 6 additions & 6 deletions crates/squawk_ide/src/binder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ fn bind_create_index(b: &mut Binder, create_index: ast::CreateIndex) {
return;
};

let index_name = Name::new(name.syntax().text().to_string());
let index_name = Name::from_node(&name);
let name_ptr = SyntaxNodePtr::new(name.syntax());

let Some(schema) = b.current_search_path().first().cloned() else {
Expand Down Expand Up @@ -195,7 +195,7 @@ fn bind_create_schema(b: &mut Binder, create_schema: ast::CreateSchema) {
return;
};

let schema_name = Name::new(schema_name_node.syntax().text().to_string());
let schema_name = Name::from_node(&schema_name_node);
let name_ptr = SyntaxNodePtr::new(schema_name_node.syntax());

let schema_id = b.symbols.alloc(Symbol {
Expand All @@ -213,10 +213,10 @@ fn item_name(path: &ast::Path) -> Option<Name> {
let segment = path.segment()?;

if let Some(name) = segment.name() {
return Some(Name::new(name.syntax().text().to_string()));
return Some(Name::from_node(&name));
}
if let Some(name) = segment.name_ref() {
return Some(Name::new(name.syntax().text().to_string()));
return Some(Name::from_node(&name));
}

None
Expand All @@ -240,7 +240,7 @@ fn schema_name(b: &Binder, path: &ast::Path, is_temp: bool) -> Option<Schema> {
.and_then(|q| q.segment())
.and_then(|s| s.name_ref())
{
return Some(Schema(Name::new(name_ref.syntax().text().to_string())));
return Some(Schema(Name::from_node(&name_ref)));
}

if is_temp {
Expand Down Expand Up @@ -339,7 +339,7 @@ fn extract_param_signature(param_list: Option<ast::ParamList>) -> Option<Vec<Nam
&& let Some(segment) = path.segment()
&& let Some(name_ref) = segment.name_ref()
{
params.push(Name::new(name_ref.syntax().text().to_string()));
params.push(Name::from_node(&name_ref));
}
}
(!params.is_empty()).then_some(params)
Expand Down
6 changes: 2 additions & 4 deletions crates/squawk_ide/src/code_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -406,14 +406,12 @@ fn remove_redundant_alias(
let target = token.parent_ancestors().find_map(ast::Target::cast)?;

let as_name = target.as_name()?;
let alias_name = as_name.name()?;

let (inferred_column, _) = ColumnName::inferred_from_target(target.clone())?;
let inferred_column_alias = inferred_column.to_string()?;

let alias = alias_name.syntax().text().to_string();
let alias = as_name.name()?;

if Name::new(alias) != Name::new(inferred_column_alias) {
if Name::from_node(&alias) != Name::from_string(inferred_column_alias) {
return None;
}

Expand Down
4 changes: 2 additions & 2 deletions crates/squawk_ide/src/hover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ fn hover_column(
.ancestors()
.any(|a| ast::Values::can_cast(a.kind()))
{
Name::new(name_ref.syntax().text().to_string())
Name::from_node(name_ref)
} else {
Name::new(column_name_node.text().to_string())
Name::from_string(column_name_node.text().to_string())
};
return Some(format!("column {}.{}", cte_name, column_name));
}
Expand Down
2 changes: 1 addition & 1 deletion crates/squawk_ide/src/inlay_hints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fn inlay_hint_insert(
if let ast::TableArg::Column(column) = arg
&& let Some(name) = column.name()
{
let col_name = Name::new(name.syntax().text().to_string());
let col_name = Name::from_node(&name);
let target = Some(name.syntax().text_range());
Some((col_name, target))
} else {
Expand Down
Loading
Loading