Merge pull request #31810 from merumelu/plugin-config-warnings

Warn about all missing keys in plugin.cfg

editor/editor_plugin_settings.cpp

@@ -96,45 +96,59 @@ void EditorPluginSettings::update_plugins() {
 
 		if (err2 != OK) {
 			WARN_PRINTS("Can't load plugin config: " + path);
-		} else if (!cf->has_section_key("plugin", "name")) {
-			WARN_PRINTS("Plugin misses plugin/name: " + path);
-		} else if (!cf->has_section_key("plugin", "author")) {
-			WARN_PRINTS("Plugin misses plugin/author: " + path);
-		} else if (!cf->has_section_key("plugin", "version")) {
-			WARN_PRINTS("Plugin misses plugin/version: " + path);
-		} else if (!cf->has_section_key("plugin", "description")) {
-			WARN_PRINTS("Plugin misses plugin/description: " + path);
-		} else if (!cf->has_section_key("plugin", "script")) {
-			WARN_PRINTS("Plugin misses plugin/script: " + path);
 		} else {
+			bool key_missing = false;
 
-			String d2 = plugins[i];
-			String name = cf->get_value("plugin", "name");
-			String author = cf->get_value("plugin", "author");
-			String version = cf->get_value("plugin", "version");
-			String description = cf->get_value("plugin", "description");
-			String script = cf->get_value("plugin", "script");
-
-			TreeItem *item = plugin_list->create_item(root);
-			item->set_text(0, name);
-			item->set_tooltip(0, "Name: " + name + "\nPath: " + path + "\nMain Script: " + script + "\nDescription: " + description);
-			item->set_metadata(0, d2);
-			item->set_text(1, version);
-			item->set_metadata(1, script);
-			item->set_text(2, author);
-			item->set_metadata(2, description);
-			item->set_cell_mode(3, TreeItem::CELL_MODE_RANGE);
-			item->set_range_config(3, 0, 1, 1);
-			item->set_text(3, "Inactive,Active");
-			item->set_editable(3, true);
-			item->add_button(4, get_icon("Edit", "EditorIcons"), BUTTON_PLUGIN_EDIT, false, TTR("Edit Plugin"));
-
-			if (EditorNode::get_singleton()->is_addon_plugin_enabled(d2)) {
-				item->set_custom_color(3, get_color("success_color", "Editor"));
-				item->set_range(3, 1);
-			} else {
-				item->set_custom_color(3, get_color("disabled_font_color", "Editor"));
-				item->set_range(3, 0);
+			if (!cf->has_section_key("plugin", "name")) {
+				WARN_PRINTS("Plugin config misses \"plugin/name\" key: " + path);
+				key_missing = true;
+			}
+			if (!cf->has_section_key("plugin", "author")) {
+				WARN_PRINTS("Plugin config misses \"plugin/author\" key: " + path);
+				key_missing = true;
+			}
+			if (!cf->has_section_key("plugin", "version")) {
+				WARN_PRINTS("Plugin config misses \"plugin/version\" key: " + path);
+				key_missing = true;
+			}
+			if (!cf->has_section_key("plugin", "description")) {
+				WARN_PRINTS("Plugin config misses \"plugin/description\" key: " + path);
+				key_missing = true;
+			}
+			if (!cf->has_section_key("plugin", "script")) {
+				WARN_PRINTS("Plugin config misses \"plugin/script\" key: " + path);
+				key_missing = true;
+			}
+
+			if (!key_missing) {
+				String d2 = plugins[i];
+				String name = cf->get_value("plugin", "name");
+				String author = cf->get_value("plugin", "author");
+				String version = cf->get_value("plugin", "version");
+				String description = cf->get_value("plugin", "description");
+				String script = cf->get_value("plugin", "script");
+
+				TreeItem *item = plugin_list->create_item(root);
+				item->set_text(0, name);
+				item->set_tooltip(0, TTR("Name:") + " " + name + "\n" + TTR("Path:") + " " + path + "\n" + TTR("Main Script:") + " " + script + "\n" + TTR("Description:") + " " + description);
+				item->set_metadata(0, d2);
+				item->set_text(1, version);
+				item->set_metadata(1, script);
+				item->set_text(2, author);
+				item->set_metadata(2, description);
+				item->set_cell_mode(3, TreeItem::CELL_MODE_RANGE);
+				item->set_range_config(3, 0, 1, 1);
+				item->set_text(3, "Inactive,Active");
+				item->set_editable(3, true);
+				item->add_button(4, get_icon("Edit", "EditorIcons"), BUTTON_PLUGIN_EDIT, false, TTR("Edit Plugin"));
+
+				if (EditorNode::get_singleton()->is_addon_plugin_enabled(d2)) {
+					item->set_custom_color(3, get_color("success_color", "Editor"));
+					item->set_range(3, 1);
+				} else {
+					item->set_custom_color(3, get_color("disabled_font_color", "Editor"));
+					item->set_range(3, 0);
+				}
 			}
 		}
 	}