completion: optimize && add param_list

Author: xuhuanzy

crates/emmylua_code_analysis/src/diagnostic/mod.rs

@@ -4,5 +4,6 @@ mod lua_diagnostic_code;
 mod lua_diagnostic_config;
 mod test;
 
+pub use checker::get_closure_expr_comment;
 pub use lua_diagnostic::LuaDiagnostic;
 pub use lua_diagnostic_code::DiagnosticCode;

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

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use emmylua_code_analysis::{LuaFlowId, LuaType};
-use emmylua_parser::{LuaAst, LuaAstNode, LuaCallArgList};
+use emmylua_parser::{LuaAst, LuaAstNode, LuaCallArgList, LuaParamList};
 use lsp_types::CompletionTriggerKind;
 
 use crate::handlers::completion::{
@@ -40,17 +40,28 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
 }
 
 fn allow_add_env_completion(builder: &CompletionBuilder) -> Option<()> {
+    let trigger_text = builder.get_trigger_text();
     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;
+        let parent = builder.trigger_token.parent()?;
+
+        if trigger_text == "(" {
+            if LuaCallArgList::can_cast(parent.kind().into())
+                || LuaParamList::can_cast(parent.kind().into())
+            {
+                return None;
+            }
+        }
+    } else if builder.trigger_kind == CompletionTriggerKind::INVOKED {
+        let parent = builder.trigger_token.parent()?;
+        // 即时是主动触发, 也不允许在函数定义的参数列表中添加
+        if trigger_text == "(" {
+            if LuaParamList::can_cast(parent.kind().into()) {
+                return None;
+            }
         }
     }
 
@@ -167,8 +178,8 @@ fn add_global_env(
 
 fn env_check_match_word(trigger_text: &str, name: &str) -> bool {
     // 如果首字母是`(`或者`,`则允许, 用于在函数参数调用处触发补全
-    if trigger_text.starts_with('(') || trigger_text.starts_with(',') {
-        return true;
+    match trigger_text.chars().next() {
+        Some('(') | Some(',') => true,
+        _ => check_match_word(trigger_text, name),
     }
-    check_match_word(trigger_text, name)
 }

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

@@ -1,10 +1,12 @@
 use emmylua_code_analysis::{
-    InferGuard, LuaDeclLocation, LuaFunctionType, LuaMember, LuaMemberKey, LuaMemberOwner,
-    LuaMultiLineUnion, LuaPropertyOwnerId, LuaType, LuaTypeDeclId, LuaUnionType, RenderLevel,
+    get_closure_expr_comment, InferGuard, LuaDeclLocation, LuaFunctionType, LuaMember,
+    LuaMemberKey, LuaMemberOwner, LuaMultiLineUnion, LuaPropertyOwnerId, LuaType, LuaTypeDeclId,
+    LuaUnionType, RenderLevel,
 };
 use emmylua_parser::{
-    LuaAst, LuaAstNode, LuaAstToken, LuaCallArgList, LuaCallExpr, LuaComment, LuaNameToken,
-    LuaSyntaxId, LuaSyntaxKind, LuaSyntaxToken, LuaTokenKind, LuaVarExpr,
+    LuaAst, LuaAstNode, LuaAstToken, LuaCallArgList, LuaCallExpr, LuaClosureExpr, LuaComment,
+    LuaDocTagParam, LuaNameToken, LuaParamList, LuaSyntaxId, LuaSyntaxKind, LuaSyntaxToken,
+    LuaTokenKind, LuaVarExpr,
 };
 use itertools::Itertools;
 use lsp_types::{CompletionItem, Documentation};
@@ -168,6 +170,9 @@ fn get_token_should_type(builder: &mut CompletionBuilder) -> Option<Vec<LuaType>
         LuaSyntaxKind::CallArgList => {
             return infer_call_arg_list(builder, LuaCallArgList::cast(parent_node)?, token);
         }
+        LuaSyntaxKind::ParamList => {
+            return infer_param_list(builder, LuaParamList::cast(parent_node)?);
+        }
         LuaSyntaxKind::BinaryExpr => {
             // infer_binary_expr(builder, binary_expr)?;
         }
@@ -177,6 +182,55 @@ fn get_token_should_type(builder: &mut CompletionBuilder) -> Option<Vec<LuaType>
     None
 }
 
+fn infer_param_list(
+    builder: &mut CompletionBuilder,
+    param_list: LuaParamList,
+) -> Option<Vec<LuaType>> {
+    let closure_expr = param_list.get_parent::<LuaClosureExpr>()?;
+
+    let doc_params = get_closure_expr_comment(&closure_expr)?.children::<LuaDocTagParam>();
+    let mut names = Vec::new();
+    for doc_param in doc_params {
+        let name = doc_param.get_name_token()?.get_name_text().to_string();
+        if !names.contains(&name) {
+            // 不在这里添加补全项, 拼接的优先级应在单独添加之上
+            names.push(name.clone());
+        }
+    }
+    let params = param_list
+        .get_params()
+        .map(|it| {
+            if let Some(name_token) = it.get_name_token() {
+                name_token.get_name_text().to_string()
+            } else {
+                "".to_string()
+            }
+        })
+        .filter(|it| !it.is_empty())
+        .collect::<Vec<_>>();
+
+    // names 去掉 params 已有的
+    names.retain(|name| !params.contains(&name));
+    if names.len() > 1 {
+        builder.add_completion_item(CompletionItem {
+            label: format!("{}", names.iter().join(", ")),
+            kind: Some(lsp_types::CompletionItemKind::INTERFACE),
+            ..Default::default()
+        });
+    }
+
+    for name in names {
+        builder.add_completion_item(CompletionItem {
+            label: name,
+            kind: Some(lsp_types::CompletionItemKind::INTERFACE),
+            ..Default::default()
+        });
+    }
+
+    // 不返回类型, 因为字符串类型会被加上双引号, 但这里需要的是不带双引号的字符串, 我们选择直接在这里添加
+    None
+}
+
 fn infer_call_arg_list(
     builder: &mut CompletionBuilder,
     call_arg_list: LuaCallArgList,