From 5909f9f07547895de24fb6965d44c859b69a54a2 Mon Sep 17 00:00:00 2001
From: Dmitrii Maganov <vonagam@gmail.com>
Date: Sun, 27 Nov 2022 09:56:53 +0200
Subject: GDScript: Fix issues with typed arrays

---
 editor/doc_tools.cpp                    |  15 ++-
 editor/editor_properties_array_dict.cpp | 158 +++++++++++---------------------
 editor/editor_properties_array_dict.h   |   2 +
 3 files changed, 59 insertions(+), 116 deletions(-)

(limited to 'editor')

diff --git a/editor/doc_tools.cpp b/editor/doc_tools.cpp
index 5bdef32c60..d71ef78d88 100644
--- a/editor/doc_tools.cpp
+++ b/editor/doc_tools.cpp
@@ -461,7 +461,7 @@ void DocTools::generate(bool p_basic_types) {
 				}
 
 				if (default_value_valid && default_value.get_type() != Variant::OBJECT) {
-					prop.default_value = default_value.get_construct_string().replace("\n", " ");
+					prop.default_value = DocData::get_default_value_string(default_value);
 				}
 
 				StringName setter = ClassDB::get_property_setter(name, E.name);
@@ -591,7 +591,7 @@ void DocTools::generate(bool p_basic_types) {
 					tid.name = E;
 					tid.type = "Color";
 					tid.data_type = "color";
-					tid.default_value = Variant(ThemeDB::get_singleton()->get_default_theme()->get_color(E, cname)).get_construct_string().replace("\n", " ");
+					tid.default_value = DocData::get_default_value_string(ThemeDB::get_singleton()->get_default_theme()->get_color(E, cname));
 					c.theme_properties.push_back(tid);
 				}
 
