optimize table_generic_tpl_pattern_member_owner_match

Author: xuhuanzy

crates/emmylua_code_analysis/src/db_index/member/lua_member_owner.rs

@@ -1,18 +1,15 @@
-use std::sync::Arc;
-
 use internment::ArcIntern;
 use rowan::TextRange;
 use smol_str::SmolStr;
 
-use crate::{GlobalId, InFiled, LuaGenericType, LuaTypeDeclId};
+use crate::{GlobalId, InFiled, LuaTypeDeclId};
 
 #[derive(Debug, Hash, PartialEq, Eq, Clone)]
 pub enum LuaMemberOwner {
     LocalUnresolve,
     Type(LuaTypeDeclId),
     Element(InFiled<TextRange>),
     GlobalPath(GlobalId),
-    Generic(Arc<LuaGenericType>),
 }
 
 impl From<LuaTypeDeclId> for LuaMemberOwner {
@@ -45,12 +42,6 @@ impl From<GlobalId> for LuaMemberOwner {
     }
 }
 
-impl From<LuaGenericType> for LuaMemberOwner {
-    fn from(generic: LuaGenericType) -> Self {
-        Self::Generic(Arc::new(generic))
-    }
-}
-
 impl LuaMemberOwner {
     pub fn get_type_id(&self) -> Option<&LuaTypeDeclId> {
         match self {

crates/emmylua_code_analysis/src/diagnostic/test/param_type_check_test.rs

@@ -1243,15 +1243,17 @@ mod test {
         assert!(ws.check_code_for(
             DiagnosticCode::ParamTypeNotMatch,
             r#"
-            local pairs = pairs
-
             ---@type RingBufferSpan<number>
             local span
             
             for k, v in pairs(span) do
+                A = v
             end
             "#
         ));
+        let a_ty = ws.expr_ty("A");
+        let expected = ws.ty("number");
+        assert_eq!(a_ty, expected);
     }
 
     #[test]

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

@@ -1,4 +1,4 @@
-use std::ops::Deref;
+use std::{ops::Deref, sync::Arc};
 
 use emmylua_parser::LuaAstNode;
 use itertools::Itertools;
@@ -328,19 +328,40 @@ fn table_generic_tpl_pattern_match(
         }
         LuaType::TableConst(inst) => {
             let owner = LuaMemberOwner::Element(inst.clone());
-            table_generic_tpl_pattern_member_owner_match(context, table_generic_params, owner)?;
+            table_generic_tpl_pattern_member_owner_match(
+                context,
+                table_generic_params,
+                owner,
+                &[],
+            )?;
         }
         LuaType::Ref(type_id) => {
             let owner = LuaMemberOwner::Type(type_id.clone());
-            table_generic_tpl_pattern_member_owner_match(context, table_generic_params, owner)?;
+            table_generic_tpl_pattern_member_owner_match(
+                context,
+                table_generic_params,
+                owner,
+                &[],
+            )?;
         }
         LuaType::Def(type_id) => {
             let owner = LuaMemberOwner::Type(type_id.clone());
-            table_generic_tpl_pattern_member_owner_match(context, table_generic_params, owner)?;
+            table_generic_tpl_pattern_member_owner_match(
+                context,
+                table_generic_params,
+                owner,
+                &[],
+            )?;
         }
         LuaType::Generic(generic) => {
-            let owner = LuaMemberOwner::Generic(generic.clone());
-            table_generic_tpl_pattern_member_owner_match(context, table_generic_params, owner)?;
+            let owner = LuaMemberOwner::Type(generic.get_base_type_id());
+            let target_params = generic.get_params();
+            table_generic_tpl_pattern_member_owner_match(
+                context,
+                table_generic_params,
+                owner,
+                &target_params,
+            )?;
         }
         LuaType::Object(obj) => {
             let mut keys = Vec::new();
@@ -384,15 +405,21 @@ fn table_generic_tpl_pattern_member_owner_match(
     context: &mut TplContext,
     table_generic_params: &Vec<LuaType>,
     owner: LuaMemberOwner,
+    target_params: &[LuaType],
 ) -> TplPatternMatchResult {
     if table_generic_params.len() != 2 {
         return Err(InferFailReason::None);
     }
 
     let owner_type = match &owner {
         LuaMemberOwner::Element(inst) => LuaType::TableConst(inst.clone()),
-        LuaMemberOwner::Type(type_id) => LuaType::Ref(type_id.clone()),
-        LuaMemberOwner::Generic(generic) => LuaType::Generic(generic.clone()),
+        LuaMemberOwner::Type(type_id) => match target_params.len() {
+            0 => LuaType::Ref(type_id.clone()),
+            _ => LuaType::Generic(Arc::new(LuaGenericType::new(
+                type_id.clone(),
+                target_params.to_vec(),
+            ))),
+        },
         _ => {
             return Err(InferFailReason::None);
         }