ok

Author: juleswritescode

crates/pgt_completions/src/providers/schemas.rs

@@ -25,7 +25,7 @@ pub fn complete_schemas(ctx: &CompletionContext, builder: &mut CompletionBuilder
 mod tests {
 
     use crate::{
-        CompletionItem, CompletionItemKind, complete,
+        CompletionItemKind, complete,
         test_helper::{CURSOR_POS, get_test_deps, get_test_params},
     };
 
@@ -35,6 +35,13 @@ mod tests {
             create schema private;
             create schema auth;
             create schema internal;
+
+            -- add a table to compete against schemas
+            create table users (
+                id serial primary key,
+                name text,
+                password text
+            );
         "#;
 
         let query = format!("select * from {}", CURSOR_POS);
@@ -45,24 +52,18 @@ mod tests {
 
         assert!(!items.is_empty());
 
-        for item in items.iter().take(10) {
-            println!(
-                r#""{}", score: {}, kind: {:?}"#,
-                item.label, item.score, item.kind
-            );
-        }
-
         assert_eq!(
             items
                 .into_iter()
-                .take(4)
-                .map(|i| i.label)
-                .collect::<Vec<String>>(),
+                .take(5)
+                .map(|i| (i.label, i.kind))
+                .collect::<Vec<(String, CompletionItemKind)>>(),
             vec![
-                "public".to_string(), // public always preferred
-                "auth".to_string(),
-                "internal".to_string(),
-                "private".to_string()
+                ("public".to_string(), CompletionItemKind::Schema),
+                ("auth".to_string(), CompletionItemKind::Schema),
+                ("internal".to_string(), CompletionItemKind::Schema),
+                ("private".to_string(), CompletionItemKind::Schema),
+                ("users".to_string(), CompletionItemKind::Table),
             ]
         );
     }

crates/pgt_completions/src/relevance.rs

@@ -100,7 +100,7 @@ impl CompletionRelevance<'_> {
                 _ => -15,
             },
             CompletionRelevanceData::Schema(_) => match clause_type {
-                ClauseType::From => 15,
+                ClauseType::From => 10,
                 _ => -50,
             },
         }

crates/pgt_completions/src/sanitization.rs

@@ -42,12 +42,28 @@ where
         let cursor_pos: usize = params.position.into();
         let mut sql = String::new();
 
-        for (idx, c) in params.text.chars().enumerate() {
-            if idx == cursor_pos {
-                sql.push_str(SANITIZED_TOKEN);
-                sql.push(' ');
+        let mut sql_iter = params.text.chars();
+
+        for idx in 0..cursor_pos + 1 {
+            match sql_iter.next() {
+                Some(c) => {
+                    if idx == cursor_pos {
+                        sql.push_str(SANITIZED_TOKEN);
+                        sql.push(' ');
+                    }
+                    sql.push(c);
+                }
+                None => {
+                    // the cursor is outside the statement,
+                    // we want to push spaces until we arrive at the cursor position.
+                    // we'll then add the SANITIZED_TOKEN
+                    if idx == cursor_pos {
+                        sql.push_str(SANITIZED_TOKEN);
+                    } else {
+                        sql.push(' ');
+                    }
+                }
             }
-            sql.push(c);
         }
 
         let mut parser = tree_sitter::Parser::new();
@@ -213,7 +229,7 @@ mod tests {
 
     #[test]
     fn test_cursor_after_nodes() {
-        let input = "select * from ";
+        let input = "select * from";
 
         let mut parser = tree_sitter::Parser::new();
         parser

crates/pgt_completions/src/test_helper.rs

@@ -18,7 +18,7 @@ impl From<&str> for InputQuery {
             .expect("Insert Cursor Position into your Query.");
 
         InputQuery {
-            sql: value.replace(CURSOR_POS, ""),
+            sql: value.replace(CURSOR_POS, "").trim().to_string(),
             position,
         }
     }