add config strict.meta_override_file_define

xuhuanzy · xuhuanzy · commit 3b6fa9257ad8 · 2025-04-24T12:33:36.000+08:00
default `true`.
为`true`时在`meta`文件内定义的签名会覆盖`file`内的真实签名
diff --git a/crates/emmylua_code_analysis/src/config/configs/codelen.rs b/crates/emmylua_code_analysis/src/config/configs/codelen.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcCodeLen {
     /// Whether to enable code lens.
diff --git a/crates/emmylua_code_analysis/src/config/configs/completion.rs b/crates/emmylua_code_analysis/src/config/configs/completion.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DefaultOnError};
 
 #[serde_as]
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 /// Configuration for EmmyLua code completion.
 pub struct EmmyrcCompletion {
diff --git a/crates/emmylua_code_analysis/src/config/configs/diagnostics.rs b/crates/emmylua_code_analysis/src/config/configs/diagnostics.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::DiagnosticCode;
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 /// Represents the diagnostic configuration for Emmyrc.
 pub struct EmmyrcDiagnostic {
diff --git a/crates/emmylua_code_analysis/src/config/configs/document_color.rs b/crates/emmylua_code_analysis/src/config/configs/document_color.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcDocumentColor {
     /// Whether to enable document color.
diff --git a/crates/emmylua_code_analysis/src/config/configs/hover.rs b/crates/emmylua_code_analysis/src/config/configs/hover.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcHover {
     /// Whether to enable hover.
diff --git a/crates/emmylua_code_analysis/src/config/configs/inlayhint.rs b/crates/emmylua_code_analysis/src/config/configs/inlayhint.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcInlayHint {
     /// Whether to enable inlay hints.
diff --git a/crates/emmylua_code_analysis/src/config/configs/references.rs b/crates/emmylua_code_analysis/src/config/configs/references.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcReference {
     /// Whether to enable reference search.
diff --git a/crates/emmylua_code_analysis/src/config/configs/resource.rs b/crates/emmylua_code_analysis/src/config/configs/resource.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema, Default)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcResource {
     #[serde(default)]
diff --git a/crates/emmylua_code_analysis/src/config/configs/runtime.rs b/crates/emmylua_code_analysis/src/config/configs/runtime.rs
@@ -2,7 +2,7 @@ use emmylua_parser::LuaVersionNumber;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcRuntime {
     /// Lua version.
diff --git a/crates/emmylua_code_analysis/src/config/configs/semantictoken.rs b/crates/emmylua_code_analysis/src/config/configs/semantictoken.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcSemanticToken {
     /// Whether to enable semantic token.
diff --git a/crates/emmylua_code_analysis/src/config/configs/signature.rs b/crates/emmylua_code_analysis/src/config/configs/signature.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcSignature {
     /// Whether to enable signature help.
diff --git a/crates/emmylua_code_analysis/src/config/configs/strict.rs b/crates/emmylua_code_analysis/src/config/configs/strict.rs
@@ -9,7 +9,7 @@ fn default_false() -> bool {
     false
 }
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcStrict {
     /// Whether to enable strict mode require path.
@@ -20,6 +20,9 @@ pub struct EmmyrcStrict {
     /// Whether to enable strict mode array indexing.
     #[serde(default = "default_false")]
     pub array_index: bool,
+    /// meta define overrides file define
+    #[serde(default = "default_true")]
+    pub meta_override_file_define: bool,
 }
 
 impl Default for EmmyrcStrict {
@@ -28,6 +31,7 @@ impl Default for EmmyrcStrict {
             require_path: false,
             type_call: false,
             array_index: false,
+            meta_override_file_define: true,
         }
     }
 }
diff --git a/crates/emmylua_code_analysis/src/config/configs/workspace.rs b/crates/emmylua_code_analysis/src/config/configs/workspace.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct EmmyrcWorkspace {
     /// Ignore directories.
@@ -54,7 +54,7 @@ impl Default for EmmyrcWorkspace {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone)]
 pub struct EmmyrcWorkspaceModuleMap {
     pub pattern: String,
     pub replace: String,
diff --git a/crates/emmylua_code_analysis/src/config/mod.rs b/crates/emmylua_code_analysis/src/config/mod.rs
@@ -22,7 +22,7 @@ use rowan::NodeCache;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema, Default)]
+#[derive(Serialize, Deserialize, Debug, JsonSchema, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Emmyrc {
     #[serde(rename = "$schema")]
diff --git a/crates/emmylua_code_analysis/src/db_index/member/lua_member_item.rs b/crates/emmylua_code_analysis/src/db_index/member/lua_member_item.rs
@@ -58,13 +58,15 @@ fn resolve_member_type(
                     return Err(InferFailReason::None);
                 }
             }
-            for member in &members {
-                let feature = member.get_feature();
-                if feature.is_meta_decl() {
-                    resolve_state = MemberTypeResolveState::Meta;
-                    break;
-                } else if feature.is_file_decl() {
-                    resolve_state = MemberTypeResolveState::FileDecl;
+            if db.get_emmyrc().strict.meta_override_file_define {
+                for member in &members {
+                    let feature = member.get_feature();
+                    if feature.is_meta_decl() {
+                        resolve_state = MemberTypeResolveState::Meta;
+                        break;
+                    } else if feature.is_file_decl() {
+                        resolve_state = MemberTypeResolveState::FileDecl;
+                    }
                 }
             }
 
diff --git a/crates/emmylua_code_analysis/src/diagnostic/test/param_type_check_test.rs b/crates/emmylua_code_analysis/src/diagnostic/test/param_type_check_test.rs
@@ -1,5 +1,7 @@
 #[cfg(test)]
 mod test {
+    use std::sync::Arc;
+
     use crate::{DiagnosticCode, VirtualWorkspace};
 
     #[test]
@@ -850,4 +852,49 @@ mod test {
         "#
         ));
     }
+
+    #[test]
+    fn test_function_union_meta() {
+        let mut ws = VirtualWorkspace::new();
+        let mut emmyrc = ws.analysis.emmyrc.as_ref().clone();
+        emmyrc.strict.meta_override_file_define = false;
+        ws.analysis.update_config(Arc::new(emmyrc));
+
+        ws.def(
+            r#"
+                ---@meta
+                ---@class (partial) D21.A
+                ---@field event fun(self: self, event: "游戏-初始化")
+            "#,
+        );
+        assert!(ws.check_code_for(
+            DiagnosticCode::ParamTypeNotMatch,
+            r#"
+                ---@class (partial) D21.A
+                local M
+
+                ---@alias EventType
+                ---| GlobalEventType
+                ---| UIEventType
+
+                ---@enum UIEventType
+                local UIEventType = {
+                    ['UI_CREATE'] = "ET_UI_PREFAB_CREATE_EVENT",
+                }
+                ---@enum GlobalEventType
+                local GlobalEventType = {
+                    ['GAME_INIT'] = "ET_GAME_INIT",
+                }
+
+                ---@param event_type EventType
+                function M:event(event_type)
+                end
+
+                ---@param p EventType
+                local function test(p)
+                    M:event(p)
+                end
+        "#
+        ));
+    }
 }
