Merge pull request #73540 from mashumafi/fix-typed-array-add

Fix: Typed arrays aren't working with +

2 files changed, 35 insertions, 0 deletions

diff --git a/modules/gdscript/tests/scripts/runtime/features/typed_array_concatenation.gd b/modules/gdscript/tests/scripts/runtime/features/typed_array_concatenation.gd
new file mode 100644
index 0000000000..ef3ee8d255
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/typed_array_concatenation.gd
@@ -0,0 +1,28 @@
+# https://github.com/godotengine/godot/issues/72948
+
+class Example:
+	extends RefCounted
+
+const const_ints : Array[int] = [1, 2, 3]
+
+func test():
+	var ints: Array[int] = [1, 2, 3]
+	var strings: Array[String] = ["4", "5", "6"]
+
+	var ints_concatenated: Array[int] = ints + ints
+	var strings_concatenated: Array[String] = strings + strings
+	var untyped_concatenated: Array = ints + strings
+	var const_ints_concatenated: Array[int] = const_ints + const_ints
+
+	print(ints_concatenated.get_typed_builtin())
+	print(strings_concatenated.get_typed_builtin())
+	print(untyped_concatenated.get_typed_builtin())
+	print(const_ints_concatenated.get_typed_builtin())
+
+	var objects: Array[Object] = []
+	var objects_concatenated: Array[Object] = objects + objects
+	print(objects_concatenated.get_typed_class_name())
+
+	var examples: Array[Example] = []
+	var examples_concatenated: Array[Example] = examples + examples
+	print(examples_concatenated.get_typed_script() == Example)
diff --git a/modules/gdscript/tests/scripts/runtime/features/typed_array_concatenation.out b/modules/gdscript/tests/scripts/runtime/features/typed_array_concatenation.out
new file mode 100644
index 0000000000..34f1221a78
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/typed_array_concatenation.out
@@ -0,0 +1,7 @@
+GDTEST_OK
+2
+4
+0
+2
+Object
+true