@@ -772,8 +772,7 @@ void DocTools::generate(bool p_basic_types) {
 
 				int darg_idx = mi.default_arguments.size() - mi.arguments.size() + j;
 				if (darg_idx >= 0) {
-					Variant default_arg = mi.default_arguments[darg_idx];
-					ad.default_value = default_arg.get_construct_string().replace("\n", " ");
+					ad.default_value = DocData::get_default_value_string(mi.default_arguments[darg_idx]);
 				}
 
 				method.arguments.push_back(ad);
@@ -817,7 +816,7 @@ void DocTools::generate(bool p_basic_types) {
 			DocData::PropertyDoc property;
 			property.name = pi.name;
 			property.type = Variant::get_type_name(pi.type);
-			property.default_value = v.get(pi.name).get_construct_string().replace("\n", " ");
+			property.default_value = DocData::get_default_value_string(v.get(pi.name));
 
 			c.properties.push_back(property);
 		}
@@ -948,8 +947,7 @@ void DocTools::generate(bool p_basic_types) {
 
 					int darg_idx = j - (mi.arguments.size() - mi.default_arguments.size());
 					if (darg_idx >= 0) {
-						Variant default_arg = mi.default_arguments[darg_idx];
-						ad.default_value = default_arg.get_construct_string().replace("\n", " ");
+						ad.default_value = DocData::get_default_value_string(mi.default_arguments[darg_idx]);
 					}
 
 					md.arguments.push_back(ad);
@@ -993,8 +991,7 @@ void DocTools::generate(bool p_basic_types) {
 
 					int darg_idx = j - (ai.arguments.size() - ai.default_arguments.size());
 					if (darg_idx >= 0) {
-						Variant default_arg = ai.default_arguments[darg_idx];
-						ad.default_value = default_arg.get_construct_string().replace("\n", " ");
+						ad.default_value = DocData::get_default_value_string(ai.default_arguments[darg_idx]);
 					}
 
 					atd.arguments.push_back(ad);
diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp
index 28c0b047d8..b96ac9dbcb 100644
--- a/editor/editor_properties_array_dict.cpp
+++ b/editor/editor_properties_array_dict.cpp
@@ -158,17 +158,32 @@ EditorPropertyDictionaryObject::EditorPropertyDictionaryObject() {
 
 ///////////////////// ARRAY ///////////////////////////
 
+void EditorPropertyArray::initialize_array(Variant &p_array) {
+	if (array_type == Variant::ARRAY && subtype != Variant::NIL) {
+		Array array;
+		StringName subtype_class;
+		Ref<Script> subtype_script;
+		if (subtype == Variant::OBJECT && !subtype_hint_string.is_empty()) {
+			if (ClassDB::class_exists(subtype_hint_string)) {
+				subtype_class = subtype_hint_string;
+			}
+		}
+		array.set_typed(subtype, subtype_class, subtype_script);
+		p_array = array;
+	} else {
+		VariantInternal::initialize(&p_array, array_type);
+	}
+}
+
 void EditorPropertyArray::_property_changed(const String &p_property, Variant p_value, const String &p_name, bool p_changing) {
 	if (p_property.begins_with("indices")) {
 		int index = p_property.get_slice("/", 1).to_int();
-		Variant array = object->get_array();
+
+		Variant array = object->get_array().duplicate();
 		array.set(index, p_value);
-		emit_changed(get_edited_property(), array, "", true);
 
-		if (array.get_type() == Variant::ARRAY) {
-			array = array.call("duplicate"); // Duplicate, so undo/redo works better.
-		}
 		object->set_array(array);
+		emit_changed(get_edited_property(), array, "", true);
 	}
 }
 
@@ -188,18 +203,12 @@ void EditorPropertyArray::_change_type_menu(int p_index) {
 	}
 
 	Variant value;
-	Callable::CallError ce;
-	Variant::construct(Variant::Type(p_index), value, nullptr, 0, ce);
-	Variant array = object->get_array();
+	VariantInternal::initialize(&value, Variant::Type(p_index));
+
+	Variant array = object->get_array().duplicate();
 	array.set(changing_type_index, value);
 
 	emit_changed(get_edited_property(), array, "", true);
-
-	if (array.get_type() == Variant::ARRAY) {
-		array = array.call("duplicate"); // Duplicate, so undo/redo works better.
-	}
-
-	object->set_array(array);
 	update_property();
 }
 
@@ -234,6 +243,8 @@ void EditorPropertyArray::update_property() {
 		return;
 	}
 
+	object->set_array(array);
+
 	int size = array.call("size");
 	int max_page = MAX(0, size - 1) / page_length;
 	page_index = MIN(page_index, max_page);
@@ -305,12 +316,6 @@ void EditorPropertyArray::update_property() {
 		paginator->update(page_index, max_page);
 		paginator->set_visible(max_page > 0);
 
-		if (array.get_type() == Variant::ARRAY) {
-			array = array.call("duplicate");
-		}
-
-		object->set_array(array);
-
 		int amount = MIN(size - offset, page_length);
 		for (int i = 0; i < amount; i++) {
 			bool reorder_is_from_current_page = reorder_from_index / page_length == page_index;
@@ -401,7 +406,7 @@ void EditorPropertyArray::update_property() {
 }
 
 void EditorPropertyArray::_remove_pressed(int p_index) {
-	Variant array = object->get_array();
+	Variant array = object->get_array().duplicate();
 	array.call("remove_at", p_index);
 
 	emit_changed(get_edited_property(), array, "", false);
@@ -469,8 +474,9 @@ void EditorPropertyArray::drop_data_fw(const Point2 &p_point, const Variant &p_d
 
 		// Handle the case where array is not initialized yet.
 		if (!array.is_array()) {
-			Callable::CallError ce;
-			Variant::construct(array_type, array, nullptr, 0, ce);
+			initialize_array(array);
+		} else {
+			array = array.duplicate();
 		}
 
 		// Loop the file array and add to existing array.
@@ -483,13 +489,7 @@ void EditorPropertyArray::drop_data_fw(const Point2 &p_point, const Variant &p_d
 			}
 		}
 
-		if (array.get_type() == Variant::ARRAY) {
-			array = array.call("duplicate");
-		}
-
 		emit_changed(get_edited_property(), array, "", false);
-		object->set_array(array);
-
 		update_property();
 	}
 }
@@ -536,10 +536,8 @@ void EditorPropertyArray::_notification(int p_what) {
 
 void EditorPropertyArray::_edit_pressed() {
 	Variant array = get_edited_object()->get(get_edited_property());
-	if (!array.is_array()) {
-		Callable::CallError ce;
-		Variant::construct(array_type, array, nullptr, 0, ce);
-
+	if (!array.is_array() && edit->is_pressed()) {
+		initialize_array(array);
 		get_edited_object()->set(get_edited_property(), array);
 	}
 
@@ -560,37 +558,10 @@ void EditorPropertyArray::_length_changed(double p_page) {
 		return;
 	}
 
-	Variant array = object->get_array();
-	int previous_size = array.call("size");
-
+	Variant array = object->get_array().duplicate();
 	array.call("resize", int(p_page));
 
-	if (array.get_type() == Variant::ARRAY) {
-		if (subtype != Variant::NIL) {
-			int size = array.call("size");
-			for (int i = previous_size; i < size; i++) {
-				if (array.get(i).get_type() == Variant::NIL) {
-					Callable::CallError ce;
-					Variant r;
-					Variant::construct(subtype, r, nullptr, 0, ce);
-					array.set(i, r);
-				}
-			}
-		}
-		array = array.call("duplicate"); // Duplicate, so undo/redo works better.
-	} else {
-		int size = array.call("size");
-		// Pool*Array don't initialize their elements, have to do it manually.
-		for (int i = previous_size; i < size; i++) {
-			Callable::CallError ce;
-			Variant r;
-			Variant::construct(array.get(i).get_type(), r, nullptr, 0, ce);
-			array.set(i, r);
-		}
-	}
-
 	emit_changed(get_edited_property(), array, "", false);
-	object->set_array(array);
 	update_property();
 }
 
@@ -677,14 +648,13 @@ void EditorPropertyArray::_reorder_button_up() {
 
 	if (reorder_from_index != reorder_to_index) {
 		// Move the element.
-		Variant array = object->get_array();
+		Variant array = object->get_array().duplicate();
 
 		Variant value_to_move = array.get(reorder_from_index);
 		array.call("remove_at", reorder_from_index);
 		array.call("insert", reorder_to_index, value_to_move);
 
 		emit_changed(get_edited_property(), array, "", false);
-		object->set_array(array);
 		update_property();
 	}
 
@@ -742,14 +712,13 @@ void EditorPropertyDictionary::_property_changed(const String &p_property, Varia
 		object->set_new_item_value(p_value);
 	} else if (p_property.begins_with("indices")) {
 		int index = p_property.get_slice("/", 1).to_int();
-		Dictionary dict = object->get_dict();
+
+		Dictionary dict = object->get_dict().duplicate();
 		Variant key = dict.get_key_at_index(index);
 		dict[key] = p_value;
 
-		emit_changed(get_edited_property(), dict, "", true);
-
-		dict = dict.duplicate(); // Duplicate, so undo/redo works better.
 		object->set_dict(dict);
+		emit_changed(get_edited_property(), dict, "", true);
 	}
 }
 
@@ -769,24 +738,19 @@ void EditorPropertyDictionary::_add_key_value() {
 		return;
 	}
 
-	Dictionary dict = object->get_dict();
-
+	Dictionary dict = object->get_dict().duplicate();
 	dict[object->get_new_item_key()] = object->get_new_item_value();
 	object->set_new_item_key(Variant());
 	object->set_new_item_value(Variant());
 
 	emit_changed(get_edited_property(), dict, "", false);
-
-	dict = dict.duplicate(); // Duplicate, so undo/redo works better.
-	object->set_dict(dict);
 	update_property();
 }
 
 void EditorPropertyDictionary::_change_type_menu(int p_index) {
 	if (changing_type_index < 0) {
 		Variant value;
-		Callable::CallError ce;
-		Variant::construct(Variant::Type(p_index), value, nullptr, 0, ce);
+		VariantInternal::initialize(&value, Variant::Type(p_index));
 		if (changing_type_index == -1) {
 			object->set_new_item_key(value);
 		} else {
@@ -796,12 +760,10 @@ void EditorPropertyDictionary::_change_type_menu(int p_index) {
 		return;
 	}
 
-	Dictionary dict = object->get_dict();
-
+	Dictionary dict = object->get_dict().duplicate();
 	if (p_index < Variant::VARIANT_MAX) {
 		Variant value;
-		Callable::CallError ce;
-		Variant::construct(Variant::Type(p_index), value, nullptr, 0, ce);
+		VariantInternal::initialize(&value, Variant::Type(p_index));
 		Variant key = dict.get_key_at_index(changing_type_index);
 		dict[key] = value;
 	} else {
@@ -810,9 +772,6 @@ void EditorPropertyDictionary::_change_type_menu(int p_index) {
 	}
 
 	emit_changed(get_edited_property(), dict, "", false);
-
-	dict = dict.duplicate(); // Duplicate, so undo/redo works better.
-	object->set_dict(dict);
 	update_property();
 }
 
@@ -836,6 +795,7 @@ void EditorPropertyDictionary::update_property() {
 	}
 
 	Dictionary dict = updated_val;
+	object->set_dict(updated_val);
 
 	edit->set_text(vformat(TTR("Dictionary (size %d)"), dict.size()));
 
@@ -883,9 +843,6 @@ void EditorPropertyDictionary::update_property() {
 		int amount = MIN(size - offset, page_length);
 		int total_amount = page_index == max_page ? amount + 2 : amount; // For the "Add Key/Value Pair" box on last page.
 
-		dict = dict.duplicate();
-
-		object->set_dict(dict);
 		VBoxContainer *add_vbox = nullptr;
 		double default_float_step = EDITOR_GET("interface/inspector/default_float_step");
 
@@ -1225,9 +1182,8 @@ void EditorPropertyDictionary::_notification(int p_what) {
 
 void EditorPropertyDictionary::_edit_pressed() {
 	Variant prop_val = get_edited_object()->get(get_edited_property());
-	if (prop_val.get_type() == Variant::NIL) {
-		Callable::CallError ce;
-		Variant::construct(Variant::DICTIONARY, prop_val, nullptr, 0, ce);
+	if (prop_val.get_type() == Variant::NIL && edit->is_pressed()) {
+		VariantInternal::initialize(&prop_val, Variant::DICTIONARY);
 		get_edited_object()->set(get_edited_property(), prop_val);
 	}
 
@@ -1272,14 +1228,13 @@ EditorPropertyDictionary::EditorPropertyDictionary() {
 void EditorPropertyLocalizableString::_property_changed(const String &p_property, Variant p_value, const String &p_name, bool p_changing) {
 	if (p_property.begins_with("indices")) {
 		int index = p_property.get_slice("/", 1).to_int();
-		Dictionary dict = object->get_dict();
+
+		Dictionary dict = object->get_dict().duplicate();
 		Variant key = dict.get_key_at_index(index);
 		dict[key] = p_value;
 
-		emit_changed(get_edited_property(), dict, "", true);
-
-		dict = dict.duplicate(); // Duplicate, so undo/redo works better.
 		object->set_dict(dict);
+		emit_changed(get_edited_property(), dict, "", true);
 	}
 }
 
@@ -1288,29 +1243,22 @@ void EditorPropertyLocalizableString::_add_locale_popup() {
 }
 
 void EditorPropertyLocalizableString::_add_locale(const String &p_locale) {
-	Dictionary dict = object->get_dict();
-
+	Dictionary dict = object->get_dict().duplicate();
 	object->set_new_item_key(p_locale);
 	object->set_new_item_value(String());
 	dict[object->get_new_item_key()] = object->get_new_item_value();
 
 	emit_changed(get_edited_property(), dict, "", false);
-
-	dict = dict.duplicate(); // Duplicate, so undo/redo works better.
-	object->set_dict(dict);
 	update_property();
 }
 
 void EditorPropertyLocalizableString::_remove_item(Object *p_button, int p_index) {
-	Dictionary dict = object->get_dict();
+	Dictionary dict = object->get_dict().duplicate();
 
 	Variant key = dict.get_key_at_index(p_index);
 	dict.erase(key);
 
 	emit_changed(get_edited_property(), dict, "", false);
-
-	dict = dict.duplicate(); // Duplicate, so undo/redo works better.
-	object->set_dict(dict);
 	update_property();
 }
 
@@ -1330,6 +1278,7 @@ void EditorPropertyLocalizableString::update_property() {
 	}
 
 	Dictionary dict = updated_val;
+	object->set_dict(dict);
 
 	edit->set_text(vformat(TTR("Localizable String (size %d)"), dict.size()));
 
@@ -1376,10 +1325,6 @@ void EditorPropertyLocalizableString::update_property() {
 
 		int amount = MIN(size - offset, page_length);
 
-		dict = dict.duplicate();
-
-		object->set_dict(dict);
-
 		for (int i = 0; i < amount; i++) {
 			String prop_name;
 			Variant key;
@@ -1451,9 +1396,8 @@ void EditorPropertyLocalizableString::_notification(int p_what) {
 
 void EditorPropertyLocalizableString::_edit_pressed() {
 	Variant prop_val = get_edited_object()->get(get_edited_property());
-	if (prop_val.get_type() == Variant::NIL) {
-		Callable::CallError ce;
-		Variant::construct(Variant::DICTIONARY, prop_val, nullptr, 0, ce);
+	if (prop_val.get_type() == Variant::NIL && edit->is_pressed()) {
+		VariantInternal::initialize(&prop_val, Variant::DICTIONARY);
 		get_edited_object()->set(get_edited_property(), prop_val);
 	}
 
diff --git a/editor/editor_properties_array_dict.h b/editor/editor_properties_array_dict.h
index 73a16e3687..3b880c60a8 100644
--- a/editor/editor_properties_array_dict.h
+++ b/editor/editor_properties_array_dict.h
@@ -102,6 +102,8 @@ class EditorPropertyArray : public EditorProperty {
 	HBoxContainer *reorder_selected_element_hbox = nullptr;
 	Button *reorder_selected_button = nullptr;
 
+	void initialize_array(Variant &p_array);
+
 	void _page_changed(int p_page);
 
 	void _reorder_button_gui_input(const Ref<InputEvent> &p_event);
-- 
cgit v1.2.3