GDScript: Fix some lambda bugs

6 files changed, 196 insertions, 62 deletions

diff --git a/modules/gdscript/tests/scripts/runtime/features/member_info.gd b/modules/gdscript/tests/scripts/runtime/features/member_info.gd
index 50f840cef3..805ea42455 100644
--- a/modules/gdscript/tests/scripts/runtime/features/member_info.gd
+++ b/modules/gdscript/tests/scripts/runtime/features/member_info.gd
@@ -5,6 +5,8 @@ class MyClass:
 
 enum MyEnum {}
 
+const Utils = preload("../../utils.notest.gd")
+
 static var test_static_var_untyped
 static var test_static_var_weak_null = null
 static var test_static_var_weak_int = 1
@@ -58,68 +60,13 @@ func test():
 	var script: Script = get_script()
 	for property in script.get_property_list():
 		if str(property.name).begins_with("test_"):
-			if not (property.usage & PROPERTY_USAGE_SCRIPT_VARIABLE):
-				print("Error: Missing `PROPERTY_USAGE_SCRIPT_VARIABLE` flag.")
-			print("static var ", property.name, ": ", get_type(property))
+			print(Utils.get_property_signature(property, true))
 	for property in get_property_list():
 		if str(property.name).begins_with("test_"):
-			if not (property.usage & PROPERTY_USAGE_SCRIPT_VARIABLE):
-				print("Error: Missing `PROPERTY_USAGE_SCRIPT_VARIABLE` flag.")
-			print("var ", property.name, ": ", get_type(property))
+			print(Utils.get_property_signature(property))
 	for method in get_method_list():
 		if str(method.name).begins_with("test_"):
-			print(get_signature(method))
+			print(Utils.get_method_signature(method))
 	for method in get_signal_list():
 		if str(method.name).begins_with("test_"):
-			print(get_signature(method, true))
-
-func get_type(property: Dictionary, is_return: bool = false) -> String:
-	match property.type:
-		TYPE_NIL:
-			if property.usage & PROPERTY_USAGE_NIL_IS_VARIANT:
-				return "Variant"
-			return "void" if is_return else "null"
-		TYPE_BOOL:
-			return "bool"
-		TYPE_INT:
-			if property.usage & PROPERTY_USAGE_CLASS_IS_ENUM:
-				return property.class_name
-			return "int"
-		TYPE_STRING:
-			return "String"
-		TYPE_DICTIONARY:
-			return "Dictionary"
-		TYPE_ARRAY:
-			if property.hint == PROPERTY_HINT_ARRAY_TYPE:
-				return "Array[%s]" % property.hint_string
-			return "Array"
-		TYPE_OBJECT:
-			if not str(property.class_name).is_empty():
-				return property.class_name
-			return "Object"
-	return "<error>"
-
-func get_signature(method: Dictionary, is_signal: bool = false) -> String:
-	var result: String = ""
-	if method.flags & METHOD_FLAG_STATIC:
-		result += "static "
-	result += ("signal " if is_signal else "func ") + method.name + "("
-
-	var args: Array[Dictionary] = method.args
-	var default_args: Array = method.default_args
-	var mandatory_argc: int = args.size() - default_args.size()
-	for i in args.size():
-		if i > 0:
-			result += ", "
-		var arg: Dictionary = args[i]
-		result += arg.name + ": " + get_type(arg)
-		if i >= mandatory_argc:
-			result += " = " + var_to_str(default_args[i - mandatory_argc])
-
-	result += ")"
-	if is_signal:
-		if get_type(method.return, true) != "void":
-			print("Error: Signal return type must be `void`.")
-	else:
-		result += " -> " + get_type(method.return, true)
-	return result
+			print(Utils.get_method_signature(method, true))
diff --git a/modules/gdscript/tests/scripts/runtime/features/member_info.out b/modules/gdscript/tests/scripts/runtime/features/member_info.out
index 7c826ac05a..3a91507da9 100644
--- a/modules/gdscript/tests/scripts/runtime/features/member_info.out
+++ b/modules/gdscript/tests/scripts/runtime/features/member_info.out
@@ -6,13 +6,13 @@ static var test_static_var_hard_int: int
 var test_var_untyped: Variant
 var test_var_weak_null: Variant
 var test_var_weak_int: Variant
