remove runtime.class_default_call

xuhuanzy · xuhuanzy · commit 788eb1ec4142 · 2025-09-30T05:34:42.000+08:00
diff --git a/crates/emmylua_code_analysis/resources/schema.json b/crates/emmylua_code_analysis/resources/schema.json
@@ -110,11 +110,6 @@
     "runtime": {
       "$ref": "#/$defs/EmmyrcRuntime",
       "default": {
-        "classDefaultCall": {
-          "forceNonColon": false,
-          "forceReturnSelf": false,
-          "functionName": ""
-        },
         "extensions": [],
         "frameworkVersions": [],
         "nonstandardSymbol": [],
@@ -163,26 +158,6 @@
     }
   },
   "$defs": {
-    "ClassDefaultCall": {
-      "type": "object",
-      "properties": {
-        "forceNonColon": {
-          "description": "Mandatory non`:` definition. When `function_name` is not empty, it takes effect.",
-          "type": "boolean",
-          "default": true
-        },
-        "forceReturnSelf": {
-          "description": "Force to return `self`.",
-          "type": "boolean",
-          "default": true
-        },
-        "functionName": {
-          "description": "class default overload function. eg. \"__init\".",
-          "type": "string",
-          "default": ""
-        }
-      }
-    },
     "DiagnosticCode": {
       "oneOf": [
         {
@@ -952,15 +927,6 @@
     "EmmyrcRuntime": {
       "type": "object",
       "properties": {
-        "classDefaultCall": {
-          "description": "class default overload function.",
-          "$ref": "#/$defs/ClassDefaultCall",
-          "default": {
-            "forceNonColon": false,
-            "forceReturnSelf": false,
-            "functionName": ""
-          }
-        },
         "extensions": {
           "description": "file Extensions. eg: .lua, .lua.txt",
           "type": "array",
diff --git a/crates/emmylua_code_analysis/src/compilation/analyzer/lua/mod.rs b/crates/emmylua_code_analysis/src/compilation/analyzer/lua/mod.rs
@@ -110,6 +110,7 @@ impl LuaAnalyzer<'_> {
         }
     }
 
+    #[allow(unused)]
     pub fn get_emmyrc(&self) -> &Emmyrc {
         self.db.get_emmyrc()
     }
diff --git a/crates/emmylua_code_analysis/src/compilation/analyzer/lua/stats.rs b/crates/emmylua_code_analysis/src/compilation/analyzer/lua/stats.rs
@@ -1,11 +1,10 @@
 use emmylua_parser::{
-    BinaryOperator, LuaAssignStat, LuaAstNode, LuaAstToken, LuaExpr, LuaFuncStat, LuaIndexExpr,
+    BinaryOperator, LuaAssignStat, LuaAstNode, LuaExpr, LuaFuncStat, LuaIndexExpr,
     LuaLocalFuncStat, LuaLocalStat, LuaTableField, LuaVarExpr, PathTrait,
 };
 
 use crate::{
-    InFiled, InferFailReason, LuaOperator, LuaOperatorMetaMethod, LuaOperatorOwner, LuaTypeCache,
-    LuaTypeOwner, OperatorFunction,
+    InFiled, InferFailReason, LuaTypeCache, LuaTypeOwner,
     compilation::analyzer::{
         common::{add_member, bind_type},
         unresolve::{UnResolveDecl, UnResolveMember},
@@ -415,8 +414,6 @@ pub fn analyze_func_stat(analyzer: &mut LuaAnalyzer, func_stat: LuaFuncStat) ->
         .get_type_index_mut()
         .bind_type(type_owner, LuaTypeCache::InferType(signature_type.clone()));
 
-    try_add_class_default_call(analyzer, func_name, signature_type);
-
     Some(())
 }
 
@@ -503,53 +500,3 @@ fn special_assign_pattern(
 
     Some(())
 }
-
-pub fn try_add_class_default_call(
-    analyzer: &mut LuaAnalyzer,
-    func_name: LuaVarExpr,
-    signature_type: LuaType,
-) -> Option<()> {
-    let LuaType::Signature(signature_id) = signature_type else {
-        return None;
-    };
-
-    let default_name = &analyzer
-        .get_emmyrc()
-        .runtime
-        .class_default_call
-        .function_name;
-
-    if default_name.is_empty() {
-        return None;
-    }
-    if let LuaVarExpr::IndexExpr(index_expr) = func_name {
-        let index_key = index_expr.get_index_key()?;
-        if index_key.get_path_part() == *default_name {
-            let prefix_expr = index_expr.get_prefix_expr()?;
-            if let Ok(prefix_type) = analyzer.infer_expr(&prefix_expr)
-                && let LuaType::Def(decl_id) = prefix_type
-            {
-                // 如果已经存在, 则不添加
-                let call = analyzer.db.get_operator_index().get_operators(
-                    &LuaOperatorOwner::Type(decl_id.clone()),
-                    LuaOperatorMetaMethod::Call,
-                );
-                if call.is_some() {
-                    return None;
-                }
-
-                let operator = LuaOperator::new(
-                    decl_id.into(),
-                    LuaOperatorMetaMethod::Call,
-                    analyzer.file_id,
-                    // 必须指向名称, 使用 index_expr 的完整范围不会跳转到函数上
-                    index_expr.get_name_token()?.syntax().text_range(),
-                    OperatorFunction::DefaultCall(signature_id),
-                );
-                analyzer.db.get_operator_index_mut().add_operator(operator);
-            }
-        }
-    }
-
-    Some(())
-}
diff --git a/crates/emmylua_code_analysis/src/compilation/test/annotation_test.rs b/crates/emmylua_code_analysis/src/compilation/test/annotation_test.rs
@@ -127,12 +127,16 @@ mod test {
 
     #[test]
     fn test_generic_type_extends() {
-        let mut ws = VirtualWorkspace::new();
-        let mut emmyrc = ws.get_emmyrc();
-        emmyrc.runtime.class_default_call.force_non_colon = true;
-        emmyrc.runtime.class_default_call.force_return_self = true;
-        emmyrc.runtime.class_default_call.function_name = "__init".to_string();
-        ws.update_emmyrc(emmyrc);
+        let mut ws = VirtualWorkspace::new_with_init_std_lib();
+        ws.def(
+            r#"
+            ---@generic T
+            ---@param [class_ctor("__init")] name `T`
+            ---@return T
+            function meta(name)
+            end
+        "#,
+        );
         ws.def(
             r#"
             ---@class State
@@ -141,7 +145,7 @@ mod test {
             ---@class StateMachine<T: State>
             ---@field aaa T
             ---@field new fun(self: self): self
-            StateMachine = {}
+            StateMachine = meta("StateMachine")
 
             ---@return self
             function StateMachine:abc()
diff --git a/crates/emmylua_code_analysis/src/compilation/test/overload_test.rs b/crates/emmylua_code_analysis/src/compilation/test/overload_test.rs
@@ -1,6 +1,5 @@
 #[cfg(test)]
 mod test {
-    use std::{ops::Deref, sync::Arc};
 
     use crate::{DiagnosticCode, VirtualWorkspace};
 
@@ -31,18 +30,24 @@ mod test {
     #[test]
     fn test_class_default_call() {
         let mut ws = VirtualWorkspace::new();
-        let mut emmyrc = ws.analysis.emmyrc.deref().clone();
-        emmyrc.runtime.class_default_call.function_name = "__init".to_string();
-        emmyrc.runtime.class_default_call.force_non_colon = true;
-        emmyrc.runtime.class_default_call.force_return_self = true;
-        ws.analysis.update_config(Arc::new(emmyrc));
+        ws.def(
+            r#"
+            ---@attribute class_ctor(name: string, strip_self: boolean?, return_self: boolean?)
+
+            ---@generic T
+            ---@param [class_ctor("__init")] name `T`
+            ---@return T
+            function meta(name)
+            end
+        "#,
+        );
 
         ws.def(
             r#"
         ---@class MyClass
-        local M = {}
+        local M = meta("MyClass")
 
-        function M:__init(a)
+        function M:__init()
         end
 
         A = M()
diff --git a/crates/emmylua_code_analysis/src/config/configs/runtime.rs b/crates/emmylua_code_analysis/src/config/configs/runtime.rs
@@ -24,9 +24,6 @@ pub struct EmmyrcRuntime {
     #[serde(default)]
     /// Require pattern. eg. "?.lua", "?/init.lua"
     pub require_pattern: Vec<String>,
-    #[serde(default)]
-    /// class default overload function.
-    pub class_default_call: ClassDefaultCall,
     /// Non-standard symbols.
     #[serde(default)]
     pub nonstandard_symbol: Vec<EmmyrcNonStdSymbol>,
@@ -75,20 +72,7 @@ impl EmmyrcLuaVersion {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone, Default)]
-#[serde(rename_all = "camelCase")]
-pub struct ClassDefaultCall {
-    #[serde(default)]
-    /// class default overload function. eg. "__init".
-    pub function_name: String,
-    #[serde(default = "default_true")]
-    /// Mandatory non`:` definition. When `function_name` is not empty, it takes effect.
-    pub force_non_colon: bool,
-    /// Force to return `self`.
-    #[serde(default = "default_true")]
-    pub force_return_self: bool,
-}
-
+#[allow(unused)]
 fn default_true() -> bool {
     true
 }
diff --git a/crates/emmylua_code_analysis/src/db_index/operators/lua_operator.rs b/crates/emmylua_code_analysis/src/db_index/operators/lua_operator.rs
@@ -23,7 +23,6 @@ pub struct LuaOperator {
 pub enum OperatorFunction {
     Func(Arc<LuaFunctionType>),
     Signature(LuaSignatureId),
-    DefaultCall(LuaSignatureId),
     DefaultClassCtor {
         id: LuaSignatureId,
         strip_self: bool,
@@ -78,7 +77,6 @@ impl LuaOperator {
                 LuaType::Any
             }
             // 只有 .field 才有`operand`, call 不会有这个
-            OperatorFunction::DefaultCall(_) => LuaType::Unknown,
             OperatorFunction::DefaultClassCtor { .. } => LuaType::Unknown,
         }
     }
@@ -101,25 +99,6 @@ impl LuaOperator {
 
                 Ok(LuaType::Any)
             }
-            OperatorFunction::DefaultCall(signature_id) => {
-                let emmyrc = db.get_emmyrc();
-                if emmyrc.runtime.class_default_call.force_return_self {
-                    return Ok(LuaType::SelfInfer);
-                }
-
-                if let Some(signature) = db.get_signature_index().get(signature_id) {
-                    if signature.resolve_return == SignatureReturnStatus::UnResolve {
-                        return Err(InferFailReason::UnResolveSignatureReturn(*signature_id));
-                    }
-
-                    let return_type = signature.return_docs.first();
-                    if let Some(return_type) = return_type {
-                        return Ok(return_type.type_ref.clone());
-                    }
-                }
-
-                Ok(LuaType::Any)
-            }
             OperatorFunction::DefaultClassCtor {
                 id, return_self, ..
             } => {
@@ -144,32 +123,6 @@ impl LuaOperator {
         match &self.func {
             OperatorFunction::Func(func) => LuaType::DocFunction(func.clone()),
             OperatorFunction::Signature(signature) => LuaType::Signature(*signature),
-            OperatorFunction::DefaultCall(signature_id) => {
-                let emmyrc = db.get_emmyrc();
-
-                if let Some(signature) = db.get_signature_index().get(signature_id) {
-                    let params = signature.get_type_params();
-                    let is_colon_define = if emmyrc.runtime.class_default_call.force_non_colon {
-                        false
-                    } else {
-                        signature.is_colon_define
-                    };
-                    let return_type = if emmyrc.runtime.class_default_call.force_return_self {
-                        LuaType::SelfInfer
-                    } else {
-                        signature.get_return_type()
-                    };
-                    let func_type = LuaFunctionType::new(
-                        signature.async_state,
-                        is_colon_define,
-                        params,
-                        return_type,
-                    );
-                    return LuaType::DocFunction(Arc::new(func_type));
-                }
-
-                LuaType::Signature(*signature_id)
-            }
             OperatorFunction::DefaultClassCtor {
                 id,
                 strip_self,
diff --git a/crates/emmylua_ls/src/handlers/test/inlay_hint_test.rs b/crates/emmylua_ls/src/handlers/test/inlay_hint_test.rs
@@ -1,7 +1,6 @@
 #[cfg(test)]
 mod tests {
     use googletest::prelude::*;
-    use std::{ops::Deref, sync::Arc};
 
     use crate::handlers::test_lib::{ProviderVirtualWorkspace, VirtualInlayHint, check};
 
@@ -138,28 +137,40 @@ mod tests {
     #[gtest]
     fn test_class_call_hint() -> Result<()> {
         let mut ws = ProviderVirtualWorkspace::new();
-        let mut emmyrc = ws.analysis.get_emmyrc().deref().clone();
-        emmyrc.runtime.class_default_call.function_name = "__init".to_string();
-        emmyrc.runtime.class_default_call.force_non_colon = true;
-        emmyrc.runtime.class_default_call.force_return_self = true;
-        ws.analysis.update_config(Arc::new(emmyrc));
+        ws.def(
+            r#"
+            ---@generic T
+            ---@param [class_ctor("__init")] name `T`
+            ---@return T
+            function meta(name)
+            end
+        "#,
+        );
 
         check!(ws.check_inlay_hint(
             r#"
                 ---@class MyClass
-                local A
+                local A = meta("MyClass")
 
                 function A:__init(a)
                 end
 
                 A()
             "#,
-            vec![VirtualInlayHint {
-                label: "new".to_string(),
-                line: 7,
-                pos: 16,
-                ref_file: Some("".to_string()),
-            }]
+            vec![
+                VirtualInlayHint {
+                    label: "name:".to_string(),
+                    line: 2,
+                    pos: 31,
+                    ref_file: Some("".to_string()),
+                },
+                VirtualInlayHint {
+                    label: "new".to_string(),
+                    line: 7,
+                    pos: 16,
+                    ref_file: Some("".to_string()),
+                }
+            ]
         ));
         Ok(())
     }

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ impl LuaAnalyzer<'_> {`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
	`113`	`+ #[allow(unused)]`
`113`	`114`	`pub fn get_emmyrc(&self) -> &Emmyrc {`
`114`	`115`	`self.db.get_emmyrc()`
`115`	`116`	`}`