revert things

Author: juleswritescode

crates/pgt_completions/src/item.rs

@@ -1,5 +1,3 @@
-use std::fmt::Display;
-
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -12,23 +10,12 @@ pub enum CompletionItemKind {
     Schema,
 }
 
-impl Display for CompletionItemKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            CompletionItemKind::Table => write!(f, "Table"),
-            CompletionItemKind::Function => write!(f, "Function"),
-            CompletionItemKind::Column => write!(f, "Column"),
-            CompletionItemKind::Schema => write!(f, "Schema"),
-        }
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub struct CompletionItem {
     pub label: String,
+    pub(crate) score: i32,
     pub description: String,
     pub preselected: bool,
     pub kind: CompletionItemKind,
-    pub score: i32,
 }

crates/pgt_completions/src/sanitization.rs

@@ -1,4 +1,4 @@
-use std::{borrow::Cow, cmp::max};
+use std::borrow::Cow;
 
 use pgt_text_size::TextSize;
 
@@ -24,7 +24,6 @@ where
         if cursor_inbetween_nodes(params.tree, params.position)
             || cursor_prepared_to_write_token_after_last_node(params.tree, params.position)
             || cursor_before_semicolon(params.tree, params.position)
-            || cursor_on_a_dot(&params.text, params.position)
         {
             SanitizedCompletionParams::with_adjusted_sql(params)
         } else {
@@ -45,13 +44,12 @@ where
 
         let mut sql_iter = params.text.chars();
 
-        let max = max(cursor_pos + 1, params.text.len());
-
-        for idx in 0..max {
+        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);
                 }
@@ -151,11 +149,6 @@ fn cursor_prepared_to_write_token_after_last_node(
     cursor_pos == tree.root_node().end_byte() + 1
 }
 
-fn cursor_on_a_dot(sql: &str, position: TextSize) -> bool {
-    let position: usize = position.into();
-    sql.chars().nth(position - 1).is_some_and(|c| c == '.')
-}
-
 fn cursor_before_semicolon(tree: &tree_sitter::Tree, position: TextSize) -> bool {
     let mut cursor = tree.walk();
     let mut leaf_node = tree.root_node();
@@ -205,7 +198,7 @@ mod tests {
     use pgt_text_size::TextSize;
 
     use crate::sanitization::{
-        cursor_before_semicolon, cursor_inbetween_nodes, cursor_on_a_dot,
+        cursor_before_semicolon, cursor_inbetween_nodes,
         cursor_prepared_to_write_token_after_last_node,
     };
 
@@ -270,20 +263,6 @@ mod tests {
         ));
     }
 
-    #[test]
-    fn on_a_dot() {
-        let input = "select * from private.";
-
-        // select * from private.| <-- on a dot
-        assert!(cursor_on_a_dot(&input, TextSize::new(22)));
-
-        // select * from private|. <-- before the dot
-        assert!(!cursor_on_a_dot(&input, TextSize::new(21)));
-
-        // select * from private. | <-- too far off the dot
-        assert!(!cursor_on_a_dot(&input, TextSize::new(23)));
-    }
-
     #[test]
     fn test_cursor_before_semicolon() {
         // Idx "13" is the exlusive end of `select * from` (first space after from)

crates/pgt_lsp/src/capabilities.rs

@@ -37,7 +37,7 @@ pub(crate) fn server_capabilities(capabilities: &ClientCapabilities) -> ServerCa
             // The request is used to get more information about a simple CompletionItem.
             resolve_provider: None,
 
-            trigger_characters: Some(vec![".".to_owned(), " ".to_owned()]),
+            trigger_characters: Some(vec![".".to_owned(), ",".to_owned(), " ".to_owned()]),
 
             // No character will lead to automatically inserting the selected completion-item
             all_commit_characters: None,

crates/pgt_treesitter_queries/src/lib.rs

@@ -185,31 +185,4 @@ on sq1.id = pt.id;
         assert_eq!(results[0].get_schema(sql), Some("private".into()));
         assert_eq!(results[0].get_table(sql), "something");
     }
-
-    #[test]
-    fn picks_it_up_without_schemas() {
-        let sql = r#"select * from users"#;
-
-        let mut parser = tree_sitter::Parser::new();
-        parser.set_language(tree_sitter_sql::language()).unwrap();
-
-        let tree = parser.parse(sql, None).unwrap();
-
-        // trust me bro
-
-        let mut executor = TreeSitterQueriesExecutor::new(tree.root_node(), sql);
-
-        executor.add_query_results::<RelationMatch>();
-
-        let results: Vec<&RelationMatch> = executor
-            .get_iter(None)
-            .filter_map(|q| q.try_into().ok())
-            .collect();
-
-        println!("{:?}", results);
-
-        assert_eq!(results.len(), 1);
-        assert_eq!(results[0].get_schema(sql), None);
-        assert_eq!(results[0].get_table(sql), "users");
-    }
 }