-var test_var_weak_int_exported: int
+@export var test_var_weak_int_exported: int
 var test_var_weak_variant_type: Variant
-var test_var_weak_variant_type_exported: Variant.Type
+@export var test_var_weak_variant_type_exported: Variant.Type
 var test_var_hard_variant: Variant
 var test_var_hard_int: int
 var test_var_hard_variant_type: Variant.Type
-var test_var_hard_variant_type_exported: Variant.Type
+@export var test_var_hard_variant_type_exported: Variant.Type
 var test_var_hard_node_process_mode: Node.ProcessMode
 var test_var_hard_my_enum: TestMemberInfo.MyEnum
 var test_var_hard_array: Array
diff --git a/modules/gdscript/tests/scripts/runtime/features/metatypes.gd b/modules/gdscript/tests/scripts/runtime/features/metatypes.gd
new file mode 100644
index 0000000000..6c5df32ffe
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/metatypes.gd
@@ -0,0 +1,36 @@
+class MyClass:
+	const TEST = 10
+
+enum MyEnum {A, B, C}
+
+const Utils = preload("../../utils.notest.gd")
+const Other = preload("./metatypes.notest.gd")
+
+var test_native := JSON
+var test_script := Other
+var test_class := MyClass
+var test_enum := MyEnum
+
+func check_gdscript_native_class(value: Variant) -> void:
+	print(var_to_str(value).get_slice(",", 0).trim_prefix("Object("))
+
+func check_gdscript(value: GDScript) -> void:
+	print(value.get_class())
+
+func check_enum(value: Dictionary) -> void:
+	print(value)
+
+func test():
+	for property in get_property_list():
+		if str(property.name).begins_with("test_"):
+			print(Utils.get_property_signature(property))
+
+	check_gdscript_native_class(test_native)
+	check_gdscript(test_script)
+	check_gdscript(test_class)
+	check_enum(test_enum)
+
+	print(test_native.stringify([]))
+	print(test_script.TEST)
+	print(test_class.TEST)
+	print(test_enum.keys())
diff --git a/modules/gdscript/tests/scripts/runtime/features/metatypes.notest.gd b/modules/gdscript/tests/scripts/runtime/features/metatypes.notest.gd
new file mode 100644
index 0000000000..e6a591b927
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/metatypes.notest.gd
@@ -0,0 +1 @@
+const TEST = 100
diff --git a/modules/gdscript/tests/scripts/runtime/features/metatypes.out b/modules/gdscript/tests/scripts/runtime/features/metatypes.out
new file mode 100644
index 0000000000..352d1caa59
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/metatypes.out
@@ -0,0 +1,13 @@
+GDTEST_OK
+var test_native: GDScriptNativeClass
+var test_script: GDScript
+var test_class: GDScript
+var test_enum: Dictionary
+GDScriptNativeClass
+GDScript
+GDScript
+{ "A": 0, "B": 1, "C": 2 }
+[]
+100
+10
+["A", "B", "C"]
diff --git a/modules/gdscript/tests/scripts/utils.notest.gd b/modules/gdscript/tests/scripts/utils.notest.gd
new file mode 100644
index 0000000000..50444e62a1
--- /dev/null
+++ b/modules/gdscript/tests/scripts/utils.notest.gd
@@ -0,0 +1,137 @@
+static func get_type(property: Dictionary, is_return: bool = false) -> String:
+	match property.type:
+		TYPE_NIL:
+			if property.usage & PROPERTY_USAGE_NIL_IS_VARIANT:
+				return "Variant"
+			return "void" if is_return else "null"
+		TYPE_INT:
+			if property.usage & PROPERTY_USAGE_CLASS_IS_ENUM:
+				if property.class_name == &"":
+					return "<unknown enum>"
+				return property.class_name
+		TYPE_ARRAY:
+			if property.hint == PROPERTY_HINT_ARRAY_TYPE:
+				if str(property.hint_string).is_empty():
+					return "Array[<unknown type>]"
+				return "Array[%s]" % property.hint_string
+		TYPE_OBJECT:
+			if not str(property.class_name).is_empty():
+				return property.class_name
+	return variant_get_type_name(property.type)
+
+static func get_property_signature(property: Dictionary, is_static: bool = false) -> String:
+	var result: String = ""
+	if not (property.usage & PROPERTY_USAGE_SCRIPT_VARIABLE):
+		printerr("Missing `PROPERTY_USAGE_SCRIPT_VARIABLE` flag.")
+	if property.usage & PROPERTY_USAGE_DEFAULT:
+		result += "@export "
+	if is_static:
+		result += "static "
+	result += "var " + property.name + ": " + get_type(property)
+	return result
+
+static func get_method_signature(method: Dictionary, is_signal: bool = false) -> String:
+	var result: String = ""
+	if method.flags & METHOD_FLAG_STATIC:
+		result += "static "
+	result += ("signal " if is_signal else "func ") + method.name + "("
+
+	var args: Array[Dictionary] = method.args
+	var default_args: Array = method.default_args
+	var mandatory_argc: int = args.size() - default_args.size()
+	for i in args.size():
+		if i > 0:
+			result += ", "
+		var arg: Dictionary = args[i]
+		result += arg.name + ": " + get_type(arg)
+		if i >= mandatory_argc:
+			result += " = " + var_to_str(default_args[i - mandatory_argc])
+
+	result += ")"
+	if is_signal:
+		if get_type(method.return, true) != "void":
+			printerr("Signal return type must be `void`.")
+	else:
+		result += " -> " + get_type(method.return, true)
+	return result
+
+static func variant_get_type_name(type: Variant.Type) -> String:
+	match type:
+		TYPE_NIL:
+			return "Nil" # `Nil` in core, `null` in GDScript.
+		TYPE_BOOL:
+			return "bool"
+		TYPE_INT:
+			return "int"
+		TYPE_FLOAT:
+			return "float"
+		TYPE_STRING:
+			return "String"
+		TYPE_VECTOR2:
+			return "Vector2"
+		TYPE_VECTOR2I:
+			return "Vector2i"
+		TYPE_RECT2:
+			return "Rect2"
+		TYPE_RECT2I:
+			return "Rect2i"
+		TYPE_VECTOR3:
+			return "Vector3"
+		TYPE_VECTOR3I:
+			return "Vector3i"
+		TYPE_TRANSFORM2D:
+			return "Transform2D"
+		TYPE_VECTOR4:
+			return "Vector4"
+		TYPE_VECTOR4I:
+			return "Vector4i"
+		TYPE_PLANE:
+			return "Plane"
+		TYPE_QUATERNION:
+			return "Quaternion"
+		TYPE_AABB:
+			return "AABB"
+		TYPE_BASIS:
+			return "Basis"
+		TYPE_TRANSFORM3D:
+			return "Transform3D"
+		TYPE_PROJECTION:
+			return "Projection"
+		TYPE_COLOR:
+			return "Color"
+		TYPE_STRING_NAME:
+			return "StringName"
+		TYPE_NODE_PATH:
+			return "NodePath"
+		TYPE_RID:
+			return "RID"
+		TYPE_OBJECT:
+			return "Object"
+		TYPE_CALLABLE:
+			return "Callable"
+		TYPE_SIGNAL:
+			return "Signal"
+		TYPE_DICTIONARY:
+			return "Dictionary"
+		TYPE_ARRAY:
+			return "Array"
+		TYPE_PACKED_BYTE_ARRAY:
+			return "PackedByteArray"
+		TYPE_PACKED_INT32_ARRAY:
+			return "PackedInt32Array"
+		TYPE_PACKED_INT64_ARRAY:
+			return "PackedInt64Array"
+		TYPE_PACKED_FLOAT32_ARRAY:
+			return "PackedFloat32Array"
+		TYPE_PACKED_FLOAT64_ARRAY:
+			return "PackedFloat64Array"
+		TYPE_PACKED_STRING_ARRAY:
+			return "PackedStringArray"
+		TYPE_PACKED_VECTOR2_ARRAY:
+			return "PackedVector2Array"
+		TYPE_PACKED_VECTOR3_ARRAY:
+			return "PackedVector3Array"
+		TYPE_PACKED_COLOR_ARRAY:
+			return "PackedColorArray"
+	push_error("Argument `type` is invalid. Use `TYPE_*` constants.")
+	return "<invalid type>"