commitered

Author: juleswritescode

crates/pgls_completions/src/providers/columns.rs

@@ -53,7 +53,7 @@ mod tests {
     use pgls_test_utils::QueryWithCursorPosition;
     use sqlx::PgPool;
 
-    use crate::test_helper::{TestCompletionsCase, TestCompletionsSuite, assert_complete_results};
+    use crate::test_helper::{TestCompletionsCase, TestCompletionsSuite};
 
     #[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
     async fn handles_nested_queries(pool: PgPool) {
@@ -440,9 +440,9 @@ mod tests {
                         "select name from instruments i join others o on i.z = o.a <sql>",
                     )
                     .type_sql("where o.<1>a = <2>i.z and <3>i.id > 5;")
-                .comment("should respect alias speciifcation")
-                .comment("should not prioritize suggest columns or schemas (right side of binary expression)")
-                .comment("should prioritize columns that aren't already mentioned")
+                    .comment("should respect alias speciifcation")
+                    .comment("should not prioritize suggest columns or schemas (right side of binary expression)")
+                    .comment("should prioritize columns that aren't already mentioned"),
             )
             .snapshot("suggests_columns_in_where_clause")
             .await;

crates/pgls_completions/src/relevance/filtering.rs

@@ -1,7 +1,6 @@
 use pgls_schema_cache::ProcKind;
 use pgls_treesitter::context::{TreesitterContext, WrappingClause, WrappingNode};
 
-use crate::is_sanitized_token;
 
 use super::CompletionRelevanceData;
 
@@ -117,7 +116,8 @@ impl CompletionFilter<'_> {
                         "column_reference_1of1",
                         "column_reference_2of2",
                         "column_reference_3of3",
-                    ]) && !ctx.node_under_cursor_is_within_field(&["binary_expr_right"])
+                    ]) && (!ctx.node_under_cursor_is_within_field(&["binary_expr_right"])
+                        || ctx.has_any_qualifier())
                 }
 
                 CompletionRelevanceData::Schema(_) => ctx.node_under_cursor_is_within_field(&[

crates/pgls_completions/src/relevance/scoring.rs

@@ -1,6 +1,6 @@
 use fuzzy_matcher::{FuzzyMatcher, skim::SkimMatcherV2};
 
-use pgls_treesitter::context::{TreesitterContext, WrappingClause, WrappingNode};
+use pgls_treesitter::context::{TreesitterContext, WrappingClause};
 
 use crate::sanitization;
 

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_where_clause.snap

@@ -57,6 +57,15 @@ pg_catalog - pg_catalog (Schema)
 --------------
 
 select name from instruments i join others o on i.z = o.a where o.a = i.|
+
+Results:
+created_at - public.instruments.created_at (Column)
+id - public.instruments.id (Column)
+name - public.instruments.name (Column)
+z - public.instruments.z (Column)
+
+--------------
+
 select name from instruments i join others o on i.z = o.a where o.a = i.z |
 select name from instruments i join others o on i.z = o.a where o.a = i.z a|
 select name from instruments i join others o on i.z = o.a where o.a = i.z and |
@@ -72,7 +81,22 @@ i.name - public.instruments.name (Column)
 --------------
 
 select name from instruments i join others o on i.z = o.a where o.a = i.z and i.|
+
+Results:
+created_at - public.instruments.created_at (Column)
+id - public.instruments.id (Column)
+name - public.instruments.name (Column)
+z - public.instruments.z (Column)
+
+--------------
+
 select name from instruments i join others o on i.z = o.a where o.a = i.z and i.i|
+
+Results:
+id - public.instruments.id (Column)
+
+--------------
+
 select name from instruments i join others o on i.z = o.a where o.a = i.z and i.id |
 select name from instruments i join others o on i.z = o.a where o.a = i.z and i.id > |
 

crates/pgls_treesitter/src/context/mod.rs

@@ -382,7 +382,7 @@ impl<'a> TreesitterContext<'a> {
         {
             // if the cursor is exactly at the start of a punctuation node,
             // prefer the previous sibling (e.g., when cursor is at "i|," prefer "i" over ",")
-            let is_punctuation = matches!(current_node.kind(), "," | ")" | ";");
+            let is_punctuation = matches!(current_node.kind(), "," | ")");
             if is_punctuation && current_node.start_byte() == self.position {
                 if let Some(prev) = current_node.prev_sibling() {
                     if prev.end_byte() == self.position {