xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only rely on ignored_files option to remove hidden files, no built in logic

Browse Source 
Fixes #929
This commit is contained in:
Maxime Coste 2016-11-18 09:37:16 +00:00
parent 8e56917984
commit 67eb19c6d2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/file.cc
View File

@ -401,14 +401,12 @@ CandidateList complete_filename(StringView prefix, const Regex& ignored_regex,
const bool check_ignored_regex = not ignored_regex.empty() and const bool check_ignored_regex = not ignored_regex.empty() and
not regex_match(fileprefix.begin(), fileprefix.end(), ignored_regex); not regex_match(fileprefix.begin(), fileprefix.end(), ignored_regex);
const bool include_hidden = fileprefix.substr(0_byte, 1_byte) == ".";
const bool only_dirs = (flags & FilenameFlags::OnlyDirectories); const bool only_dirs = (flags & FilenameFlags::OnlyDirectories);
auto filter = [&ignored_regex, check_ignored_regex, include_hidden, only_dirs](const dirent& entry, struct stat& st) auto filter = [&ignored_regex, check_ignored_regex, only_dirs](const dirent& entry, struct stat& st)
{ {
StringView name{entry.d_name}; StringView name{entry.d_name};
return (include_hidden or name.substr(0_byte, 1_byte) != ".") and return (not check_ignored_regex or not regex_match(name.begin(), name.end(), ignored_regex)) and
(not check_ignored_regex or not regex_match(name.begin(), name.end(), ignored_regex)) and
(not only_dirs or S_ISDIR(st.st_mode)); (not only_dirs or S_ISDIR(st.st_mode));
}; };
auto files = list_files(parsed_dirname, filter); auto files = list_files(parsed_dirname, filter);