completion: optimize table_field

Author: xuhuanzy

crates/emmylua_ls/src/handlers/completion/add_completions/add_member_completion.rs

@@ -1,4 +1,4 @@
-use emmylua_code_analysis::{DbIndex, LuaMemberInfo, LuaMemberKey, LuaType};
+use emmylua_code_analysis::{DbIndex, LuaMemberInfo, LuaMemberKey, LuaPropertyOwnerId, LuaType};
 use emmylua_parser::LuaTokenKind;
 use lsp_types::CompletionItem;
 
@@ -105,6 +105,19 @@ pub fn add_member_completion(
     builder.add_completion_item(completion_item)?;
 
     // add overloads if the type is function
+    add_signature_overloads(builder, property_owner, &typ, display, deprecated, label)?;
+
+    Some(())
+}
+
+fn add_signature_overloads(
+    builder: &mut CompletionBuilder,
+    property_owner: &Option<LuaPropertyOwnerId>,
+    typ: &LuaType,
+    display: CallDisplay,
+    deprecated: Option<bool>,
+    label: String,
+) -> Option<()> {
     if let LuaType::Signature(signature_id) = typ {
         let overloads = builder
             .semantic_model
@@ -141,7 +154,6 @@ pub fn add_member_completion(
                 builder.add_completion_item(completion_item);
             });
     };
-
     Some(())
 }
 

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

@@ -14,7 +14,7 @@ use emmylua_code_analysis::humanize_type;
 
 use super::completion_builder::CompletionBuilder;
 
-fn check_visibility(builder: &mut CompletionBuilder, id: LuaPropertyOwnerId) -> Option<()> {
+pub fn check_visibility(builder: &mut CompletionBuilder, id: LuaPropertyOwnerId) -> Option<()> {
     match id {
         LuaPropertyOwnerId::Member(_) => {}
         LuaPropertyOwnerId::LuaDecl(_) => {}
@@ -45,7 +45,7 @@ fn get_completion_kind(typ: &LuaType) -> CompletionItemKind {
     CompletionItemKind::VARIABLE
 }
 
-fn is_deprecated(builder: &CompletionBuilder, id: LuaPropertyOwnerId) -> bool {
+pub fn is_deprecated(builder: &CompletionBuilder, id: LuaPropertyOwnerId) -> bool {
     let property = builder
         .semantic_model
         .get_db()

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

@@ -14,6 +14,8 @@ pub struct CompletionBuilder<'a> {
     stopped: bool,
     // 主动触发补全
     pub is_invoke_completion: bool,
+    pub env_start_index: i32,
+    pub env_end_index: i32,
 }
 
 impl<'a> CompletionBuilder<'a> {
@@ -31,6 +33,8 @@ impl<'a> CompletionBuilder<'a> {
             cancel_token,
             stopped: false,
             is_invoke_completion,
+            env_start_index: -1,
+            env_end_index: -1,
         }
     }
 
@@ -58,4 +62,18 @@ impl<'a> CompletionBuilder<'a> {
     pub fn get_trigger_text(&self) -> String {
         self.trigger_token.text().trim_end().to_string()
     }
+
+    pub fn remove_env_completion_items(&mut self) {
+        if self.env_start_index == -1 || self.env_end_index == -1 {
+            return;
+        }
+        if self.env_start_index <= self.env_end_index
+            && self.env_end_index < self.completion_items.len() as i32
+        {
+            self.completion_items
+                .drain(self.env_start_index as usize..=self.env_end_index as usize);
+        }
+        self.env_start_index = -1;
+        self.env_end_index = -1;
+    }
 }

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

@@ -17,17 +17,16 @@ pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
         LuaAst::LuaNameExpr(_) => {}
         LuaAst::LuaBlock(_) => {}
         LuaAst::LuaCallArgList(_) => {}
-        // 在表中无键时主动触发的补全, 不在这里处理
-        // TODO 如果左值类型不是类而是纯表则允许
-        LuaAst::LuaTableExpr(_)|
         // 字符串中触发的补全
-        LuaAst::LuaLiteralExpr(_)  => return None,
-        _ => {},
+        LuaAst::LuaLiteralExpr(_) => return None,
+        _ => {}
     };
 
     let mut duplicated_name = HashSet::new();
+    builder.env_start_index = builder.get_completion_items_mut().len() as i32;
     add_local_env(builder, &mut duplicated_name, &node);
     add_global_env(builder, &mut duplicated_name);
+    builder.env_end_index = builder.get_completion_items_mut().len() as i32 - 1;
 
     builder.env_duplicate_name.extend(duplicated_name);
 

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

@@ -8,7 +8,7 @@ mod keywords_provider;
 mod member_provider;
 mod module_path_provider;
 mod postfix_provider;
-mod table_decl_field_provider;
+mod table_field_provider;
 mod type_special_provider;
 
 use emmylua_parser::{LuaAst, LuaAstNode, LuaAstToken, LuaStringToken};
@@ -28,25 +28,29 @@ pub fn add_completions(builder: &mut CompletionBuilder) -> Option<()> {
             _ => return Some(()),
         }
     }
+    postfix_provider::add_completion(builder);
+    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);
 
     module_path_provider::add_completion(builder);
     file_path_provider::add_completion(builder);
-    keywords_provider::add_completion(builder);
-    type_special_provider::add_completion(builder);
-    env_provider::add_completion(builder);
-    member_provider::add_completion(builder);
-    table_decl_field_provider::add_completion(builder);
     auto_require_provider::add_completion(builder);
     doc_tag_provider::add_completion(builder);
     doc_type_provider::add_completion(builder);
     doc_name_token_provider::add_completion(builder);
-    postfix_provider::add_completion(builder);
 
     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));
         }
     }
