fix generic infer

Author: CppCXY

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 # 0.3.4 (unreleased)
 
-TODO
+`CHG` refactor `template system`, optimize the generic infer
 
 # 0.3.3 
 

crates/code_analysis/src/semantic/infer/infer_call.rs

@@ -46,7 +46,7 @@ fn infer_call_result(
 ) -> Option<LuaType> {
     let return_type = match prefix_type {
         LuaType::DocFunction(func) => {
-            infer_call_by_doc_function(db, config, &func, call_expr.clone(), false)?
+            infer_call_by_doc_function(db, config, &func, call_expr.clone(), func.is_colon_define())?
         }
         LuaType::Signature(signature_id) => {
             infer_call_by_signature(db, config, signature_id.clone(), call_expr.clone())?

crates/code_analysis/src/semantic/instantiate/instantiate_class_generic.rs

@@ -190,7 +190,7 @@ fn instantiate_tpl_ref(_: &DbIndex, tpl: &GenericTpl, substitutor: &TypeSubstitu
     if let Some(ty) = substitutor.get(tpl.get_tpl_id()) {
         ty.clone()
     } else {
-        LuaType::Unknown
+        LuaType::TplRef(tpl.clone().into())
     }
 }
 

crates/code_analysis/src/semantic/instantiate/instantiate_func_generic.rs

@@ -81,16 +81,6 @@ fn instantiate_func_by_args(
         );
     }
 
-    // let max = *substitutor.keys().max()?;
-    // let mut generic_params = Vec::new();
-    // for i in 0..=max {
-    //     if let Some(generic_param) = substitutor.get(&i) {
-    //         generic_params.push(generic_param.clone());
-    //     } else {
-    //         generic_params.push(LuaType::Unknown);
-    //     }
-    // }
-
     for i in 0..func_param_types.len() {
         let func_param_type = &mut func_param_types[i];
         let new_func_param_type = instantiate_type(db, &func_param_type, &substitutor);