From f68ab70a6ae4ddfdf955912af3dcb66284880b4d Mon Sep 17 00:00:00 2001
From: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
Date: Mon, 8 Jul 2024 16:31:00 +0200
Subject: [PATCH] [GDScript] Fix `get_method` for lambda self `Callable`s

---
 modules/gdscript/gdscript_lambda_callable.cpp |  4 ++++
 modules/gdscript/gdscript_lambda_callable.h   |  1 +
 .../runtime/features/lambda_get_method.gd     | 21 +++++++++++++++++++
 .../runtime/features/lambda_get_method.out    |  5 +++++
 4 files changed, 31 insertions(+)
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/lambda_get_method.gd
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/lambda_get_method.out

diff --git a/modules/gdscript/gdscript_lambda_callable.cpp b/modules/gdscript/gdscript_lambda_callable.cpp
index 42b0b066e12..2162a727b3a 100644
--- a/modules/gdscript/gdscript_lambda_callable.cpp
+++ b/modules/gdscript/gdscript_lambda_callable.cpp
@@ -198,6 +198,10 @@ ObjectID GDScriptLambdaSelfCallable::get_object() const {
 	return object->get_instance_id();
 }
 
+StringName GDScriptLambdaSelfCallable::get_method() const {
+	return function->get_name();
+}
+
 int GDScriptLambdaSelfCallable::get_argument_count(bool &r_is_valid) const {
 	if (function == nullptr) {
 		r_is_valid = false;
diff --git a/modules/gdscript/gdscript_lambda_callable.h b/modules/gdscript/gdscript_lambda_callable.h
index 45c02359136..2d27b8d679c 100644
--- a/modules/gdscript/gdscript_lambda_callable.h
+++ b/modules/gdscript/gdscript_lambda_callable.h
@@ -87,6 +87,7 @@ public:
 	CompareEqualFunc get_compare_equal_func() const override;
 	CompareLessFunc get_compare_less_func() const override;
 	ObjectID get_object() const override;
+	StringName get_method() const override;
 	int get_argument_count(bool &r_is_valid) const override;
 	void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const override;
 
diff --git a/modules/gdscript/tests/scripts/runtime/features/lambda_get_method.gd b/modules/gdscript/tests/scripts/runtime/features/lambda_get_method.gd
new file mode 100644
index 00000000000..160e43a797e
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/lambda_get_method.gd
@@ -0,0 +1,21 @@
+# https://github.com/godotengine/godot/issues/94074
+
+func foo():
+	pass
+
+func test():
+	var lambda_self := func test() -> void:
+		foo()
+	var anon_lambda_self := func() -> void:
+		foo()
+
+	print(lambda_self.get_method())  # Should print "test".
+	print(anon_lambda_self.get_method())  # Should print "<anonymous lambda>".
+
+	var lambda_non_self := func test() -> void:
+		pass
+	var anon_lambda_non_self := func() -> void:
+		pass
+
+	print(lambda_non_self.get_method())  # Should print "test".
+	print(anon_lambda_non_self.get_method())  # Should print "<anonymous lambda>".
diff --git a/modules/gdscript/tests/scripts/runtime/features/lambda_get_method.out b/modules/gdscript/tests/scripts/runtime/features/lambda_get_method.out
new file mode 100644
index 00000000000..17ee47fca28
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/lambda_get_method.out
@@ -0,0 +1,5 @@
+GDTEST_OK
+test
+<anonymous lambda>
+test
+<anonymous lambda>