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

Completion: Use a heap to gather the best matches instead of sorting

Browse Source 
Generalize the behaviour of `shell-candidates` to insert completion,
gather the best 100 matches by using a heap and poping max a hundred
times.
This commit is contained in:
Maxime Coste 2017-12-21 12:55:29 +11:00
parent a38d6cc3f0
commit 9b83589b18
2 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/commands.cc
View File

@ -978,8 +978,7 @@ void define_command(const ParametersParser& parser, Context& context, const Shel
constexpr size_t max_count = 100;
// Gather best max_count matches
auto greater = [](const RankedMatch& lhs,
const RankedMatch& rhs) { return rhs < lhs; };
auto greater = [](auto& lhs, auto& rhs) { return rhs < lhs; };
auto first = matches.begin(), last = matches.end();
std::make_heap(first, last, greater);
CandidateList res;

46
src/insert_completer.cc
View File

@ -165,29 +165,35 @@ InsertCompletion complete_word(const SelectionList& sels, const OptionManager& o
matches.emplace_back(match, nullptr);
unordered_erase(matches, prefix);
std::sort(matches.begin(), matches.end());
matches.erase(std::unique(matches.begin(), matches.end()), matches.end());
const auto longest = accumulate(matches, 0_char,
[](const CharCount& lhs, const RankedMatchAndBuffer& rhs)
{ return std::max(lhs, rhs.candidate().char_length()); });
constexpr size_t max_count = 100;
// Gather best max_count matches
auto greater = [](auto& lhs, auto& rhs) { return rhs < lhs; };
auto first = matches.begin(), last = matches.end();
std::make_heap(first, last, greater);
InsertCompletion::CandidateList candidates;
candidates.reserve(matches.size());
for (auto& m : matches)
candidates.reserve(std::min(matches.size(), max_count));
while (candidates.size() < max_count and first != last)
{
if (candidates.empty() or candidates.back().completion != first->candidate())
{
DisplayLine menu_entry;
if (m.buffer)
if (first->buffer)
{
const auto pad_len = longest + 1 - m.candidate().char_length();
menu_entry.push_back(m.candidate().str());
const auto pad_len = longest + 1 - first->candidate().char_length();
menu_entry.push_back(first->candidate().str());
menu_entry.push_back(String{' ', pad_len});
menu_entry.push_back({ m.buffer->display_name(), get_face("MenuInfo") });
menu_entry.push_back({ first->buffer->display_name(), get_face("MenuInfo") });
}
else
menu_entry.push_back(m.candidate().str());
menu_entry.push_back(first->candidate().str());
candidates.push_back({m.candidate().str(), "", std::move(menu_entry)});
candidates.push_back({first->candidate().str(), "", std::move(menu_entry)});
}
std::pop_heap(first, last--, greater);
}
return { std::move(candidates), word_begin, cursor_pos, buffer.timestamp() };
@ -313,12 +319,22 @@ InsertCompletion complete_option(const SelectionList& sels,
matches.push_back(std::move(match));
}
}
std::sort(matches.begin(), matches.end());
constexpr size_t max_count = 100;
// Gather best max_count matches
auto greater = [](auto& lhs, auto& rhs) { return rhs < lhs; };
auto first = matches.begin(), last = matches.end();
std::make_heap(first, last, greater);
InsertCompletion::CandidateList candidates;
candidates.reserve(std::min(matches.size(), max_count));
candidates.reserve(matches.size());
for (auto& match : matches)
candidates.push_back({ match.candidate().str(), match.docstring.str(),
std::move(match.menu_entry) });
while (candidates.size() < max_count and first != last)
{
if (candidates.empty() or candidates.back().completion != first->candidate())
candidates.push_back({ first->candidate().str(), first->docstring.str(),
std::move(first->menu_entry) });
std::pop_heap(first, last--, greater);
}
return { std::move(candidates), coord, end, timestamp };
}