hell yeah

Author: juleswritescode

crates/pgt_completions/src/providers/tables.rs

@@ -73,15 +73,14 @@ mod tests {
         "#;
 
         let test_cases = vec![
-            // (format!("select * from us{}", CURSOR_POS), "users"),
-            // (format!("select * from em{}", CURSOR_POS), "emails"),
-            (format!("select * from {}", CURSOR_POS), "addresses"),
+            (format!("select * from u{}", CURSOR_POS), "users"),
+            (format!("select * from e{}", CURSOR_POS), "emails"),
+            (format!("select * from a{}", CURSOR_POS), "addresses"),
         ];
 
         for (query, expected_label) in test_cases {
             let (tree, cache) = get_test_deps(setup, query.as_str().into()).await;
             let params = get_test_params(&tree, &cache, query.as_str().into());
-            println!("{}, {}", &params.text, &params.position);
             let items = complete(params);
 
             assert!(!items.is_empty());

crates/pgt_completions/src/sanitization.rs

@@ -25,6 +25,7 @@ where
 
         if cursor_inbetween_nodes(tree, params.position)
             || cursor_prepared_to_write_token_after_last_node(tree, params.position)
+            || cursor_before_semicolon(tree, params.position)
         {
             Ok(SanitizedCompletionParams::with_adjusted_sql(params))
         } else {
@@ -134,7 +135,7 @@ fn cursor_prepared_to_write_token_after_last_node(
     cursor_pos == tree.root_node().end_byte() + 1
 }
 
-fn cursor_before_or_on_semicolon(tree: &tree_sitter::Tree, position: TextSize) -> bool {
+fn cursor_before_semicolon(tree: &tree_sitter::Tree, position: TextSize) -> bool {
     let mut cursor = tree.walk();
     let mut leaf_node = tree.root_node();
 
@@ -183,7 +184,7 @@ mod tests {
     use pgt_text_size::TextSize;
 
     use crate::sanitization::{
-        cursor_before_or_on_semicolon, cursor_inbetween_nodes,
+        cursor_before_semicolon, cursor_inbetween_nodes,
         cursor_prepared_to_write_token_after_last_node,
     };
 
@@ -262,23 +263,23 @@ mod tests {
         let mut tree = parser.parse(input.to_string(), None).unwrap();
 
         // select * from     ;| <-- it's after the statement
-        assert!(!cursor_before_or_on_semicolon(&mut tree, TextSize::new(19)));
+        assert!(!cursor_before_semicolon(&mut tree, TextSize::new(19)));
 
         // select * from|    ; <-- still touches the from
-        assert!(!cursor_before_or_on_semicolon(&mut tree, TextSize::new(13)));
+        assert!(!cursor_before_semicolon(&mut tree, TextSize::new(13)));
 
         // not okay to be ON the semi.
         // select * from     |;
-        assert!(!cursor_before_or_on_semicolon(&mut tree, TextSize::new(18)));
+        assert!(!cursor_before_semicolon(&mut tree, TextSize::new(18)));
 
         // anything is fine here
         // select * from |   ;
         // select * from  |  ;
         // select * from   | ;
         // select * from    |;
-        assert!(cursor_before_or_on_semicolon(&mut tree, TextSize::new(14)));
-        assert!(cursor_before_or_on_semicolon(&mut tree, TextSize::new(15)));
-        assert!(cursor_before_or_on_semicolon(&mut tree, TextSize::new(16)));
-        assert!(cursor_before_or_on_semicolon(&mut tree, TextSize::new(17)));
+        assert!(cursor_before_semicolon(&mut tree, TextSize::new(14)));
+        assert!(cursor_before_semicolon(&mut tree, TextSize::new(15)));
+        assert!(cursor_before_semicolon(&mut tree, TextSize::new(16)));
+        assert!(cursor_before_semicolon(&mut tree, TextSize::new(17)));
     }
 }

crates/pgt_completions/src/test_helper.rs

@@ -15,11 +15,8 @@ impl From<&str> for InputQuery {
     fn from(value: &str) -> Self {
         let position = value
             .find(CURSOR_POS)
-            .map(|p| p.saturating_add(1))
             .expect("Insert Cursor Position into your Query.");
 
-        println!("{}", position);
-
         InputQuery {
             sql: value.replace(CURSOR_POS, ""),
             position,
@@ -76,3 +73,43 @@ pub(crate) fn get_test_params<'a>(
         text,
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::test_helper::CURSOR_POS;
+
+    use super::InputQuery;
+
+    #[test]
+    fn input_query_should_extract_correct_position() {
+        struct TestCase {
+            query: String,
+            expected_pos: usize,
+            expected_sql_len: usize,
+        }
+
+        let cases = vec![
+            TestCase {
+                query: format!("select * from{}", CURSOR_POS),
+                expected_pos: 13,
+                expected_sql_len: 13,
+            },
+            TestCase {
+                query: format!("{}select * from", CURSOR_POS),
+                expected_pos: 0,
+                expected_sql_len: 13,
+            },
+            TestCase {
+                query: format!("select {} from", CURSOR_POS),
+                expected_pos: 7,
+                expected_sql_len: 12,
+            },
+        ];
+
+        for case in cases {
+            let query = InputQuery::from(case.query.as_str());
+            assert_eq!(query.position, case.expected_pos);
+            assert_eq!(query.sql.len(), case.expected_sql_len);
+        }
+    }
+}