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

In buffer name completion, give priority to filename (not dirname) matches

Browse Source 
First list filename matches, then full path matches to allow fast selection
of buffers in deep hierarchies where queries match the path of every buffers
This commit is contained in:
Maxime Coste 2016-03-02 13:51:50 +00:00
parent 6d5900af16
commit 2df7b1f6da
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/commands.cc
View File

@ -57,13 +57,46 @@ const PerArgumentCommandCompleter filename_completer({
cursor_pos) }; } cursor_pos) }; }
}); });
static CandidateList complete_buffer_name(StringView prefix, ByteCount cursor_pos) static CandidateList complete_buffer_name(StringView query, ByteCount cursor_pos)
{ {
auto c = transformed(BufferManager::instance(), struct RankedMatchAndBuffer : RankedMatch
[](const SafePtr<Buffer>& b) -> const String& {
{ return b->display_name(); }); RankedMatchAndBuffer(const RankedMatch& m, const Buffer* b = nullptr)
: RankedMatch{m}, buffer{b} {}
return complete(prefix, cursor_pos, c); using RankedMatch::operator==;
using RankedMatch::operator<;
const Buffer* buffer;
};
query = query.substr(0, cursor_pos);
Vector<RankedMatchAndBuffer> filename_matches;
Vector<RankedMatchAndBuffer> matches;
for (const auto& buffer : BufferManager::instance())
{
StringView bufname = buffer->display_name();
if (buffer->flags() & Buffer::Flags::File)
{
if (RankedMatch match{split_path(bufname).second, query})
{
filename_matches.emplace_back(match, buffer.get());
continue;
}
}
if (RankedMatch match{bufname, query})
matches.emplace_back(match, buffer.get());
}
std::sort(filename_matches.begin(), filename_matches.end());
std::sort(matches.begin(), matches.end());
CandidateList res;
for (auto& match : filename_matches)
res.push_back(match.buffer->display_name());
for (auto& match : matches)
res.push_back(match.buffer->display_name());
return res;
} }
const PerArgumentCommandCompleter buffer_completer({ const PerArgumentCommandCompleter buffer_completer({