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

Avoid visiting the same directory multiple times in insert filename completion

Browse Source
This commit is contained in:
Maxime Coste 2018-03-25 20:28:26 +11:00
parent 6d3fe30bf6
commit 59c883d02f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/insert_completer.cc
View File

@ -239,16 +239,17 @@ InsertCompletion complete_filename(const SelectionList& sels,
} }
else else
{ {
Vector<String> visited_dirs;
for (auto dir : options["path"].get<StringList>()) for (auto dir : options["path"].get<StringList>())
{ {
dir = real_path(parse_filename(dir, (buffer.flags() & Buffer::Flags::File) ?
split_path(buffer.name()).first : StringView{}));
if (not dir.empty() and dir.back() != '/') if (not dir.empty() and dir.back() != '/')
dir += '/'; dir += '/';
if (dir.substr(0, 2_byte) == "%/")
{ if (contains(visited_dirs, dir))
if (not (buffer.flags() & Buffer::Flags::File))
continue; continue;
dir = split_path(buffer.name()).first.str() + '/' + dir.substr(2_byte);
}
for (auto& filename : Kakoune::complete_filename(dir + prefix, for (auto& filename : Kakoune::complete_filename(dir + prefix,
options["ignored_files"].get<Regex>())) options["ignored_files"].get<Regex>()))
@ -256,6 +257,8 @@ InsertCompletion complete_filename(const SelectionList& sels,
StringView candidate = filename.substr(dir.length()); StringView candidate = filename.substr(dir.length());
candidates.push_back({ candidate.str(), "", candidate.str() }); candidates.push_back({ candidate.str(), "", candidate.str() });
} }
visited_dirs.push_back(std::move(dir));
} }
} }
if (candidates.empty()) if (candidates.empty())