completion: optimize

Author: xuhuanzy

crates/emmylua_ls/src/handlers/completion/providers/env_provider.rs

@@ -1,7 +1,8 @@
 use std::collections::HashSet;
 
 use emmylua_code_analysis::{LuaFlowId, LuaType};
-use emmylua_parser::{LuaAst, LuaAstNode};
+use emmylua_parser::{LuaAst, LuaAstNode, LuaCallArgList};
+use lsp_types::CompletionTriggerKind;
 
 use crate::handlers::completion::{
     add_completions::{add_decl_completion, check_match_word},
@@ -12,6 +13,11 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
     if builder.is_cancelled() {
         return None;
     }
+
+    if allow_add_env_completion(builder).is_none() {
+        return Some(());
+    }
+
     let node = LuaAst::cast(builder.trigger_token.parent()?)?;
     match node {
         LuaAst::LuaNameExpr(_) => {}
@@ -33,6 +39,24 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
     Some(())
 }
 
+fn allow_add_env_completion(builder: &CompletionBuilder) -> Option<()> {
+    if builder.trigger_kind == CompletionTriggerKind::TRIGGER_CHARACTER {
+        let trigger_text = builder.get_trigger_text();
+        // 由字符触发的空格补全不允许添加
+        if trigger_text.is_empty() {
+            return None;
+        }
+        // 如果触发字符是`(`且位于`CallArgList`中, 那么不允许添加
+        if trigger_text == "("
+            && LuaCallArgList::can_cast(builder.trigger_token.parent()?.kind().into())
+        {
+            return None;
+        }
+    }
+
+    Some(())
+}
+
 fn add_local_env(
     builder: &mut CompletionBuilder,
     duplicated_name: &mut HashSet<String>,

crates/emmylua_ls/src/handlers/completion/providers/mod.rs

@@ -11,35 +11,25 @@ mod postfix_provider;
 mod table_field_provider;
 mod type_special_provider;
 
-use emmylua_parser::{LuaAst, LuaAstNode, LuaAstToken, LuaStringToken};
-use lsp_types::CompletionTriggerKind;
+use emmylua_parser::LuaAstToken;
+use emmylua_parser::LuaStringToken;
 use rowan::TextRange;
 
 use super::completion_builder::CompletionBuilder;
 
 pub fn add_completions(builder: &mut CompletionBuilder) -> Option<()> {
-    // 空格补全只允许位于函数调用参数列表时非主动触发
-    if is_space_completion(builder).is_some() {
-        match LuaAst::cast(builder.trigger_token.parent()?)? {
-            LuaAst::LuaCallArgList(_) => {
-                type_special_provider::add_completion(builder);
-                return Some(());
-            }
-            _ => return Some(()),
-        }
-    }
-
     postfix_provider::add_completion(builder);
+    // `type_special_provider`优先级必须高于`env_provider`
     type_special_provider::add_completion(builder);
-    // `env_provider` 在某些情况下是不需要的, 但有些补全功能依赖于他, 因在一些补全中可能会移除掉`env_provider` 的补全.
+    // `env_provider`在某些情况下是不需要的, 但有些补全功能依赖于他, 因此我们先添加`env_provider`的补全, 再在某些补全中移除掉他的补全.
     // 目前可能移除掉他的补全为: `table_field_provider`
     env_provider::add_completion(builder);
     // 只有具有类型定义的表才会成功返回, 此时我们不需要处理其他补全
     if table_field_provider::add_completion(builder).is_some() {
         return Some(());
     }
-    member_provider::add_completion(builder);
     keywords_provider::add_completion(builder);
+    member_provider::add_completion(builder);
 
     module_path_provider::add_completion(builder);
     file_path_provider::add_completion(builder);
@@ -53,21 +43,10 @@ pub fn add_completions(builder: &mut CompletionBuilder) -> Option<()> {
             item.sort_text = Some(format!("{:04}", index + 1));
         }
     }
-    // dbg!(&builder.get_completion_items_mut());
 
     Some(())
 }
 
-fn is_space_completion(builder: &CompletionBuilder) -> Option<()> {
-    if builder.get_trigger_text().is_empty()
-        && builder.trigger_kind == CompletionTriggerKind::TRIGGER_CHARACTER
-    {
-        Some(())
-    } else {
-        None
-    }
-}
-
 fn get_text_edit_range_in_string(
     builder: &mut CompletionBuilder,
     string_token: LuaStringToken,

crates/emmylua_ls/src/handlers/completion/providers/type_special_provider.rs

@@ -3,8 +3,8 @@ use emmylua_code_analysis::{
     LuaPropertyOwnerId, LuaType, LuaTypeDeclId, LuaUnionType, RenderLevel,
 };
 use emmylua_parser::{
-    LuaAst, LuaAstNode, LuaAstToken, LuaCallArgList, LuaCallExpr, LuaComment, LuaExpr,
-    LuaNameToken, LuaSyntaxId, LuaSyntaxKind, LuaSyntaxToken, LuaTokenKind, LuaVarExpr,
+    LuaAst, LuaAstNode, LuaAstToken, LuaCallArgList, LuaCallExpr, LuaComment, LuaNameToken,
+    LuaSyntaxId, LuaSyntaxKind, LuaSyntaxToken, LuaTokenKind, LuaVarExpr,
 };
 use itertools::Itertools;
 use lsp_types::{CompletionItem, Documentation};
@@ -159,10 +159,10 @@ fn add_string_completion(builder: &mut CompletionBuilder, str: &str) -> Option<(
 
 fn get_token_should_type(builder: &mut CompletionBuilder) -> Option<Vec<LuaType>> {
     let token = builder.trigger_token.clone();
-    let mut parent_node = token.parent()?;
-    if LuaExpr::can_cast(parent_node.kind().into()) {
-        parent_node = parent_node.parent()?;
-    }
+    let parent_node = token.parent()?;
+    // if LuaExpr::can_cast(parent_node.kind().into()) {
+    //     parent_node = parent_node.parent()?;
+    // }
 
     match parent_node.kind().into() {
         LuaSyntaxKind::CallArgList => {