this is gret

Author: juleswritescode

crates/pgls_completions/src/providers/columns.rs

@@ -50,9 +50,10 @@ 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};
 
     #[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
     async fn handles_nested_queries(pool: PgPool) {

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_insert_clause.snap

@@ -267,6 +267,16 @@ b - public.others.b (Column)
 --------------
 
 insert into instruments (i|, name) values ('my_bass');
+
+Results:
+id - public.instruments.id (Column)
+ident - pg_catalog.pg_backend_memory_contexts.ident (Column)
+identity_cycle - information_schema.columns.identity_cycle (Column)
+identity_generation - information_schema.columns.identity_generation (Column)
+identity_increment - information_schema.columns.identity_increment (Column)
+
+--------------
+
 insert into instruments (id, |, name) values ('my_bass');
 **`name` is already written, so z should be suggested.**
 

crates/pgls_treesitter/src/context/mod.rs

@@ -153,7 +153,11 @@ impl<'a> TreesitterContext<'a> {
         ctx.gather_tree_context();
         ctx.gather_info_from_ts_queries();
 
-        println!("{} {:#?}", ctx.text, ctx.get_node_under_cursor_content(),);
+        println!("TreesitterContext: {:#?}", ctx);
+        println!(
+            "NodeUnderCursor: {:#?}",
+            ctx.get_node_under_cursor_content()
+        );
 
         ctx
     }
@@ -359,6 +363,10 @@ impl<'a> TreesitterContext<'a> {
                 }
             }
 
+            "insert_columns" => {
+                self.wrapping_node_kind = Some(WrappingNode::List);
+            }
+
             _ => {
                 if let Some(clause_type) =
                     self.get_wrapping_clause_from_current_node(current_node, &mut cursor)
@@ -372,6 +380,17 @@ impl<'a> TreesitterContext<'a> {
         if current_node.child_count() == 0
             || current_node.first_child_for_byte(self.position).is_none()
         {
+            // 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(), "," | ")" | ";");
+            if is_punctuation && current_node.start_byte() == self.position {
+                if let Some(prev) = current_node.prev_sibling() {
+                    if prev.end_byte() == self.position {
+                        self.node_under_cursor = prev;
+                        return;
+                    }
+                }
+            }
             self.node_under_cursor = current_node;
             return;
         }