From 614a51f2933ec0448ea49cf870ba31e0d71a374a Mon Sep 17 00:00:00 2001
From: Daylily-Zeleen <daylily-zeleen@foxmail.com>
Date: Thu, 5 Dec 2024 14:24:39 +0800
Subject: [PATCH] Optimize callable's stringify text.

---
 core/variant/callable.cpp                     | 8 ++++++--
 modules/gdscript/gdscript_lambda_callable.cpp | 6 +++---
 modules/gdscript/gdscript_rpc_callable.cpp    | 9 ++++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/core/variant/callable.cpp b/core/variant/callable.cpp
index ddeea271184..402dc6823c0 100644
--- a/core/variant/callable.cpp
+++ b/core/variant/callable.cpp
@@ -361,8 +361,12 @@ Callable::operator String() const {
 		if (base) {
 			String class_name = base->get_class();
 			Ref<Script> script = base->get_script();
-			if (script.is_valid() && script->get_path().is_resource_file()) {
-				class_name += "(" + script->get_path().get_file() + ")";
+			if (script.is_valid()) {
+				if (!script->get_global_name().is_empty()) {
+					class_name += "(" + script->get_global_name() + ")";
+				} else if (script->get_path().is_resource_file()) {
+					class_name += "(" + script->get_path().get_file() + ")";
+				}
 			}
 			return class_name + "::" + String(method);
 		} else {
diff --git a/modules/gdscript/gdscript_lambda_callable.cpp b/modules/gdscript/gdscript_lambda_callable.cpp
index d6fd5d043bf..d767324b428 100644
--- a/modules/gdscript/gdscript_lambda_callable.cpp
+++ b/modules/gdscript/gdscript_lambda_callable.cpp
@@ -178,12 +178,12 @@ uint32_t GDScriptLambdaSelfCallable::hash() const {
 
 String GDScriptLambdaSelfCallable::get_as_text() const {
 	if (function == nullptr) {
-		return "<invalid lambda>";
+		return "<invalid self lambda>";
 	}
 	if (function->get_name() != StringName()) {
-		return function->get_name().operator String() + "(lambda)";
+		return function->get_name().operator String() + "(self lambda)";
 	}
-	return "(anonymous lambda)";
+	return "(anonymous self lambda)";
 }
 
 CallableCustom::CompareEqualFunc GDScriptLambdaSelfCallable::get_compare_equal_func() const {
diff --git a/modules/gdscript/gdscript_rpc_callable.cpp b/modules/gdscript/gdscript_rpc_callable.cpp
index 3139371eb52..05629b1c004 100644
--- a/modules/gdscript/gdscript_rpc_callable.cpp
+++ b/modules/gdscript/gdscript_rpc_callable.cpp
@@ -49,7 +49,14 @@ uint32_t GDScriptRPCCallable::hash() const {
 String GDScriptRPCCallable::get_as_text() const {
 	String class_name = object->get_class();
 	Ref<Script> script = object->get_script();
-	return class_name + "(" + script->get_path().get_file() + ")::" + String(method) + " (rpc)";
+	if (script.is_valid()) {
+		if (!script->get_global_name().is_empty()) {
+			class_name += "(" + script->get_global_name() + ")";
+		} else if (script->get_path().is_resource_file()) {
+			class_name += "(" + script->get_path().get_file() + ")";
+		}
+	}
+	return class_name + "::" + String(method) + " (rpc)";
 }
 
 CallableCustom::CompareEqualFunc GDScriptRPCCallable::get_compare_equal_func() const {