stash

Author: CppCXY

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

@@ -403,6 +403,7 @@ impl LuaType {
             LuaType::Variadic(inner) => inner.contain_tpl(),
             LuaType::TplRef(_) => true,
             LuaType::StrTplRef(_) => true,
+            LuaType::ConstTplRef(_) => true,
             LuaType::SelfInfer => true,
             LuaType::MultiLineUnion(inner) => inner.contain_tpl(),
             LuaType::TypeGuard(inner) => inner.contain_tpl(),

crates/emmylua_code_analysis/src/semantic/generic/instantiate_func_generic.rs

@@ -13,7 +13,6 @@ use super::{
     TypeSubstitutor,
 };
 
-// todo: need cache
 pub fn instantiate_func_generic(
     db: &DbIndex,
     cache: &mut LuaInferCache,

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

@@ -4,6 +4,7 @@ mod instantiate_type_generic;
 mod test;
 mod tpl_pattern;
 mod type_substitutor;
+mod tpl_context;
 
 pub use instantiate_func_generic::instantiate_func_generic;
 pub use instantiate_type_generic::instantiate_doc_function;

crates/emmylua_code_analysis/src/semantic/generic/tpl_context.rs

@@ -0,0 +1,12 @@
+use emmylua_parser::LuaSyntaxNode;
+
+use crate::{LuaType, TypeSubstitutor};
+
+#[derive(Debug)]
+pub struct TplContext<'a> {
+    pub tpl_param_types: &'a [LuaType],
+    pub call_arg_types: &'a [LuaType],
+    pub substitutor: &'a mut TypeSubstitutor,
+    pub root: LuaSyntaxNode
+}
+

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

@@ -8,8 +8,7 @@ use crate::{
     check_type_compact,
     db_index::{DbIndex, LuaGenericType, LuaType},
     semantic::{
-        member::{find_index_operations, get_member_map},
-        LuaInferCache,
+        generic::tpl_context::TplContext, member::{find_index_operations, get_member_map}, LuaInferCache
     },
     InferFailReason, LuaFunctionType, LuaMemberKey, LuaMemberOwner, LuaObjectType,
     LuaSemanticDeclId, LuaTupleType, LuaUnionType, VariadicType,
@@ -27,6 +26,13 @@ pub fn tpl_pattern_match_args(
     root: &LuaSyntaxNode,
     substitutor: &mut TypeSubstitutor,
 ) -> TplPatternMatchResult {
+    let _ = TplContext {
+        tpl_param_types: func_param_types,
+        call_arg_types,
+        substitutor,
+        root: root.clone(),
+    };
+
     for (i, func_param_type) in func_param_types.iter().enumerate() {
         let call_arg_type = if i < call_arg_types.len() {
             &call_arg_types[i]
@@ -129,6 +135,9 @@ fn tpl_pattern_match(
     substitutor: &mut TypeSubstitutor,
 ) -> TplPatternMatchResult {
     let target = escape_alias(db, target);
+    if !pattern.contain_tpl() {
+        return Ok(());
+    }
 
     match pattern {
         LuaType::TplRef(tpl) => {