diff options
author | R. Alex Hofer <rofer@google.com> | 2024-04-20 10:22:06 -0400 |
---|---|---|
committer | R. Alex Hofer <rofer@google.com> | 2024-04-20 13:29:27 -0400 |
commit | 245217699030a0c4aa273cd698f9fc5b5b4e7337 (patch) | |
tree | 6a4c88c56c4639f3d80835f6954bc6c27246de35 /modules/gdscript/language_server | |
parent | 4a0160241fd0c1e874e297f6b08676cf0761e5e8 (diff) | |
download | redot-engine-245217699030a0c4aa273cd698f9fc5b5b4e7337.tar.gz |
Have GDScriptWorkspace::list_script_files respect .gdignore.
Diffstat (limited to 'modules/gdscript/language_server')
-rw-r--r-- | modules/gdscript/language_server/gdscript_workspace.cpp | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp index 853a8e0f19..a63d32ef30 100644 --- a/modules/gdscript/language_server/gdscript_workspace.cpp +++ b/modules/gdscript/language_server/gdscript_workspace.cpp @@ -233,18 +233,25 @@ void GDScriptWorkspace::reload_all_workspace_scripts() { void GDScriptWorkspace::list_script_files(const String &p_root_dir, List<String> &r_files) { Error err; Ref<DirAccess> dir = DirAccess::open(p_root_dir, &err); - if (OK == err) { - dir->list_dir_begin(); - String file_name = dir->get_next(); - while (file_name.length()) { - if (dir->current_is_dir() && file_name != "." && file_name != ".." && file_name != "./") { - list_script_files(p_root_dir.path_join(file_name), r_files); - } else if (file_name.ends_with(".gd")) { - String script_file = p_root_dir.path_join(file_name); - r_files.push_back(script_file); - } - file_name = dir->get_next(); + if (OK != err) { + return; + } + + // Ignore scripts in directories with a .gdignore file. + if (dir->file_exists(".gdignore")) { + return; + } + + dir->list_dir_begin(); + String file_name = dir->get_next(); + while (file_name.length()) { + if (dir->current_is_dir() && file_name != "." && file_name != ".." && file_name != "./") { + list_script_files(p_root_dir.path_join(file_name), r_files); + } else if (file_name.ends_with(".gd")) { + String script_file = p_root_dir.path_join(file_name); + r_files.push_back(script_file); } + file_name = dir->get_next(); } } |