fix: instantiate StrTplRef

Author: xuhuanzy

crates/emmylua_code_analysis/src/db_index/type/type_decl.rs

@@ -271,7 +271,7 @@ impl LuaTypeDeclId {
         }) as _
     }
 
-    pub fn collect_super_types(&self, db: &DbIndex, collected_types: &mut Vec<LuaType>) {
+    fn collect_super_types(&self, db: &DbIndex, collected_types: &mut Vec<LuaType>) {
         // 必须广度优先
         let mut queue = Vec::new();
         queue.push(self.clone());

crates/emmylua_code_analysis/src/semantic/generic/instantiate_type/mod.rs

@@ -391,13 +391,12 @@ fn instantiate_function_generic_params(
         .filter_map(|generic_tpl| {
             let tpl_id = generic_tpl.get_tpl_id();
             let param = generic_tpl.get_param();
-            // A pending entry means this generic belongs to the current instantiation boundary
-            // and has been finalized into the function params/return. Foreign nested generics
-            // are absent from the substitutor and remain owned by the nested function.
+            // substitutor 中存在该泛型时, 说明它有实际类型, 无需保留.
             if context.substitutor.get(tpl_id).is_some() {
                 return None;
             }
 
+            // 对约束与默认值做一次实例化尝试以传递给后续.
             let constraint = param
                 .constraint
                 .as_ref()

crates/emmylua_code_analysis/src/semantic/generic/tpl_pattern/mod.rs

@@ -126,26 +126,6 @@ pub fn multi_param_tpl_pattern_match_multi_return(
     Ok(())
 }
 
-fn get_str_tpl_infer_type(name: &str) -> LuaType {
-    match name {
-        "unknown" => LuaType::Unknown,
-        "never" => LuaType::Never,
-        "nil" | "void" => LuaType::Nil,
-        "any" => LuaType::Any,
-        "userdata" => LuaType::Userdata,
-        "thread" => LuaType::Thread,
-        "boolean" | "bool" => LuaType::Boolean,
-        "string" => LuaType::String,
-        "integer" | "int" => LuaType::Integer,
-        "number" => LuaType::Number,
-        "io" => LuaType::Io,
-        "self" => LuaType::SelfInfer,
-        "global" => LuaType::Global,
-        "function" => LuaType::Function,
-        _ => LuaType::Ref(LuaTypeDeclId::global(&name)),
-    }
-}
-
 pub fn tpl_pattern_match(
     context: &mut TplContext,
     pattern: &LuaType,
@@ -169,11 +149,37 @@ pub fn tpl_pattern_match(
                 let prefix = str_tpl.get_prefix();
                 let suffix = str_tpl.get_suffix();
                 let type_name = SmolStr::new(format!("{}{}{}", prefix, s, suffix));
-                context.substitutor.infer_type(
-                    str_tpl.get_tpl_id(),
-                    get_str_tpl_infer_type(&type_name),
-                    true,
-                );
+                let file_id = context.cache.get_file_id();
+                let inferred_type = match type_name.as_str() {
+                    "unknown" => LuaType::Unknown,
+                    "never" => LuaType::Never,
+                    "nil" | "void" => LuaType::Nil,
+                    "any" => LuaType::Any,
+                    "userdata" => LuaType::Userdata,
+                    "thread" => LuaType::Thread,
+                    "boolean" | "bool" => LuaType::Boolean,
+                    "string" => LuaType::String,
+                    "integer" | "int" => LuaType::Integer,
+                    "number" => LuaType::Number,
+                    "io" => LuaType::Io,
+                    "self" => LuaType::SelfInfer,
+                    "global" => LuaType::Global,
+                    "function" => LuaType::Function,
+                    _ => context
+                        .db
+                        .get_type_index()
+                        .find_type_decl(
+                            file_id,
+                            &type_name,
+                            context.db.resolve_workspace_id(file_id),
+                        )
+                        .map(|decl| LuaType::Ref(decl.get_id()))
+                        .unwrap_or(LuaType::Ref(LuaTypeDeclId::global(&type_name))),
+                };
+
+                context
+                    .substitutor
+                    .infer_type(str_tpl.get_tpl_id(), inferred_type, true);
             }
         }
         LuaType::Array(array_type) => {