From ed0b3c08e15ee6345ece4b135a5e99870a8fc79f Mon Sep 17 00:00:00 2001
From: Danil Alexeev <danil@alexeev.xyz>
Date: Wed, 4 Oct 2023 07:54:03 +0300
Subject: [PATCH] Core: Fix `Object::has_method()` for script static methods

---
 core/object/object.cpp                               | 10 +++++++++-
 core/object/script_language.h                        |  3 +++
 core/object/script_language_extension.cpp            |  1 +
 core/object/script_language_extension.h              |  1 +
 doc/classes/ScriptExtension.xml                      |  6 ++++++
 modules/gdscript/gdscript.cpp                        |  4 ++++
 modules/gdscript/gdscript.h                          |  1 +
 .../runtime/features/static_method_as_callable.gd    | 12 ++++++++++++
 .../runtime/features/static_method_as_callable.out   |  3 +++
 9 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.gd
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.out

diff --git a/core/object/object.cpp b/core/object/object.cpp
index f62b93d0ffc..eb645b3a926 100644
--- a/core/object/object.cpp
+++ b/core/object/object.cpp
@@ -666,8 +666,16 @@ bool Object::has_method(const StringName &p_method) const {
 	}
 
 	MethodBind *method = ClassDB::get_method(get_class_name(), p_method);
+	if (method != nullptr) {
+		return true;
+	}
 
-	return method != nullptr;
+	const Script *scr = Object::cast_to<Script>(this);
+	if (scr != nullptr) {
+		return scr->has_static_method(p_method);
+	}
+
+	return false;
 }
 
 Variant Object::getvar(const Variant &p_key, bool *r_valid) const {
diff --git a/core/object/script_language.h b/core/object/script_language.h
index ca08e9837a2..5ff7cd8582b 100644
--- a/core/object/script_language.h
+++ b/core/object/script_language.h
@@ -145,7 +145,10 @@ public:
 	virtual PropertyInfo get_class_category() const;
 #endif // TOOLS_ENABLED
 
+	// TODO: In the next compat breakage rename to `*_script_*` to disambiguate from `Object::has_method()`.
 	virtual bool has_method(const StringName &p_method) const = 0;
+	virtual bool has_static_method(const StringName &p_method) const { return false; }
+
 	virtual MethodInfo get_method_info(const StringName &p_method) const = 0;
 
 	virtual bool is_tool() const = 0;
diff --git a/core/object/script_language_extension.cpp b/core/object/script_language_extension.cpp
index ce1109781ab..a07bf63a026 100644
--- a/core/object/script_language_extension.cpp
+++ b/core/object/script_language_extension.cpp
@@ -55,6 +55,7 @@ void ScriptExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_get_class_icon_path);
 
 	GDVIRTUAL_BIND(_has_method, "method");
+	GDVIRTUAL_BIND(_has_static_method, "method");
 	GDVIRTUAL_BIND(_get_method_info, "method");
 
 	GDVIRTUAL_BIND(_is_tool);
diff --git a/core/object/script_language_extension.h b/core/object/script_language_extension.h
index beb8064a33e..89bba80b90f 100644
--- a/core/object/script_language_extension.h
+++ b/core/object/script_language_extension.h
@@ -99,6 +99,7 @@ public:
 #endif // TOOLS_ENABLED
 
 	EXBIND1RC(bool, has_method, const StringName &)
+	EXBIND1RC(bool, has_static_method, const StringName &)
 
 	GDVIRTUAL1RC(Dictionary, _get_method_info, const StringName &)
 	virtual MethodInfo get_method_info(const StringName &p_method) const override {
diff --git a/doc/classes/ScriptExtension.xml b/doc/classes/ScriptExtension.xml
index 9e96a81f7b2..51958a2a2a2 100644
--- a/doc/classes/ScriptExtension.xml
+++ b/doc/classes/ScriptExtension.xml
@@ -123,6 +123,12 @@
 			<description>
 			</description>
 		</method>
+		<method name="_has_static_method" qualifiers="virtual const">
+			<return type="bool" />
+			<param index="0" name="method" type="StringName" />
+			<description>
+			</description>
+		</method>
 		<method name="_inherits_script" qualifiers="virtual const">
 			<return type="bool" />
 			<param index="0" name="script" type="Script" />
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index f10ed0df293..a0213f05dd5 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -346,6 +346,10 @@ bool GDScript::has_method(const StringName &p_method) const {
 	return member_functions.has(p_method);
 }
 
+bool GDScript::has_static_method(const StringName &p_method) const {
+	return member_functions.has(p_method) && member_functions[p_method]->is_static();
+}
+
 MethodInfo GDScript::get_method_info(const StringName &p_method) const {
 	HashMap<StringName, GDScriptFunction *>::ConstIterator E = member_functions.find(p_method);
 	if (!E) {
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h
index 50ccfabcc15..eb8e95025ad 100644
--- a/modules/gdscript/gdscript.h
+++ b/modules/gdscript/gdscript.h
@@ -266,6 +266,7 @@ public:
 
 	virtual void get_script_method_list(List<MethodInfo> *p_list) const override;
 	virtual bool has_method(const StringName &p_method) const override;
+	virtual bool has_static_method(const StringName &p_method) const override;
 	virtual MethodInfo get_method_info(const StringName &p_method) const override;
 
 	virtual void get_script_property_list(List<PropertyInfo> *p_list) const override;
diff --git a/modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.gd b/modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.gd
new file mode 100644
index 00000000000..f6aa58737fe
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.gd
@@ -0,0 +1,12 @@
+# GH-79521
+
+class_name TestStaticMethodAsCallable
+
+static func static_func() -> String:
+	return "Test"
+
+func test():
+	var a: Callable = TestStaticMethodAsCallable.static_func
+	var b: Callable = static_func
+	prints(a.call(), a.is_valid())
+	prints(b.call(), b.is_valid())
diff --git a/modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.out b/modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.out
new file mode 100644
index 00000000000..e6d461b8f95
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.out
@@ -0,0 +1,3 @@
+GDTEST_OK
+Test true
+Test true