fix: algorithm handles treesitter error nodes

Author: juleswritescode

crates/pg_completions/src/context.rs

@@ -91,6 +91,9 @@ impl<'a> CompletionContext<'a> {
         // go to the statement node that matches the position
         let current_node_kind = cursor.node().kind();
 
+        dbg!(current_node_kind);
+        dbg!(self.position);
+
         cursor.goto_first_child_for_byte(self.position);
 
         self.gather_context_from_node(cursor, current_node_kind);
@@ -104,6 +107,14 @@ impl<'a> CompletionContext<'a> {
         let current_node = cursor.node();
         let current_node_kind = current_node.kind();
 
+        println!("inside..");
+        dbg!(current_node_kind);
+
+        if current_node_kind == previous_node_kind {
+            self.ts_node = Some(current_node);
+            return;
+        }
+
         match previous_node_kind {
             "statement" => self.wrapping_clause_type = current_node_kind.try_into().ok(),
             "invocation" => self.is_invocation = true,
@@ -267,4 +278,29 @@ mod tests {
             assert_eq!(ctx.is_invocation, is_invocation);
         }
     }
+
+    #[test]
+    fn get_ts_node_content_does_not_fail_on_error_nodes() {
+        let query = format!("select * from {}", CURSOR_POS);
+
+        let position = query.find(CURSOR_POS).unwrap();
+        let text = query.replace(CURSOR_POS, "");
+
+        let tree = get_tree(text.as_str());
+
+        let params = crate::CompletionParams {
+            position: (position as u32).into(),
+            text: text,
+            tree: Some(&tree),
+            schema: &pg_schema_cache::SchemaCache::new(),
+        };
+
+        let ctx = CompletionContext::new(&params);
+
+        let node = ctx.ts_node.map(|n| n.clone());
+
+        println!("node kind: {}", node.as_ref().unwrap().kind());
+
+        ctx.get_ts_node_content(node.unwrap());
+    }
 }

crates/pg_completions/src/providers/tables.rs

@@ -76,7 +76,7 @@ mod tests {
             (format!("select * from us{}", CURSOR_POS), "users"),
             (format!("select * from em{}", CURSOR_POS), "emails"),
             // TODO: Fix queries with tree-sitter errors.
-            // (format!("select * from {}", CURSOR_POS), "addresses"),
+            (format!("select * from {}", CURSOR_POS), "addresses"),
         ];
 
         for (query, expected_label) in test_cases {

crates/pg_test_utils/src/bin/tree_print.rs

@@ -29,7 +29,13 @@ fn main() {
 
 fn print_tree(node: &tree_sitter::Node, source: &str, level: usize) {
     let indent = "  ".repeat(level);
-    let node_text = node.utf8_text(source.as_bytes()).unwrap_or("NO_NAME");
+
+    let node_text = node
+        .utf8_text(source.as_bytes())
+        .unwrap_or("NO_NAME")
+        .split_whitespace()
+        .collect::<Vec<&str>>()
+        .join(" ");
 
     println!(
         "{}{} [{}..{}] '{}'",

justfile

@@ -130,6 +130,10 @@ new-crate name:
   cargo new --lib crates/{{snakecase(name)}}
   cargo run -p xtask_codegen -- new-crate --name={{snakecase(name)}}
 
+# Prints the treesitter tree of the given SQL file
+print-tree file:
+	cargo run --bin tree_print -- -f {{file}}
+
 # Creates a new changeset for the final changelog
 # new-changeset:
 #     knope document-change