Merge pull request #63552 from RedMser/file-dialog-disambiguate

EditorFileDialog: disambiguate recent/favorite items

editor/editor_file_dialog.cpp

@@ -37,6 +37,7 @@
 #include "core/string/print_string.h"
 #include "dependency_editor.h"
 #include "editor/editor_file_system.h"
+#include "editor/editor_node.h"
 #include "editor/editor_resource_preview.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
@@ -294,11 +295,22 @@ void EditorFileDialog::_post_popup() {
 
 		bool res = (access == ACCESS_RESOURCES);
 		Vector<String> recentd = EditorSettings::get_singleton()->get_recent_dirs();
+		Vector<String> recentd_paths;
+		Vector<String> recentd_names;
+
 		for (int i = 0; i < recentd.size(); i++) {
 			bool cres = recentd[i].begins_with("res://");
 			if (cres != res) {
 				continue;
 			}
+
+			if (!dir_access->dir_exists(recentd[i])) {
+				// Remove invalid directory from the list of Recent directories.
+				recentd.remove_at(i--);
+				continue;
+			}
+
+			// Compute recent directory display text.
 			String name = recentd[i];
 			if (res && name == "res://") {
 				name = "/";
@@ -306,17 +318,18 @@ void EditorFileDialog::_post_popup() {
 				if (name.ends_with("/")) {
 					name = name.substr(0, name.length() - 1);
 				}
-				name = name.get_file() + "/";
-			}
-			bool exists = dir_access->dir_exists(recentd[i]);
-			if (!exists) {
-				// Remove invalid directory from the list of Recent directories.
-				recentd.remove_at(i--);
-			} else {
-				recent->add_item(name, folder);
-				recent->set_item_metadata(-1, recentd[i]);
-				recent->set_item_icon_modulate(-1, folder_color);
+				name = name.get_file();
 			}
+			recentd_paths.append(recentd[i]);
+			recentd_names.append(name);
+		}
+
+		EditorNode::disambiguate_filenames(recentd_paths, recentd_names);
+
+		for (int i = 0; i < recentd_paths.size(); i++) {
+			recent->add_item(recentd_names[i], folder);
+			recent->set_item_metadata(-1, recentd_paths[i]);
+			recent->set_item_icon_modulate(-1, folder_color);
 		}
 		EditorSettings::get_singleton()->set_recent_dirs(recentd);
 
@@ -1329,49 +1342,58 @@ void EditorFileDialog::_update_favorites() {
 	favorite->set_pressed(false);
 
 	Vector<String> favorited = EditorSettings::get_singleton()->get_favorites();
+	Vector<String> favorited_paths;
+	Vector<String> favorited_names;
 
 	bool fav_changed = false;
-	for (int i = favorited.size() - 1; i >= 0; i--) {
-		if (!dir_access->dir_exists(favorited[i])) {
-			favorited.remove_at(i);
-			fav_changed = true;
-		}
-	}
-	if (fav_changed) {
-		EditorSettings::get_singleton()->set_favorites(favorited);
-	}
-
+	int current_favorite = -1;
 	for (int i = 0; i < favorited.size(); i++) {
 		bool cres = favorited[i].begins_with("res://");
 		if (cres != res) {
 			continue;
 		}
-		String name = favorited[i];
-		bool setthis = false;
 
+		if (!dir_access->dir_exists(favorited[i])) {
+			// Remove invalid directory from the list of Favorited directories.
+			favorited.remove_at(i--);
+			fav_changed = true;
+			continue;
+		}
+
+		// Compute favorite display text.
+		String name = favorited[i];
 		if (res && name == "res://") {
 			if (name == current) {
-				setthis = true;
+				current_favorite = favorited_paths.size();
 			}
 			name = "/";
-
-			favorites->add_item(name, folder_icon);
+			favorited_paths.append(favorited[i]);
+			favorited_names.append(name);
 		} else if (name.ends_with("/")) {
 			if (name == current || name == current + "/") {
-				setthis = true;
+				current_favorite = favorited_paths.size();
 			}
 			name = name.substr(0, name.length() - 1);
 			name = name.get_file();
-
-			favorites->add_item(name, folder_icon);
+			favorited_paths.append(favorited[i]);
+			favorited_names.append(name);
 		} else {
-			continue; // We don't handle favorite files here.
+			// Ignore favorited files.
 		}
+	}
+
+	if (fav_changed) {
+		EditorSettings::get_singleton()->set_favorites(favorited);
+	}
+
+	EditorNode::disambiguate_filenames(favorited_paths, favorited_names);
 
-		favorites->set_item_metadata(-1, favorited[i]);
+	for (int i = 0; i < favorited_paths.size(); i++) {
+		favorites->add_item(favorited_names[i], folder_icon);
+		favorites->set_item_metadata(-1, favorited_paths[i]);
 		favorites->set_item_icon_modulate(-1, folder_color);
 
-		if (setthis) {
+		if (i == current_favorite) {
 			favorite->set_pressed(true);
 			favorites->set_current(favorites->get_item_count() - 1);
 			recent->deselect_all();

editor/editor_node.cpp

@@ -216,6 +216,8 @@ EditorNode *EditorNode::singleton = nullptr;
 static const String META_TEXT_TO_COPY = "text_to_copy";
 
 void EditorNode::disambiguate_filenames(const Vector<String> p_full_paths, Vector<String> &r_filenames) {
+	ERR_FAIL_COND_MSG(p_full_paths.size() != r_filenames.size(), vformat("disambiguate_filenames requires two string vectors of same length (%d != %d).", p_full_paths.size(), r_filenames.size()));
+
 	// Keep track of a list of "index sets," i.e. sets of indices
 	// within disambiguated_scene_names which contain the same name.
 	Vector<RBSet<int>> index_sets;
@@ -250,6 +252,13 @@ void EditorNode::disambiguate_filenames(const Vector<String> p_full_paths, Vecto
 					full_path = full_path.substr(0, full_path.rfind("."));
 				}
 
+				// Normalize trailing slashes when normalizing directory names.
+				if (scene_name.rfind("/") == scene_name.length() - 1 && full_path.rfind("/") != full_path.length() - 1) {
+					full_path = full_path + "/";
+				} else if (scene_name.rfind("/") != scene_name.length() - 1 && full_path.rfind("/") == full_path.length() - 1) {
+					scene_name = scene_name + "/";
+				}
+
 				int scene_name_size = scene_name.size();
 				int full_path_size = full_path.size();
 				int difference = full_path_size - scene_name_size;