fix #499

Author: xuhuanzy

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

@@ -6,7 +6,7 @@ use lsp_types::{CompletionItem, InsertTextFormat, InsertTextMode};
 use rowan::NodeOrToken;
 
 use crate::handlers::completion::{
-    add_completions::{check_visibility, get_detail, is_deprecated, CallDisplay},
+    add_completions::{check_visibility, is_deprecated},
     completion_builder::CompletionBuilder,
     completion_data::CompletionData,
 };
@@ -232,7 +232,7 @@ fn add_field_value_completion(
 ) -> Option<()> {
     let real_type = get_real_type(&builder.semantic_model.get_db(), &member_info.typ)?;
     if real_type.is_function() {
-        let label_detail = get_detail(builder, real_type, CallDisplay::None);
+        let label_detail = get_function_detail(builder, real_type);
         let item = CompletionItem {
             label: "fun".to_string(),
             label_details: Some(lsp_types::CompletionItemLabelDetails {
@@ -254,3 +254,32 @@ fn add_field_value_completion(
 
     None
 }
+
+fn get_function_detail(builder: &CompletionBuilder, typ: &LuaType) -> Option<String> {
+    match typ {
+        LuaType::Signature(signature_id) => {
+            let signature = builder
+                .semantic_model
+                .get_db()
+                .get_signature_index()
+                .get(&signature_id)?;
+
+            let params_str = signature
+                .get_type_params()
+                .iter()
+                .map(|param| param.0.clone())
+                .collect::<Vec<_>>();
+
+            Some(format!("({})", params_str.join(", ")))
+        }
+        LuaType::DocFunction(f) => {
+            let params_str = f
+                .get_params()
+                .iter()
+                .map(|param| param.0.clone())
+                .collect::<Vec<_>>();
+            Some(format!("({})", params_str.join(", ")))
+        }
+        _ => None,
+    }
+}

crates/emmylua_ls/src/handlers/test/completion_test.rs

@@ -707,4 +707,26 @@ mod tests {
             CompletionTriggerKind::INVOKED,
         ));
     }
+
+    #[test]
+    fn test_issue_499() {
+        let mut ws = ProviderVirtualWorkspace::new();
+        assert!(ws.check_completion_with_kind(
+            r#"
+            ---@class T
+            ---@field func fun(a:string): string
+
+            ---@type T
+            local t = {
+                func = <??>
+            }
+            "#,
+            vec![VirtualCompletionItem {
+                label: "fun".to_string(),
+                kind: CompletionItemKind::SNIPPET,
+                label_detail: Some("(a)".to_string()),
+            },],
+            CompletionTriggerKind::INVOKED,
+        ));
+    }
 }

crates/emmylua_ls/src/handlers/test/hover_function_test.rs

@@ -311,27 +311,4 @@ mod tests {
             },
         ));
     }
-
-    // #[test]
-    // fn test_origin_decl_1() {
-    //     let mut ws = ProviderVirtualWorkspace::new();
-    //     assert!(ws.check_hover(
-    //         r#"
-    //             ---@class T
-    //             ---@field func fun(a:string) 注释1
-    //             ---@field func fun(a:number) 注释2
-
-    //             ---@type T
-    //             local t = {
-    //                 func = function(a)
-    //                 end
-    //             }
-    //             local abc = t.func
-    //             a<??>bc(1)
-    //         "#,
-    //         VirtualHoverResult {
-    //             value: "\n```lua\n(field) T.func(a: number)\n```\n\n---\n\n注释2\n".to_string(),
-    //         },
-    //     ));
-    // }
 }