1 files changed, 100 insertions, 81 deletions

diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp
index c60c253a65..7d063e13f9 100644
--- a/editor/script_create_dialog.cpp
+++ b/editor/script_create_dialog.cpp
@@ -37,20 +37,76 @@
 #include "editor/create_dialog.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_file_system.h"
+#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 
+static String _get_parent_class_of_script(String p_path) {
+	if (!ResourceLoader::exists(p_path, "Script")) {
+		return "Object"; // A script eventually inherits from Object.
+	}
+
+	Ref<Script> script = ResourceLoader::load(p_path, "Script");
+	ERR_FAIL_COND_V(script.is_null(), "Object");
+
+	String class_name;
+	Ref<Script> base = script->get_base_script();
+
+	// Inherits from a built-in class.
+	if (base.is_null()) {
+		script->get_language()->get_global_class_name(script->get_path(), &class_name);
+		return class_name;
+	}
+
+	// Inherits from a script that has class_name.
+	class_name = script->get_language()->get_global_class_name(base->get_path());
+	if (!class_name.is_empty()) {
+		return class_name;
+	}
+
+	// Inherits from a plain script.
+	return _get_parent_class_of_script(base->get_path());
+}
+
+static Vector<String> _get_hierarchy(String p_class_name) {
+	Vector<String> hierarchy;
+
+	String class_name = p_class_name;
+	while (true) {
+		// A registered class.
+		if (ClassDB::class_exists(class_name)) {
+			hierarchy.push_back(class_name);
+
+			class_name = ClassDB::get_parent_class(class_name);
+			continue;
+		}
+
+		// A class defined in script with class_name.
+		if (ScriptServer::is_global_class(class_name)) {
+			hierarchy.push_back(class_name);
+
+			Ref<Script> script = EditorNode::get_editor_data().script_class_load_script(class_name);
+			ERR_BREAK(script.is_null());
+			class_name = _get_parent_class_of_script(script->get_path());
+			continue;
+		}
+
+		break;
+	}
+
+	if (hierarchy.is_empty()) {
+		if (p_class_name.is_valid_identifier()) {
+			hierarchy.push_back(p_class_name);
+		}
+		hierarchy.push_back("Object");
+	}
+
+	return hierarchy;
+}
+
 void ScriptCreateDialog::_notification(int p_what) {
 	switch (p_what) {
-		case NOTIFICATION_ENTER_TREE:
-		case NOTIFICATION_THEME_CHANGED: {
-			for (int i = 0; i < ScriptServer::get_language_count(); i++) {
-				Ref<Texture2D> language_icon = get_theme_icon(ScriptServer::get_language(i)->get_type(), SNAME("EditorIcons"));
-				if (language_icon.is_valid()) {
-					language_menu->set_item_icon(i, language_icon);
-				}
-			}
-
+		case NOTIFICATION_ENTER_TREE: {
 			String last_language = EditorSettings::get_singleton()->get_project_metadata("script_setup", "last_selected_language", "");
 			if (!last_language.is_empty()) {
 				for (int i = 0; i < language_menu->get_item_count(); i++) {
@@ -63,9 +119,15 @@ void ScriptCreateDialog::_notification(int p_what) {
 			} else {
 				language_menu->select(default_language);
 			}
-			if (EditorSettings::get_singleton()->has_meta("script_setup/use_script_templates")) {
-				is_using_templates = bool(EditorSettings::get_singleton()->get_meta("script_setup/use_script_templates"));
-				use_templates->set_pressed(is_using_templates);
+
+			[[fallthrough]];
+		}
+		case NOTIFICATION_THEME_CHANGED: {
+			for (int i = 0; i < ScriptServer::get_language_count(); i++) {
+				Ref<Texture2D> language_icon = get_theme_icon(ScriptServer::get_language(i)->get_type(), SNAME("EditorIcons"));
+				if (language_icon.is_valid()) {
+					language_menu->set_item_icon(i, language_icon);
+				}
 			}
 
 			path_button->set_icon(get_theme_icon(SNAME("Folder"), SNAME("EditorIcons")));
@@ -183,23 +245,22 @@ String ScriptCreateDialog::_validate_path(const String &p_path, bool p_file_must
 		return TTR("Path is not local.");
 	}
 
-	DirAccess *d = DirAccess::create(DirAccess::ACCESS_RESOURCES);
-	if (d->change_dir(p.get_base_dir()) != OK) {
-		memdelete(d);
-		return TTR("Base path is invalid.");
+	{
+		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+		if (da->change_dir(p.get_base_dir()) != OK) {
+			return TTR("Base path is invalid.");
+		}
 	}
-	memdelete(d);
 
-	// Check if file exists.
-	DirAccess *f = DirAccess::create(DirAccess::ACCESS_RESOURCES);
-	if (f->dir_exists(p)) {
-		memdelete(f);
-		return TTR("A directory with the same name exists.");
-	} else if (p_file_must_exist && !f->file_exists(p)) {
-		memdelete(f);
-		return TTR("File does not exist.");
+	{
+		// Check if file exists.
+		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+		if (da->dir_exists(p)) {
+			return TTR("A directory with the same name exists.");
+		} else if (p_file_must_exist && !da->file_exists(p)) {
+			return TTR("File does not exist.");
+		}
 	}
-	memdelete(f);
 
 	// Check file extension.
 	String extension = p.get_extension();
@@ -269,13 +330,8 @@ void ScriptCreateDialog::_template_changed(int p_template) {
 			dic_templates_project[parent_name->get_text()] = sinfo.get_hash();
 			EditorSettings::get_singleton()->set_project_metadata("script_setup", "templates_dictionary", dic_templates_project);
 		} else {
-			// Save template into to editor dictionary (not a project template).
-			Dictionary dic_templates;
-			if (EditorSettings::get_singleton()->has_meta("script_setup/templates_dictionary")) {
-				dic_templates = (Dictionary)EditorSettings::get_singleton()->get_meta("script_setup/templates_dictionary");
-			}
-			dic_templates[parent_name->get_text()] = sinfo.get_hash();
-			EditorSettings::get_singleton()->set_meta("script_setup/templates_dictionary", dic_templates);
+			// Save template info to editor dictionary (not a project template).
+			templates_dictionary[parent_name->get_text()] = sinfo.get_hash();
 			// Remove template from project dictionary as we last used an editor level template.
 			Dictionary dic_templates_project = EditorSettings::get_singleton()->get_project_metadata("script_setup", "templates_dictionary", Dictionary());
 			if (dic_templates_project.has(parent_name->get_text())) {
@@ -353,18 +409,6 @@ void ScriptCreateDialog::_load_exist() {
 	hide();
 }
 
-Vector<String> ScriptCreateDialog::get_hierarchy(String p_object) const {
-	Vector<String> hierarchy;
-	hierarchy.append(p_object);
-
-	String parent_class = ClassDB::get_parent_class(p_object);
-	while (parent_class.is_valid_identifier()) {
-		hierarchy.append(parent_class);
-		parent_class = ClassDB::get_parent_class(parent_class);
-	}
-	return hierarchy;
-}
-
 void ScriptCreateDialog::_language_changed(int l) {
 	language = ScriptServer::get_language(l);
 
@@ -428,7 +472,6 @@ void ScriptCreateDialog::_built_in_pressed() {
 
 void ScriptCreateDialog::_use_template_pressed() {
 	is_using_templates = use_templates->is_pressed();
-	EditorSettings::get_singleton()->set_meta("script_setup/use_script_templates", is_using_templates);
 	_update_dialog();
 }
 
@@ -504,13 +547,12 @@ void ScriptCreateDialog::_path_changed(const String &p_path) {
 	}
 
 	// Check if file exists.
-	DirAccess *f = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 	String p = ProjectSettings::get_singleton()->localize_path(p_path.strip_edges());
-	if (f->file_exists(p)) {
+	if (da->file_exists(p)) {
 		is_new_script_created = false;
 		_msg_path_valid(true, TTR("File exists, it will be reused."));
 	}
-	memdelete(f);
 
 	is_path_valid = true;
 	_update_dialog();
@@ -547,20 +589,16 @@ void ScriptCreateDialog::_update_template_menu() {
 	if (is_language_using_templates) {
 		// Get the latest templates used for each type of node from project settings then global settings.
 		Dictionary last_local_templates = EditorSettings::get_singleton()->get_project_metadata("script_setup", "templates_dictionary", Dictionary());
-		Dictionary last_global_templates;
-		if (EditorSettings::get_singleton()->has_meta("script_setup/templates_dictionary")) {
-			last_global_templates = (Dictionary)EditorSettings::get_singleton()->get_meta("script_setup/templates_dictionary");
-		}
 		String inherits_base_type = parent_name->get_text();
 
-		// If it inherits from a script, select Object instead.
+		// If it inherits from a script, get its parent class first.
 		if (inherits_base_type[0] == '"') {
-			inherits_base_type = "Object";
+			inherits_base_type = _get_parent_class_of_script(inherits_base_type.unquote());
 		}
 
 		// Get all ancestor node for selected base node.
 		// There templates will also fit the base node.
-		Vector<String> hierarchy = get_hierarchy(inherits_base_type);
+		Vector<String> hierarchy = _get_hierarchy(inherits_base_type);
 		int last_used_template = -1;
 		int preselected_template = -1;
 		int previous_ancestor_level = -1;
@@ -591,7 +629,7 @@ void ScriptCreateDialog::_update_template_menu() {
 				if (!templates_found.is_empty()) {
 					if (!separator) {
 						template_menu->add_separator();
-						template_menu->set_item_text(template_menu->get_item_count() - 1, display_name);
+						template_menu->set_item_text(-1, display_name);
 						separator = true;
 					}
 					for (ScriptLanguage::ScriptTemplate &t : templates_found) {
@@ -605,7 +643,7 @@ void ScriptCreateDialog::_update_template_menu() {
 						// Check for last used template for this node in project settings then in global settings.
 						if (last_local_templates.has(parent_name->get_text()) && t.get_hash() == String(last_local_templates[parent_name->get_text()])) {
 							last_used_template = id;
-						} else if (last_used_template == -1 && last_global_templates.has(parent_name->get_text()) && t.get_hash() == String(last_global_templates[parent_name->get_text()])) {
+						} else if (last_used_template == -1 && templates_dictionary.has(parent_name->get_text()) && t.get_hash() == String(templates_dictionary[parent_name->get_text()])) {
 							last_used_template = id;
 						}
 						t.id = id;
@@ -786,8 +824,8 @@ Vector<ScriptLanguage::ScriptTemplate> ScriptCreateDialog::_get_user_templates(c
 
 	String dir_path = p_dir.plus_file(p_object);
 
-	DirAccess *d = DirAccess::open(dir_path);
-	if (d) {
+	Ref<DirAccess> d = DirAccess::open(dir_path);
+	if (d.is_valid()) {
 		d->list_dir_begin();
 		String file = d->get_next();
 		while (file != String()) {
@@ -797,7 +835,6 @@ Vector<ScriptLanguage::ScriptTemplate> ScriptCreateDialog::_get_user_templates(c
 			file = d->get_next();
 		}
 		d->list_dir_end();
-		memdelete(d);
 	}
 	return user_templates;
 }
@@ -821,7 +858,7 @@ ScriptLanguage::ScriptTemplate ScriptCreateDialog::_parse_template(const ScriptL
 
 	// Parse file for meta-information and script content
 	Error err;
-	FileAccess *file = FileAccess::open(p_path.plus_file(p_filename), FileAccess::READ, &err);
+	Ref<FileAccess> file = FileAccess::open(p_path.plus_file(p_filename), FileAccess::READ, &err);
 	if (!err) {
 		while (!file->eof_reached()) {
 			String line = file->get_line();
@@ -853,8 +890,6 @@ ScriptLanguage::ScriptTemplate ScriptCreateDialog::_parse_template(const ScriptL
 				script_template.content += line.replace("\t", "_TS_") + "\n";
 			}
 		}
-		file->close();
-		memdelete(file);
 	}
 
 	script_template.content = script_template.content.lstrip("\n");
@@ -977,7 +1012,6 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	hb->add_child(parent_browse_button);
 	gc->add_child(memnew(Label(TTR("Inherits:"))));
 	gc->add_child(hb);
-	is_browsing_parent = false;
 
 	/* Class Name */
 
@@ -988,8 +1022,6 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	gc->add_child(class_name);
 
 	/* Templates */
-
-	is_using_templates = true;
 	gc->add_child(memnew(Label(TTR("Template:"))));
 	HBoxContainer *template_hb = memnew(HBoxContainer);
 	template_hb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
@@ -1030,7 +1062,6 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	Label *label = memnew(Label(TTR("Path:")));
 	gc->add_child(label);
 	gc->add_child(hb);
-	re_check_path = false;
 	path_controls[0] = label;
 	path_controls[1] = hb;
 
@@ -1038,6 +1069,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
 
 	internal_name = memnew(LineEdit);
 	internal_name->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	internal_name->connect("text_submitted", callable_mp(this, &ScriptCreateDialog::_path_submitted));
 	label = memnew(Label(TTR("Name:")));
 	gc->add_child(label);
 	gc->add_child(internal_name);
@@ -1066,17 +1098,4 @@ ScriptCreateDialog::ScriptCreateDialog() {
 
 	set_hide_on_ok(false);
 	set_title(TTR("Attach Node Script"));
-
-	is_parent_name_valid = false;
-	is_class_name_valid = false;
-	is_path_valid = false;
-
-	has_named_classes = false;
-	supports_built_in = false;
-	can_inherit_from_file = false;
-	is_built_in = false;
-	built_in_enabled = true;
-	load_enabled = true;
-
-	is_new_script_created = true;
 }