+    // dbg!(&builder.get_completion_items_mut());
 
     Some(())
 }

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

@@ -0,0 +1,107 @@
+use std::collections::HashSet;
+
+use emmylua_code_analysis::{LuaMemberInfo, LuaMemberKey};
+use emmylua_parser::{LuaAst, LuaAstNode, LuaTableExpr, LuaTableField};
+use lsp_types::CompletionItem;
+
+use crate::handlers::completion::{
+    add_completions::{check_visibility, is_deprecated, CompletionData},
+    completion_builder::CompletionBuilder,
+};
+
+pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
+    let table_expr = get_table_expr(builder)?;
+    let table_type = builder
+        .semantic_model
+        .infer_table_should_be(table_expr.clone())?;
+    let member_infos = builder.semantic_model.infer_member_infos(&table_type)?;
+
+    let mut duplicated_set = HashSet::new();
+    for field in table_expr.get_fields() {
+        let key = field.get_field_key();
+        if let Some(key) = key {
+            duplicated_set.insert(key.get_path_part());
+        }
+    }
+
+    for member_info in member_infos {
+        if duplicated_set.contains(&member_info.key.to_path()) {
+            continue;
+        }
+
+        duplicated_set.insert(member_info.key.to_path());
+        add_table_field_completion(builder, member_info);
+    }
+
+    // 删除env补全项
+    builder.remove_env_completion_items();
+    Some(())
+}
+
+fn get_table_expr(builder: &mut CompletionBuilder) -> Option<LuaTableExpr> {
+    let node = LuaAst::cast(builder.trigger_token.parent()?)?;
+
+    match node {
+        LuaAst::LuaTableExpr(table_expr) => Some(table_expr),
+        LuaAst::LuaNameExpr(name_expr) => name_expr
+            .get_parent::<LuaTableField>()?
+            .get_parent::<LuaTableExpr>(),
+        _ => None,
+    }
+}
+
+fn add_table_field_completion(
+    builder: &mut CompletionBuilder,
+    member_info: LuaMemberInfo,
+) -> Option<()> {
+    let env_completion = &builder.env_duplicate_name;
+    let name = match member_info.key {
+        LuaMemberKey::Name(name) => name.to_string(),
+        LuaMemberKey::Integer(index) => format!("[{}]", index),
+        _ => return None,
+    };
+    let typ = member_info.typ;
+
+    let (label, insert_text) = {
+        let is_nullable = if typ.is_nullable() { "?" } else { "" };
+        if env_completion.contains(&name) {
+            (
+                format!("{0}{1} = {0},", name, is_nullable),
+                format!("{0} = {0},", name),
+            )
+        } else {
+            (
+                format!("{0}{1} = ", name, is_nullable),
+                format!("{0} = ", name),
+            )
+        }
+    };
+
+    let property_owner = &member_info.property_owner_id;
+    if let Some(property_owner) = &property_owner {
+        check_visibility(builder, property_owner.clone())?;
+    }
+
+    let data = if let Some(id) = &property_owner {
+        CompletionData::from_property_owner_id(id.clone().into())
+    } else {
+        None
+    };
+    let deprecated = if let Some(id) = &property_owner {
+        Some(is_deprecated(builder, id.clone()))
+    } else {
+        None
+    };
+
+    let completion_item = CompletionItem {
+        label,
+        kind: Some(lsp_types::CompletionItemKind::PROPERTY),
+        data,
+        deprecated,
+        insert_text: Some(insert_text),
+        ..Default::default()
+    };
+
+    builder.add_completion_item(completion_item);
+    Some(())
+}