separate for different type

Author: kiddos

src/basecode_lsp/backend.rs

@@ -118,21 +118,19 @@ impl LanguageServer for Backend {
 
             let trie_lock = self.trie.lock().await;
             let words = trie_lock.suggest_completions(&prefix);
-            let mut all_words = words;
+            let suffixes = get_possible_current_word(&current_line, position.character as i32);
+            words_to_completion_items(words, &suffixes, &mut completions, CompletionItemKind::TEXT);
 
             let tmux_words = self.prepare_tmux_words().await;
-            all_words.extend(tmux_words);
+            words_to_completion_items(tmux_words, &suffixes, &mut completions, CompletionItemKind::REFERENCE);
 
             if self.lsp_args.command_source {
-                let command_words = get_command_completions();
-                all_words.extend(command_words);
+                let mut command_words = get_command_completions();
+                command_words.sort();
+                command_words.dedup();
+                words_to_completion_items(command_words, &suffixes, &mut completions, CompletionItemKind::KEYWORD);
             }
 
-            let suffixes = get_possible_current_word(&current_line, position.character as i32);
-            all_words.sort();
-            all_words.dedup();
-            words_to_completion_items(all_words, &suffixes, &mut completions);
-
             let file_uri = params.text_document_position.text_document.uri.to_string();
             let snippets = self.suggest_snippets(&file_uri, &prefix).await;
             snippets_to_completion_items(snippets, &mut completions);
@@ -209,7 +207,7 @@ impl Backend {
 
     async fn maybe_update_tmux(&self) {
         if self.lsp_args.tmux_source {
-            let tmux_content = retrieve_tmux_words();
+            let tmux_content = retrieve_tmux_words(self.lsp_args.min_word_len);
             let mut data = self.tmux_source.lock().await;
             data.clear();
             data.extend(tmux_content);

src/basecode_lsp/tmux.rs

@@ -1,5 +1,6 @@
 use regex::Regex;
 use std::process::Command;
+use super::util::*;
 
 fn is_tmux_executable() -> bool {
     let output = Command::new("tmux").arg("-V").output();
@@ -53,7 +54,7 @@ fn capture_alphanumeric_sequences(input: &str) -> Vec<String> {
         .collect()
 }
 
-pub fn retrieve_tmux_words() -> Vec<String> {
+pub fn retrieve_tmux_words(min_len: usize) -> Vec<String> {
     if !is_tmux_executable() {
         return Vec::new();
     }
@@ -68,7 +69,7 @@ pub fn retrieve_tmux_words() -> Vec<String> {
 
     result = result
         .into_iter()
-        .filter(|s| s.len() >= 3 && !s.chars().all(|c| c.is_numeric())) // Filters out numbers and strings shorter than 3 characters
+        .filter(|s| is_token(&s.chars().collect(), min_len))
         .collect();
     result.sort();
     result.dedup();

src/basecode_lsp/util.rs

@@ -75,13 +75,14 @@ pub fn words_to_completion_items(
     words: Vec<String>,
     suffixes: &Vec<String>,
     completions: &mut Vec<CompletionItem>,
+    kind: CompletionItemKind,
 ) {
     let items: Vec<CompletionItem> = words
         .iter()
         .filter(|&word| !suffixes.contains(word))
         .map(|word| CompletionItem {
             label: word.clone(),
-            kind: Some(CompletionItemKind::TEXT),
+            kind: Some(kind),
             sort_text: Some(word.clone()),
             ..CompletionItem::default()
         })