godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix reimport parsing dependencies incorrectly

Browse Source
This commit is contained in:
Jordyfel 2024-06-30 04:38:04 +03:00
parent 4ab8fb8093
commit 325081cb48
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_file_system.cpp
View File

@ -724,8 +724,9 @@ bool EditorFileSystem::_update_scan_actions() {
//must reimport //must reimport
reimports.push_back(full_path); reimports.push_back(full_path);
Vector<String> dependencies = _get_dependencies(full_path); Vector<String> dependencies = _get_dependencies(full_path);
for (const String &dependency_path : dependencies) { for (const String &dep : dependencies) {
if (import_extensions.has(dependency_path.get_extension())) { const String &dependency_path = dep.contains("::") ? dep.get_slice("::", 0) : dep;
if (import_extensions.has(dep.get_extension())) {
reimports.push_back(dependency_path); reimports.push_back(dependency_path);
} }
} }
@ -1748,7 +1749,8 @@ String EditorFileSystem::_get_global_script_class(const String &p_type, const St
void EditorFileSystem::_update_file_icon_path(EditorFileSystemDirectory::FileInfo *file_info) { void EditorFileSystem::_update_file_icon_path(EditorFileSystemDirectory::FileInfo *file_info) {
String icon_path; String icon_path;
if (file_info->script_class_icon_path.is_empty() && !file_info->deps.is_empty()) { if (file_info->script_class_icon_path.is_empty() && !file_info->deps.is_empty()) {
const String &script_path = file_info->deps[0]; // Assuming the first dependency is a script. const String &script_dep = file_info->deps[0]; // Assuming the first dependency is a script.
const String &script_path = script_dep.contains("::") ? script_dep.get_slice("::", 2) : script_dep;
if (!script_path.is_empty()) { if (!script_path.is_empty()) {
String *cached = file_icon_cache.getptr(script_path); String *cached = file_icon_cache.getptr(script_path);
if (cached) { if (cached) {