Merge remote-tracking branch 'krobelus/different-select-cmd-no-dupe'

This commit is contained in:
Maxime Coste 2022-02-15 20:46:38 +11:00
commit 17237fb887

View File

@ -322,7 +322,8 @@ InsertCompletion complete_option(const SelectionList& sels,
candidates.reserve(matches.size()); candidates.reserve(matches.size());
while (candidates.size() < max_count and first != last) while (candidates.size() < max_count and first != last)
{ {
if (candidates.empty() or candidates.back().completion != first->candidate()) if (candidates.empty() or candidates.back().completion != first->candidate()
or candidates.back().on_select != first->on_select)
candidates.push_back({ first->candidate().str(), first->on_select.str(), candidates.push_back({ first->candidate().str(), first->on_select.str(),
std::move(first->menu_entry) }); std::move(first->menu_entry) });
std::pop_heap(first, last--, greater); std::pop_heap(first, last--, greater);