Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-27 20:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct duplicate completion detection

Browse source 
Stop assuming that completions with the same hash are equal.
This commit is contained in:
ridiculousfish 2019-05-04 18:35:22 -07:00
parent 923a7ca0f0
commit 4ce485525e
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/complete.cpp
View file

@ -247,12 +247,16 @@ static bool compare_completions_by_duplicate_arguments(const completion_t &a,
return ad < bd; return ad < bd;
} }
template <class Iterator, class HashFunction> /// Unique the list of completions, without perturbing their order.
static Iterator unique_unsorted(Iterator begin, Iterator end, HashFunction hash) { static void unique_completions_retaining_order(std::vector<completion_t> *comps) {
typedef typename std::iterator_traits<Iterator>::value_type T; std::unordered_set<wcstring> seen;
seen.reserve(comps->size());
std::unordered_set<size_t> temp; auto pred = [&seen](const completion_t &c) {
return std::remove_if(begin, end, [&](const T &val) { return !temp.insert(hash(val)).second; }); // Remove (return true) if insertion fails.
bool inserted = seen.insert(c.completion).second;
return !inserted;
};
comps->erase(std::remove_if(comps->begin(), comps->end(), pred), comps->end());
} }
void completions_sort_and_prioritize(std::vector<completion_t> *comps, void completions_sort_and_prioritize(std::vector<completion_t> *comps,
@ -274,13 +278,11 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
[&](const completion_t &comp) { return comp.match.type > best_type; }), [&](const completion_t &comp) { return comp.match.type > best_type; }),
comps->end()); comps->end());
// Sort, provided COMPLETION_DONT_SORT isn't set // Sort, provided COMPLETE_DONT_SORT isn't set.
stable_sort(comps->begin(), comps->end(), completion_t::is_naturally_less_than); stable_sort(comps->begin(), comps->end(), completion_t::is_naturally_less_than);
// Deduplicate both sorted and unsorted results
comps->erase( // Deduplicate both sorted and unsorted results.
unique_unsorted(comps->begin(), comps->end(), unique_completions_retaining_order(comps);
[](const completion_t &c) { return std::hash<wcstring>{}(c.completion); }),
comps->end());
// Sort the remainder by match type. They're already sorted alphabetically. // Sort the remainder by match type. They're already sorted alphabetically.
stable_sort(comps->begin(), comps->end(), compare_completions_by_match_type); stable_sort(comps->begin(), comps->end(), compare_completions_by_match_type);