From 31f790299c1649680b48c00230e89318d864624f Mon Sep 17 00:00:00 2001 From: Lyuma Date: Thu, 26 Aug 2021 20:46:51 -0700 Subject: Use OrderedHashMap for autoloads to preserve order --- modules/gdscript/gdscript_editor.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'modules/gdscript/gdscript_editor.cpp') diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 372a726d71..70e18c6e6c 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -731,9 +731,9 @@ static void _list_available_types(bool p_inherit_only, GDScriptParser::Completio } // Autoload singletons - Map autoloads = ProjectSettings::get_singleton()->get_autoload_list(); - for (const Map::Element *E = autoloads.front(); E != nullptr; E = E->next()) { - const ProjectSettings::AutoloadInfo &info = E->get(); + OrderedHashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + for (OrderedHashMap::Element E = autoloads.front(); E; E = E.next()) { + const ProjectSettings::AutoloadInfo &info = E.get(); if (!info.is_singleton || info.path.get_extension().to_lower() != "gd") { continue; } @@ -1086,12 +1086,12 @@ static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool kwa++; } - Map autoloads = ProjectSettings::get_singleton()->get_autoload_list(); - for (const Map::Element *E = autoloads.front(); E != nullptr; E = E->next()) { - if (!E->value().is_singleton) { + OrderedHashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + for (OrderedHashMap::Element E = autoloads.front(); E; E = E.next()) { + if (!E.value().is_singleton) { continue; } - ScriptCodeCompletionOption option(E->key(), ScriptCodeCompletionOption::KIND_CONSTANT); + ScriptCodeCompletionOption option(E.key(), ScriptCodeCompletionOption::KIND_CONSTANT); r_result.insert(option.display, option); } @@ -1359,12 +1359,12 @@ static bool _guess_expression_type(GDScriptParser::CompletionContext &p_context, r_type = _type_from_variant(GDScriptLanguage::get_singleton()->get_named_globals_map()[which]); found = true; } else { - Map autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + OrderedHashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); - for (Map::Element *E = autoloads.front(); E; E = E->next()) { - String name = E->key(); + for (OrderedHashMap::Element E = autoloads.front(); E; E = E.next()) { + String name = E.key(); if (name == which) { - String script = E->value().path; + String script = E.value().path; if (!script.begins_with("res://")) { script = "res://" + script; @@ -2660,10 +2660,10 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c } // Get autoloads. - Map autoloads = ProjectSettings::get_singleton()->get_autoload_list(); + OrderedHashMap autoloads = ProjectSettings::get_singleton()->get_autoload_list(); - for (Map::Element *E = autoloads.front(); E; E = E->next()) { - String path = "/root/" + E->key(); + for (OrderedHashMap::Element E = autoloads.front(); E; E = E.next()) { + String path = "/root/" + E.key(); ScriptCodeCompletionOption option(path.quote(quote_style), ScriptCodeCompletionOption::KIND_NODE_PATH); options.insert(option.display, option); } -- cgit v1.2.3