Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bravely remove string_fuzzy_match_t::compare

Browse source 
This is used to decide which fuzzy match is better, however it is used
only in wildcard expansion and not in actual completion ranking or
anywhere else where it could matter. Try removing the compare() call
and implementation.

What compare() did specially was compare distances, e.g. it ranks
lib as better than libexec when expanding /u/l/b. But the tests did not
exercise this so it's hard to know if it's working. In preparation for a
refactoring, remove it.
This commit is contained in:
ridiculousfish 2020-11-27 20:34:47 -08:00
parent ac1ee6f1fd
commit 20b98294ba
3 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/wcstringutil.cpp
View file

@ -202,25 +202,6 @@ string_fuzzy_match_t string_fuzzy_match_string(const wcstring &string,
return result; return result;
} }
template <typename T>
static inline int compare_ints(T a, T b) {
if (a < b) return -1;
if (a == b) return 0;
return 1;
}
/// Compare types; if the types match, compare distances.
int string_fuzzy_match_t::compare(const string_fuzzy_match_t &rhs) const {
if (this->type != rhs.type) {
return compare_ints(this->type, rhs.type);
} else if (this->match_distance_first != rhs.match_distance_first) {
return compare_ints(this->match_distance_first, rhs.match_distance_first);
} else if (this->match_distance_second != rhs.match_distance_second) {
return compare_ints(this->match_distance_second, rhs.match_distance_second);
}
return 0; // equal
}
template <bool Fuzzy, typename T> template <bool Fuzzy, typename T>
size_t ifind_impl(const T &haystack, const T &needle) { size_t ifind_impl(const T &haystack, const T &needle) {
using char_t = typename T::value_type; using char_t = typename T::value_type;

3
src/wcstringutil.h
View file

@ -111,9 +111,6 @@ struct string_fuzzy_match_t {
// Constructor. // Constructor.
explicit string_fuzzy_match_t(enum fuzzy_type_t t, size_t distance_first = 0, explicit string_fuzzy_match_t(enum fuzzy_type_t t, size_t distance_first = 0,
size_t distance_second = 0); size_t distance_second = 0);
// Return -1, 0, 1 if this match is (respectively) better than, equal to, or worse than rhs.
int compare(const string_fuzzy_match_t &rhs) const;
}; };
/// Compute a fuzzy match for a string. If maximum_match is not fuzzy_match_t::none, limit the type /// Compute a fuzzy match for a string. If maximum_match is not fuzzy_match_t::none, limit the type

3
src/wildcard.cpp
View file

@ -851,7 +851,8 @@ void wildcard_expander_t::expand_literal_intermediate_segment_with_fuzz(const wc
c->prepend_token_prefix(child_prefix); c->prepend_token_prefix(child_prefix);
} }
// And every match must be made at least as fuzzy as ours. // And every match must be made at least as fuzzy as ours.
if (match.compare(c->match) > 0) { // TODO: justify this, tests do not exercise it yet.
if (match.type > c->match.type) {
// Our match is fuzzier. // Our match is fuzzier.
c->match = match; c->match = match;
} }