From eb62d241c0555131060efdedae8f1a8986b59351 Mon Sep 17 00:00:00 2001 From: Adam Scott Date: Mon, 21 Nov 2022 23:24:10 -0500 Subject: [PATCH] [godot#61386] Fix autoload scenes implicit types --- modules/gdscript/gdscript_analyzer.cpp | 12 ++++++++++++ modules/gdscript/gdscript_cache.cpp | 25 +++++++++++++++++++++++++ modules/gdscript/gdscript_cache.h | 1 + 3 files changed, 38 insertions(+) diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 3a536b42c1f..f1c022c43ca 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -3120,6 +3120,18 @@ void GDScriptAnalyzer::reduce_identifier(GDScriptParser::IdentifierNode *p_ident result = type_from_metatype(singl_parser->get_parser()->head->get_datatype()); } } + } else if (ResourceLoader::get_resource_type(autoload.path) == "PackedScene") { + Error err = OK; + Ref scr = GDScriptCache::get_packed_scene_script(autoload.path, err); + if (err == OK && scr.is_valid()) { + Ref singl_parser = get_parser_for(scr->get_path()); + if (singl_parser.is_valid()) { + err = singl_parser->raise_status(GDScriptParserRef::INTERFACE_SOLVED); + if (err == OK) { + result = type_from_metatype(singl_parser->get_parser()->head->get_datatype()); + } + } + } } result.is_constant = true; p_identifier->set_datatype(result); diff --git a/modules/gdscript/gdscript_cache.cpp b/modules/gdscript/gdscript_cache.cpp index add36591f3f..4dd7ec49a3b 100644 --- a/modules/gdscript/gdscript_cache.cpp +++ b/modules/gdscript/gdscript_cache.cpp @@ -360,6 +360,31 @@ Ref GDScriptCache::get_packed_scene(const String &p_path, Error &r_ return scene; } +Ref GDScriptCache::get_packed_scene_script(const String &p_path, Error &r_error) { + r_error = OK; + Ref scene = get_packed_scene(p_path, r_error); + + if (r_error != OK) { + return Ref(); + } + + int node_count = scene->get_state()->get_node_count(); + if (node_count == 0) { + return Ref(); + } + + const int ROOT_NODE = 0; + for (int i = 0; i < scene->get_state()->get_node_property_count(ROOT_NODE); i++) { + if (scene->get_state()->get_node_property_name(ROOT_NODE, i) != SNAME("script")) { + continue; + } + + return scene->get_state()->get_node_property_value(ROOT_NODE, i); + } + + return Ref(); +} + void GDScriptCache::clear_unreferenced_packed_scenes() { if (singleton == nullptr) { return; diff --git a/modules/gdscript/gdscript_cache.h b/modules/gdscript/gdscript_cache.h index 2195932aa3e..0f9d87aa67e 100644 --- a/modules/gdscript/gdscript_cache.h +++ b/modules/gdscript/gdscript_cache.h @@ -102,6 +102,7 @@ public: static Error finish_compiling(const String &p_owner); static Ref get_packed_scene(const String &p_path, Error &r_error, const String &p_owner = ""); + static Ref get_packed_scene_script(const String &p_path, Error &r_error); static void clear_unreferenced_packed_scenes(); static bool is_destructing() {