asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #85943 from kuruk-mm/fix/find-in-files

Browse source 
Stop the searching of `find in files` in folders that have `.gdignore`
This commit is contained in:
Rémi Verschelde 2024-01-03 15:44:07 +01:00
commit 6665a629c3
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
editor/find_in_files.cpp
View file

@ -172,9 +172,11 @@ void FindInFiles::_iterate() {
_current_dir = _current_dir.path_join(folder_name); _current_dir = _current_dir.path_join(folder_name);
PackedStringArray sub_dirs; PackedStringArray sub_dirs;
_scan_dir("res://" + _current_dir, sub_dirs); PackedStringArray files_to_scan;
_scan_dir("res://" + _current_dir, sub_dirs, files_to_scan);
_folders_stack.push_back(sub_dirs); _folders_stack.push_back(sub_dirs);
_files_to_scan.append_array(files_to_scan);
} else { } else {
// Go back one level. // Go back one level.
@ -211,7 +213,7 @@ float FindInFiles::get_progress() const {
return 0; return 0;
} }
void FindInFiles::_scan_dir(String path, PackedStringArray &out_folders) { void FindInFiles::_scan_dir(String path, PackedStringArray &out_folders, PackedStringArray &out_files_to_scan) {
Ref<DirAccess> dir = DirAccess::open(path); Ref<DirAccess> dir = DirAccess::open(path);
if (dir.is_null()) { if (dir.is_null()) {
print_verbose("Cannot open directory! " + path); print_verbose("Cannot open directory! " + path);
@ -227,8 +229,11 @@ void FindInFiles::_scan_dir(String path, PackedStringArray &out_folders) {
break; break;
} }
// If there is a .gdignore file in the directory, skip searching the directory. // If there is a .gdignore file in the directory, clear all the files/folders
// to be searched on this path and skip searching the directory.
if (file == ".gdignore") { if (file == ".gdignore") {
out_folders.clear();
out_files_to_scan.clear();
break; break;
} }
@ -247,7 +252,7 @@ void FindInFiles::_scan_dir(String path, PackedStringArray &out_folders) {
} else { } else {
String file_ext = file.get_extension(); String file_ext = file.get_extension();
if (_extension_filter.has(file_ext)) { if (_extension_filter.has(file_ext)) {
_files_to_scan.push_back(path.path_join(file)); out_files_to_scan.push_back(path.path_join(file));
} }
} }
} }

2
editor/find_in_files.h
View file

@ -67,7 +67,7 @@ protected:
private: private:
void _process(); void _process();
void _iterate(); void _iterate();
void _scan_dir(String path, PackedStringArray &out_folders); void _scan_dir(String path, PackedStringArray &out_folders, PackedStringArray &out_files_to_scan);
void _scan_file(String fpath); void _scan_file(String fpath);
// Config // Config