commit

Author: juleswritescode

crates/pgls_completions/src/providers/columns.rs

@@ -50,9 +50,13 @@ fn get_completion_text(ctx: &TreesitterContext, col: &Column) -> CompletionText
 
 #[cfg(test)]
 mod tests {
+    use pgls_test_utils::QueryWithCursorPosition;
     use sqlx::PgPool;
 
-    use crate::test_helper::{TestCompletionsCase, TestCompletionsSuite};
+    use crate::test_helper::{
+        TestCompletionsCase, TestCompletionsSuite, assert_complete_results,
+        assert_no_complete_results,
+    };
 
     #[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
     async fn handles_nested_queries(pool: PgPool) {

crates/pgls_completions/src/relevance/filtering.rs

@@ -1,6 +1,8 @@
 use pgls_schema_cache::ProcKind;
 use pgls_treesitter::context::{TreesitterContext, WrappingClause, WrappingNode};
 
+use crate::is_sanitized_token;
+
 use super::CompletionRelevanceData;
 
 #[derive(Debug)]
@@ -43,6 +45,14 @@ impl CompletionFilter<'_> {
             return None;
         }
 
+        // if ctx
+        //     .get_node_under_cursor_content()
+        //     .is_some_and(|c| is_sanitized_token(c.as_str()))
+        //     && ctx.before_cursor_matches_kind(&["ERROR"])
+        // {
+        //     return None;
+        // }
+
         // "literal" nodes can be identfiers wrapped in quotes:
         // `select "email" from auth.users;`
         // Here, "email" is a literal node.

crates/pgls_completions/src/relevance/scoring.rs

@@ -47,7 +47,9 @@ impl CompletionScore<'_> {
     fn check_matches_query_input(&mut self, ctx: &TreesitterContext) {
         let content = match ctx.get_node_under_cursor_content() {
             Some(c) if !sanitization::is_sanitized_token(c.as_str()) => c.replace('"', ""),
-            _ => return,
+            _ => {
+                return;
+            }
         };
 
         let name = match self.data {
@@ -59,31 +61,28 @@ impl CompletionScore<'_> {
             CompletionRelevanceData::Role(r) => r.name.as_str().to_ascii_lowercase(),
         };
 
-        let is_case =
-            matches!(self.data, CompletionRelevanceData::Column(_)) && content.as_str() == "u";
-
         let fz_matcher = SkimMatcherV2::default();
 
         let check_against = match &ctx.identifier_qualifiers {
             // If both qualifiers are already written out, we must check the item's name itself.
-            (Some(_), Some(_)) => name,
+            (Some(_), Some(_)) => name.clone(),
 
             // If only one qualifier is written out, we might look at a schema, a table, or an alias.
             (None, Some(qualifier)) => {
                 if self.get_schema_name().is_some_and(|s| s == qualifier) {
                     self.get_table_name()
                         .map(|t| format!("{}.{}", t, name))
-                        .unwrap_or(name)
+                        .unwrap_or(name.clone())
                 } else if self.get_table_name().is_some_and(|t| t == qualifier) {
-                    name
+                    name.clone()
                 } else if ctx
                     .get_mentioned_table_for_alias(&qualifier)
                     .is_some_and(|alias_tbl| {
                         self.get_table_name()
                             .is_some_and(|item_tbl| alias_tbl == item_tbl)
                     })
                 {
-                    name
+                    name.clone()
                 } else {
                     // the qualifier does not match schema, table, or alias.
                     // what the hell is it?
@@ -102,10 +101,6 @@ impl CompletionScore<'_> {
             content.to_ascii_lowercase().as_str(),
         ) {
             Some(score) => {
-                if is_case {
-                    println!("check {}, score {}", check_against, score);
-                }
-
                 let scorei32: i32 = score
                     .try_into()
                     .expect("The length of the input exceeds i32 capacity");
@@ -116,7 +111,11 @@ impl CompletionScore<'_> {
                 // - item: numeric_uplus, input: n, score: 31
                 // - item: settings, input: sett, score: 91
                 // - item: user_settings, input: sett, score: 82
-                self.score += scorei32 / 2;
+                self.score += if check_against == name {
+                    scorei32 / 2
+                } else {
+                    scorei32 / 3
+                };
             }
             None => self.skip = true,
         }

crates/pgls_completions/src/sanitization.rs

@@ -26,7 +26,8 @@ pub(crate) fn remove_sanitized_token(it: &str) -> String {
 }
 
 pub(crate) fn is_sanitized_token(node_under_cursor_txt: &str) -> bool {
-    node_under_cursor_txt == SANITIZED_TOKEN || is_sanitized_token_with_quote(node_under_cursor_txt)
+    node_under_cursor_txt.replace('"', "") == SANITIZED_TOKEN
+        || is_sanitized_token_with_quote(node_under_cursor_txt)
 }
 
 pub(crate) fn is_sanitized_token_with_quote(node_under_cursor_txt: &str) -> bool {

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_in_join_on_clause.snap

@@ -56,16 +56,6 @@ user_id - auth.posts.user_id (Column)
 --------------
 
 select u.id, auth.posts.content from auth.users u join auth.posts p on p.user_id |
-
-Results:
-p.pid - auth.posts.pid (Column)
-u.uid - auth.users.uid (Column)
-p.content - auth.posts.content (Column)
-p.created_at - auth.posts.created_at (Column)
-u.email - auth.users.email (Column)
-
---------------
-
 select u.id, auth.posts.content from auth.users u join auth.posts p on p.user_id = |
 
 Results:

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_quoted_columns_with_aliases.snap

@@ -92,7 +92,7 @@ public - public (Schema)
 private - private (Schema)
 names - public.names (Table)
 private.users - private.users (Table)
-information_schema.parameters - information_schema.parameters (Table)
+pg_catalog - pg_catalog (Schema)
 
 --------------
 
@@ -159,9 +159,9 @@ select "e|" from private.users "pr"
 
 Results:
 pr"."email - private.users.email (Column)
+pr"."id - private.users.id (Column)
 pr"."name - private.users.name (Column)
 pr"."quoted_column - private.users.quoted_column (Column)
-pr"."id - private.users.id (Column)
 name - public.names.name (Column)
 
 --------------
@@ -232,7 +232,6 @@ Results:
 email - private.users.email (Column)
 name - private.users.name (Column)
 quoted_column - private.users.quoted_column (Column)
-id - private.users.id (Column)
 
 --------------
 
@@ -324,7 +323,6 @@ Results:
 email - private.users.email (Column)
 name - private.users.name (Column)
 quoted_column - private.users.quoted_column (Column)
-id - private.users.id (Column)
 
 --------------
 
@@ -375,7 +373,6 @@ Results:
 email - private.users.email (Column)
 name - private.users.name (Column)
 quoted_column - private.users.quoted_column (Column)
-id - private.users.id (Column)
 
 --------------
 
@@ -447,7 +444,6 @@ Results:
 email - private.users.email (Column)
 name - private.users.name (Column)
 quoted_column - private.users.quoted_column (Column)
-id - private.users.id (Column)
 
 --------------
 
@@ -474,7 +470,6 @@ select "pr"."email", n.u| from private.users "pr" join public.names n on pr.id =
 
 Results:
 uid - public.names.uid (Column)
-name - public.names.name (Column)
 
 --------------
 

crates/pgls_completions/src/test_helper.rs

@@ -205,6 +205,8 @@ pub(crate) async fn assert_no_complete_results(query: &str, setup: Option<&str>,
     let params = get_test_params(&tree, &cache, query.into());
     let items = complete(params);
 
+    println!("Items: {:#?}", &items[..3]);
+
     assert_eq!(items.len(), 0)
 }