优化member_info搜索

Author: xuhuanzy

crates/emmylua_code_analysis/src/diagnostic/checker/check_field.rs

@@ -317,26 +317,41 @@ fn is_valid_member(
             }
             if members.is_empty() {
                 // 当没有任何成员信息且是 enum 类型时, 需要检查参数是否为自己
-                if let LuaType::Ref(id) | LuaType::Def(id) = prefix_type {
-                    if let Some(decl) = semantic_model.get_db().get_type_index().get_type_decl(&id)
-                    {
-                        if decl.is_enum() {
-                            if key_types.iter().any(|typ| match typ {
-                                LuaType::Ref(key_id) | LuaType::Def(key_id) => id == *key_id,
-                                _ => false,
-                            }) {
-                                return Some(());
-                            }
-                        }
-                    }
+                if check_enum_self_reference(semantic_model, &prefix_type, &key_types).is_some() {
+                    return Some(());
                 }
             }
+        } else {
+            if check_enum_self_reference(semantic_model, &prefix_type, &key_types).is_some() {
+                return Some(());
+            }
         }
     }
 
     None
 }
 
+/// 检查枚举类型的自引用
+fn check_enum_self_reference(
+    semantic_model: &SemanticModel,
+    prefix_type: &LuaType,
+    key_types: &HashSet<LuaType>,
+) -> Option<()> {
+    if let LuaType::Ref(id) | LuaType::Def(id) = prefix_type {
+        if let Some(decl) = semantic_model.get_db().get_type_index().get_type_decl(&id) {
+            if decl.is_enum() {
+                if key_types.iter().any(|typ| match typ {
+                    LuaType::Ref(key_id) | LuaType::Def(key_id) => *id == *key_id,
+                    _ => false,
+                }) {
+                    return Some(());
+                }
+            }
+        }
+    }
+    None
+}
+
 fn get_prefix_types(prefix_typ: &LuaType) -> HashSet<LuaType> {
     let mut type_set = HashSet::new();
     let mut stack = vec![prefix_typ.clone()];

crates/emmylua_code_analysis/src/semantic/infer/infer_call/infer_setmetatable.rs

@@ -2,8 +2,11 @@ use emmylua_parser::{LuaAstNode, LuaCallExpr, LuaExpr, LuaIndexKey, LuaTableExpr
 
 use crate::{
     infer_expr,
-    semantic::{infer::InferResult, member::find_members},
-    DbIndex, InFiled, InferFailReason, LuaInferCache, LuaType,
+    semantic::{
+        infer::InferResult,
+        member::{find_members, find_members_with_key},
+    },
+    DbIndex, InFiled, InferFailReason, LuaInferCache, LuaMemberKey, LuaType,
 };
 
 pub fn infer_setmetatable_call(
@@ -55,20 +58,19 @@ fn meta_type_contain_table(
     meta_type: LuaType,
     table_expr: LuaTableExpr,
 ) -> Option<LuaType> {
-    let meta_members = find_members(db, &meta_type)?;
+    let meta_members =
+        find_members_with_key(db, &meta_type, LuaMemberKey::Name("__index".into()), true)?;
     for member in meta_members {
-        if member.key.get_name() == Some("__index") {
-            let index_members = find_members(db, &member.typ)?;
-            let table_type = infer_expr(db, cache, LuaExpr::TableExpr(table_expr.clone())).ok()?;
-            let table_members = find_members(db, &table_type)?;
-            // 如果 index_members 包含了 table_members 中的所有成员，则返回 meta_type
-            if table_members.iter().all(|table_member| {
-                index_members
-                    .iter()
-                    .any(|index_member| index_member.key.to_path() == table_member.key.to_path())
-            }) {
-                return Some(meta_type);
-            }
+        let index_members = find_members(db, &member.typ)?;
+        let table_type = infer_expr(db, cache, LuaExpr::TableExpr(table_expr.clone())).ok()?;
+        let table_members = find_members(db, &table_type)?;
+        // 如果 index_members 包含了 table_members 中的所有成员，则返回 meta_type
+        if table_members.iter().all(|table_member| {
+            index_members
+                .iter()
+                .any(|index_member| index_member.key.to_path() == table_member.key.to_path())
+        }) {
+            return Some(meta_type);
         }
     }
     None