Add working GDScript get_dependencies implementation

Remove stub code from GDScripts' get_dependencies implementation, add working code for finding dependencies from parent classes and constant declarations Fixes godotengine#51717
nfranck-toonboom · Mar 6, 2024 · 6caeeca · 6caeeca
1 parent 9b94c80
commit 6caeeca
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 14 deletions.
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
@@ -2851,22 +2851,53 @@ String ResourceFormatLoaderGDScript::get_resource_type(const String &p_path) con
 }
 
 void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
-	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::READ);
-	ERR_FAIL_COND_MSG(file.is_null(), "Cannot open file '" + p_path + "'.");
-
-	String source = file->get_as_utf8_string();
-	if (source.is_empty()) {
+	Error err;
+	Ref<GDScript> scr = GDScriptCache::get_full_script(p_path, err, "", true);
+	if (err || !scr.is_valid()) {
 		return;
 	}
 
-	GDScriptParser parser;
-	if (OK != parser.parse(source, p_path, false)) {
-		return;
+	if (p_add_types) {
+		Ref<GDScript> base_class = scr->get_base();
+		if (base_class.is_valid()) {
+			p_dependencies->push_back(base_class->get_path());
+		}
 	}
 
-	for (const String &E : parser.get_dependencies()) {
-		p_dependencies->push_back(E);
+	for (KeyValue<StringName, Variant> constant : scr->get_constants()) {
+		switch (constant.value.get_type()) {
+			case Variant::OBJECT: {
+				Ref<Resource> resource = constant.value;
+				if (resource.is_valid())
+					p_dependencies->push_back(resource->get_path());
+			} break;
+			default:
+				break;
+			case Variant::ARRAY: {
+				Array arr = constant.value;
+				for (int i = 0; i < arr.size(); i++) {
+					if (arr[i].get_type() == Variant::OBJECT) {
+						Ref<Resource> resource = arr[i];
+						if (resource.is_valid())
+							p_dependencies->push_back(resource->get_path());
+					}
+				}
+			} break;
+			case Variant::DICTIONARY: {
+				Dictionary dict = constant.value;
+				Array keys = dict.keys();
+				for (int i = 0; i < keys.size(); i++) {
+					if (dict[keys[i]].get_type() == Variant::OBJECT) {
+						Ref<Resource> resource = dict[keys[i]];
+						if (resource.is_valid())
+							p_dependencies->push_back(resource->get_path());
+					}
+				}
+			} break;
+		}
 	}
+
+	// TODO: references to other scripts through their class_name.
 }
 
 Error ResourceFormatSaverGDScript::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {

diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h
@@ -1557,10 +1557,6 @@ class GDScriptParser {
 	bool annotation_exists(const String &p_annotation_name) const;
 
 	const List<ParserError> &get_errors() const { return errors; }
-	const List<String> get_dependencies() const {
-		// TODO: Keep track of deps.
-		return List<String>();
-	}
 #ifdef DEBUG_ENABLED
 	const List<GDScriptWarning> &get_warnings() const { return warnings; }
 	const HashSet<int> &get_unsafe_lines() const { return unsafe_lines; }