completion: optimize

Author: xuhuanzy

crates/emmylua_ls/src/handlers/completion/completion_builder.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use emmylua_code_analysis::SemanticModel;
 use emmylua_parser::LuaSyntaxToken;
-use lsp_types::CompletionItem;
+use lsp_types::{CompletionItem, CompletionTriggerKind};
 use tokio_util::sync::CancellationToken;
 
 pub struct CompletionBuilder<'a> {
@@ -12,8 +12,7 @@ pub struct CompletionBuilder<'a> {
     completion_items: Vec<CompletionItem>,
     cancel_token: CancellationToken,
     stopped: bool,
-    // 主动触发补全
-    pub is_invoke_completion: bool,
+    pub trigger_kind: CompletionTriggerKind,
     pub env_start_index: i32,
     pub env_end_index: i32,
 }
@@ -23,7 +22,7 @@ impl<'a> CompletionBuilder<'a> {
         trigger_token: LuaSyntaxToken,
         semantic_model: SemanticModel<'a>,
         cancel_token: CancellationToken,
-        is_invoke_completion: bool,
+        trigger_kind: CompletionTriggerKind,
     ) -> Self {
         Self {
             trigger_token,
@@ -32,7 +31,7 @@ impl<'a> CompletionBuilder<'a> {
             completion_items: Vec::new(),
             cancel_token,
             stopped: false,
-            is_invoke_completion,
+            trigger_kind,
             env_start_index: -1,
             env_end_index: -1,
         }

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

@@ -3,15 +3,16 @@ mod completion_builder;
 mod data;
 mod providers;
 mod resolve_completion;
+mod test;
 
 use add_completions::CompletionData;
 use completion_builder::CompletionBuilder;
-use emmylua_code_analysis::LuaPropertyOwnerId;
+use emmylua_code_analysis::{EmmyLuaAnalysis, FileId, LuaPropertyOwnerId};
 use emmylua_parser::LuaAstNode;
 use log::error;
 use lsp_types::{
     ClientCapabilities, CompletionItem, CompletionOptions, CompletionOptionsCompletionItem,
-    CompletionParams, CompletionResponse, CompletionTriggerKind, ServerCapabilities,
+    CompletionParams, CompletionResponse, CompletionTriggerKind, Position, ServerCapabilities,
 };
 use providers::add_completions;
 use resolve_completion::resolve_completion;
@@ -34,6 +35,31 @@ pub async fn on_completion_handler(
         return None;
     }
 
+    completion(
+        &analysis,
+        file_id,
+        position,
+        params
+            .context
+            .map(|context| context.trigger_kind)
+            .unwrap_or(CompletionTriggerKind::INVOKED),
+        cancel_token,
+    )
+}
+
+pub fn completion(
+    analysis: &EmmyLuaAnalysis,
+    file_id: FileId,
+    position: Position,
+    trigger_kind: CompletionTriggerKind,
+    cancel_token: CancellationToken,
+) -> Option<CompletionResponse> {
+    dbg!(position);
+    let semantic_model = analysis.compilation.get_semantic_model(file_id)?;
+    if !semantic_model.get_emmyrc().completion.enable {
+        return None;
+    }
+
     let root = semantic_model.get_root();
     let position_offset = {
         let document = semantic_model.get_document();
@@ -52,15 +78,7 @@ pub async fn on_completion_handler(
         }
     };
 
-    let mut builder = CompletionBuilder::new(
-        token,
-        semantic_model,
-        cancel_token,
-        params
-            .context
-            .map(|context| context.trigger_kind == CompletionTriggerKind::INVOKED)
-            .unwrap_or(false),
-    );
+    let mut builder = CompletionBuilder::new(token, semantic_model, cancel_token, trigger_kind);
     add_completions(&mut builder);
     Some(CompletionResponse::Array(builder.get_completion_items()))
 }

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

@@ -12,29 +12,26 @@ mod table_field_provider;
 mod type_special_provider;
 
 use emmylua_parser::{LuaAst, LuaAstNode, LuaAstToken, LuaStringToken};
+use lsp_types::CompletionTriggerKind;
 use rowan::TextRange;
 
 use super::completion_builder::CompletionBuilder;
 
 pub fn add_completions(builder: &mut CompletionBuilder) -> Option<()> {
-    // 空格补全只允许在非主动且位于函数调用参数列表中触发
-    if builder.get_trigger_text().is_empty() && !builder.is_invoke_completion {
-        let node = LuaAst::cast(builder.trigger_token.parent()?)?;
-        match node {
-            LuaAst::LuaCallArgList(_) => {
-                type_special_provider::add_completion(builder);
-                return Some(());
-            }
-            _ => return Some(()),
-        }
+    if is_space_completion_in_call_arg_list(builder).is_some() {
+        type_special_provider::add_completion(builder);
+        return Some(());
     }
+
     postfix_provider::add_completion(builder);
+    type_special_provider::add_completion(builder);
+    // `env_provider` 在某些情况下是不需要的, 但有些补全功能依赖于他, 因在一些补全中可能会移除掉`env_provider` 的补全.
+    // 目前可能移除掉他的补全为: `table_field_provider`
     env_provider::add_completion(builder);
     // 只有具有类型定义的表才会成功返回, 此时我们不需要处理其他补全
     if table_field_provider::add_completion(builder).is_some() {
         return Some(());
     }
-    type_special_provider::add_completion(builder);
     member_provider::add_completion(builder);
     keywords_provider::add_completion(builder);
 
@@ -47,14 +44,29 @@ pub fn add_completions(builder: &mut CompletionBuilder) -> Option<()> {
 
     for (index, item) in builder.get_completion_items_mut().iter_mut().enumerate() {
         if item.sort_text.is_none() {
-            item.sort_text = Some(format!("{:04}", index));
+            item.sort_text = Some(format!("{:04}", index + 1));
         }
     }
     // dbg!(&builder.get_completion_items_mut());
 
     Some(())
 }
 
+// 空格补全只允许位于函数调用参数列表时非主动触发
+fn is_space_completion_in_call_arg_list(builder: &CompletionBuilder) -> Option<()> {
+    if builder.get_trigger_text().is_empty()
+        && builder.trigger_kind == CompletionTriggerKind::TRIGGER_CHARACTER
+    {
+        let node = LuaAst::cast(builder.trigger_token.parent()?)?;
+        match node {
+            LuaAst::LuaCallArgList(_) => Some(()),
+            _ => None,
+        }
+    } else {
+        None
+    }
+}
+
 fn get_text_edit_range_in_string(
     builder: &mut CompletionBuilder,
     string_token: LuaStringToken,