Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
well they do come out
  • Loading branch information
juleswritescode committed Sep 6, 2025
commit b187a0644dcc4ea94feab044b6e447e093de8082
105 changes: 52 additions & 53 deletions crates/pgt_completions/src/providers/columns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -938,10 +938,9 @@ mod tests {
#[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
async fn completes_quoted_columns(pool: PgPool) {
let setup = r#"
create schema if not exists auth;
drop table if exists auth.quote_test_users;
create schema if not exists private;

create table auth.quote_test_users (
create table private.users (
id serial primary key,
email text unique not null,
name text not null,
Expand All @@ -951,60 +950,60 @@ mod tests {

pool.execute(setup).await.unwrap();

// // test completion inside quoted column name
// assert_complete_results(
// format!(
// r#"select "em{}" from "auth"."quote_test_users""#,
// QueryWithCursorPosition::cursor_marker()
// )
// .as_str(),
// vec![CompletionAssertion::LabelAndDesc(
// "email".to_string(),
// "auth.quote_test_users".to_string(),
// )],
// None,
// &pool,
// )
// .await;

// // test completion for already quoted column
// assert_complete_results(
// format!(
// r#"select "quoted_col{}" from "auth"."quote_test_users""#,
// QueryWithCursorPosition::cursor_marker()
// )
// .as_str(),
// vec![CompletionAssertion::LabelAndDesc(
// "quoted_column".to_string(),
// "auth.quote_test_users".to_string(),
// )],
// None,
// &pool,
// )
// .await;

// // test completion with empty quotes
// assert_complete_results(
// format!(
// r#"select "{}" from "auth"."quote_test_users""#,
// QueryWithCursorPosition::cursor_marker()
// )
// .as_str(),
// vec![
// CompletionAssertion::Label("email".to_string()),
// CompletionAssertion::Label("id".to_string()),
// CompletionAssertion::Label("name".to_string()),
// CompletionAssertion::Label("quoted_column".to_string()),
// ],
// None,
// &pool,
// )
// .await;
// test completion inside quoted column name
assert_complete_results(
format!(
r#"select "em{}" from "private"."users""#,
QueryWithCursorPosition::cursor_marker()
)
.as_str(),
vec![CompletionAssertion::LabelAndDesc(
"email".to_string(),
"private.users".to_string(),
)],
None,
&pool,
)
.await;

// test completion for already quoted column
assert_complete_results(
format!(
r#"select "quoted_col{}" from "private"."users""#,
QueryWithCursorPosition::cursor_marker()
)
.as_str(),
vec![CompletionAssertion::LabelAndDesc(
"quoted_column".to_string(),
"private.users".to_string(),
)],
None,
&pool,
)
.await;

// test completion with empty quotes
assert_complete_results(
format!(
r#"select "{}" from "private"."users""#,
QueryWithCursorPosition::cursor_marker()
)
.as_str(),
vec![
CompletionAssertion::Label("email".to_string()),
CompletionAssertion::Label("id".to_string()),
CompletionAssertion::Label("name".to_string()),
CompletionAssertion::Label("quoted_column".to_string()),
],
None,
&pool,
)
.await;

// test completion with partially opened quote
assert_complete_results(
format!(
r#"select "{} from "auth"."quote_test_users""#,
r#"select "{} from "private"."users""#,
QueryWithCursorPosition::cursor_marker()
)
.as_str(),
Expand Down
2 changes: 0 additions & 2 deletions crates/pgt_completions/src/test_helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ pub(crate) async fn assert_complete_results(
let params = get_test_params(&tree, &cache, query.into());
let items = complete(params);

println!("{:#?}", &items[..3]);

let (not_existing, existing): (Vec<CompletionAssertion>, Vec<CompletionAssertion>) =
assertions.into_iter().partition(|a| match a {
CompletionAssertion::LabelNotExists(_) | CompletionAssertion::KindNotExists(_) => true,
Expand Down
4 changes: 4 additions & 0 deletions crates/pgt_workspace/src/workspace/server.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::{
cmp::min,
collections::HashMap,
fs,
panic::RefUnwindSafe,
Expand Down Expand Up @@ -714,6 +715,9 @@ impl Workspace for WorkspaceServer {
text: id.content().to_string(),
});

let max_items = min(items.len(), 3);
tracing::warn!("found items: {:#?}", &items[..max_items]);

Ok(CompletionsResult { items })
}
}
Expand Down
Loading