many fixings

Author: juleswritescode

crates/pgls_completions/src/builder.rs

@@ -2,6 +2,7 @@ use crate::{
     CompletionItemKind, CompletionText,
     item::CompletionItem,
     relevance::{filtering::CompletionFilter, scoring::CompletionScore},
+    sanitization,
 };
 
 use pgls_treesitter::TreesitterContext;
@@ -24,6 +25,12 @@ pub(crate) struct CompletionBuilder<'a> {
 
 impl<'a> CompletionBuilder<'a> {
     pub fn new(ctx: &'a TreesitterContext) -> Self {
+        println!(
+            "is sanitized: {:#?}",
+            ctx.get_node_under_cursor_content()
+                .map(|txt| sanitization::is_sanitized_token(txt.as_str()))
+        );
+
         CompletionBuilder { items: vec![], ctx }
     }
 
@@ -42,6 +49,11 @@ impl<'a> CompletionBuilder<'a> {
             item.score.calc_score(self.ctx);
         }
 
+        items = items
+            .into_iter()
+            .filter(|i| !i.score.should_skip())
+            .collect();
+
         items.sort_by(|a, b| {
             b.score
                 .get_score()

crates/pgls_completions/src/providers/columns.rs

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

crates/pgls_completions/src/relevance/scoring.rs

@@ -9,19 +9,25 @@ use super::CompletionRelevanceData;
 #[derive(Debug)]
 pub(crate) struct CompletionScore<'a> {
     score: i32,
+    skip: bool,
     data: CompletionRelevanceData<'a>,
 }
 
 impl<'a> From<CompletionRelevanceData<'a>> for CompletionScore<'a> {
     fn from(value: CompletionRelevanceData<'a>) -> Self {
         Self {
             score: 0,
+            skip: false,
             data: value,
         }
     }
 }
 
 impl CompletionScore<'_> {
+    pub fn should_skip(&self) -> bool {
+        self.skip
+    }
+
     pub fn get_score(&self) -> i32 {
         self.score
     }
@@ -55,20 +61,35 @@ impl CompletionScore<'_> {
 
         let fz_matcher = SkimMatcherV2::default();
 
-        if let Some(score) =
-            fz_matcher.fuzzy_match(name.as_str(), content.to_ascii_lowercase().as_str())
-        {
-            let scorei32: i32 = score
-                .try_into()
-                .expect("The length of the input exceeds i32 capacity");
-
-            // the scoring value isn't linear.
-            // here are a couple of samples:
-            // - item: bytea_string_agg_transfn, input: n, score: 15
-            // - item: numeric_uplus, input: n, score: 31
-            // - item: settings, input: sett, score: 91
-            // - item: user_settings, input: sett, score: 82
-            self.score += scorei32 / 2;
+        let check_against = match ctx.identifier_qualifiers {
+            // If both qualifiers are already written out, we must check the item's name itself.
+            (Some(_), Some(_)) => content.to_ascii_lowercase(),
+
+            _ => self
+                .get_table_name()
+                .and_then(|tbl| ctx.get_used_alias_for_table(tbl))
+                .map(|alias| format!("{}.{}", alias, name))
+                .unwrap_or(name),
+        };
+
+        match fz_matcher.fuzzy_match(
+            check_against.as_str(),
+            content.to_ascii_lowercase().as_str(),
+        ) {
+            Some(score) => {
+                let scorei32: i32 = score
+                    .try_into()
+                    .expect("The length of the input exceeds i32 capacity");
+
+                // the scoring value isn't linear.
+                // here are a couple of samples:
+                // - item: bytea_string_agg_transfn, input: n, score: 15
+                // - item: numeric_uplus, input: n, score: 31
+                // - item: settings, input: sett, score: 91
+                // - item: user_settings, input: sett, score: 82
+                self.score += scorei32 / 2;
+            }
+            None => self.skip = true,
         }
     }
 

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_in_join_on_clause.snap

@@ -52,10 +52,6 @@ select u.id, auth.posts.content from auth.users u join auth.posts p on p.u|
 
 Results:
 user_id - auth.posts.user_id (Column)
-pid - auth.posts.pid (Column)
-content - auth.posts.content (Column)
-created_at - auth.posts.created_at (Column)
-title - auth.posts.title (Column)
 
 --------------
 
@@ -96,8 +92,6 @@ select u.id, auth.posts.content from auth.users u join auth.posts p on p.user_id
 
 Results:
 uid - auth.users.uid (Column)
-email - auth.users.email (Column)
-name - auth.users.name (Column)
 
 --------------
 

crates/pgls_treesitter/src/context/mod.rs

@@ -153,6 +153,8 @@ impl<'a> TreesitterContext<'a> {
         ctx.gather_tree_context();
         ctx.gather_info_from_ts_queries();
 
+        println!("{} {:#?}", ctx.text, ctx.get_node_under_cursor_content(),);
+
         ctx
     }
 

todo.txt

@@ -0,0 +1,22 @@
+
+#### Snapshot review
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_in_join_on_clause.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_quoted_columns_with_aliases.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_quoted_columns.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__does_not_complete_cols_in_join_clauses.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__filters_out_by_aliases_in_join_on.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__filters_out_by_aliases_in_select.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__handles_nested_queries.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__ignores_cols_in_from_clause.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__prefers_columns_of_mentioned_tables.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__prefers_not_mentioned_columns.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__shows_multiple_columns_if_no_relation_specified.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_alter_table_and_drop_table.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_insert_clause.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_where_clause.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_policy_using_clause.snap
+- [ ] crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_relevant_columns_without_letters.snap
+
+#### General Todos
+- [ ] Should filter out any items where typed letters don't match at all
+- [ ]