completion: 支持泛型实例重载显示

Author: xuhuanzy

crates/emmylua_code_analysis/src/semantic/member/infer_member_map.rs

@@ -17,14 +17,16 @@ pub fn infer_member_map(
     for member in members {
         let key = member.key.clone();
         let typ = &member.typ;
+        // 通常是泛型实例化推断结果
         if let LuaType::Union(u) = typ {
             if u.get_types().iter().all(|f| f.is_function()) {
-                for f in u.get_types() {
+                for (index, f) in u.get_types().iter().enumerate() {
                     let new_member = LuaMemberInfo {
                         key: key.clone(),
                         typ: f.clone(),
                         property_owner_id: member.property_owner_id.clone(),
                         feature: member.feature.clone(),
+                        overload_index: Some(index),
                     };
 
                     member_map

crates/emmylua_code_analysis/src/semantic/member/infer_members.rs

@@ -60,6 +60,7 @@ fn infer_normal_members(db: &DbIndex, member_owner: LuaMemberOwner) -> InferMemb
             key: member.get_key().clone(),
             typ: member.get_decl_type(),
             feature: Some(member.get_feature()),
+            overload_index: None,
         });
     }
 
@@ -93,6 +94,7 @@ fn infer_custom_type_members(
                 key: member.get_key().clone(),
                 typ: member.get_decl_type(),
                 feature: Some(member.get_feature()),
+                overload_index: None,
             });
         }
     }
@@ -118,6 +120,7 @@ fn infer_tuple_members(tuple_type: &LuaTupleType) -> InferMembersResult {
             key: LuaMemberKey::Integer((idx + 1) as i64),
             typ: typ.clone(),
             feature: None,
+            overload_index: None,
         });
     }
 
@@ -132,6 +135,7 @@ fn infer_object_members(object_type: &LuaObjectType) -> InferMembersResult {
             key: key.clone(),
             typ: typ.clone(),
             feature: None,
+            overload_index: None,
         });
     }
 
@@ -189,6 +193,7 @@ fn infer_intersection_members(
                     key,
                     typ,
                     feature: None,
+                    overload_index: None,
                 });
             }
         }
@@ -225,6 +230,7 @@ fn infer_global_members(db: &DbIndex) -> InferMembersResult {
             key: LuaMemberKey::Name(decl.get_name().to_string().into()),
             typ: decl.get_type().cloned().unwrap_or(LuaType::Unknown),
             feature: None,
+            overload_index: None,
         });
     }
 
@@ -266,13 +272,15 @@ fn infer_namespace_members(db: &DbIndex, ns: &str) -> InferMembersResult {
                 key: LuaMemberKey::Name(name.into()),
                 typ,
                 feature: None,
+                overload_index: None,
             });
         } else {
             members.push(LuaMemberInfo {
                 property_owner_id: None,
                 key: LuaMemberKey::Name(name.clone().into()),
                 typ: LuaType::Namespace(SmolStr::new(format!("{}.{}", ns, &name)).into()),
                 feature: None,
+                overload_index: None,
             });
         }
     }

crates/emmylua_code_analysis/src/semantic/member/mod.rs

@@ -50,6 +50,7 @@ pub struct LuaMemberInfo {
     pub key: LuaMemberKey,
     pub typ: LuaType,
     pub feature: Option<LuaMemberFeature>,
+    pub overload_index: Option<usize>,
 }
 
 type InferMembersResult = Option<Vec<LuaMemberInfo>>;

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

@@ -60,8 +60,12 @@ pub fn add_member_completion(
         return None;
     }
 
-    let data = if let Some(id) = &property_owner {
-        CompletionData::from_property_owner_id(id.clone().into())
+    let completion_data = if let Some(id) = &property_owner {
+        if let Some(index) = member_info.overload_index {
+            CompletionData::from_overload(id.clone().into(), index)
+        } else {
+            CompletionData::from_property_owner_id(id.clone().into())
+        }
     } else {
         None
     };
@@ -80,7 +84,7 @@ pub fn add_member_completion(
     let mut completion_item = CompletionItem {
         label: label.clone(),
         kind: Some(get_completion_kind(&typ)),
-        data,
+        data: completion_data,
         label_details: Some(lsp_types::CompletionItemLabelDetails {
             detail,
             description,