walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

src: Don't show option candidates if full-match or single prefix-match

This commit is contained in:
Tatsuhiro Tsujikawa 2014-01-13 23:51:10 +09:00
parent a54c5bef54
commit 8fdc37ab13
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/util.cc
View File

@ -324,14 +324,26 @@ void show_candidates(const char *unkopt, option *options)
if(*unkopt == '\0') { if(*unkopt == '\0') {
return; return;
} }
int prefix_match = 0;
auto unkoptlen = strlen(unkopt); auto unkoptlen = strlen(unkopt);
auto cands = std::vector<std::pair<int, const char*>>(); auto cands = std::vector<std::pair<int, const char*>>();
for(size_t i = 0; options[i].name != nullptr; ++i) { for(size_t i = 0; options[i].name != nullptr; ++i) {
// Use cost 0 for prefix or suffix match auto optnamelen = strlen(options[i].name);
if(istartsWith(options[i].name, unkopt) || // Use cost 0 for prefix match
(unkoptlen >= 3 && if(istartsWith(options[i].name, options[i].name + optnamelen,
iendsWith(options[i].name, options[i].name + strlen(options[i].name), unkopt, unkopt + unkoptlen)) {
unkopt, unkopt + unkoptlen))) { if(optnamelen == unkoptlen) {
// Exact match, then we don't show any condidates.
return ;
}
++prefix_match;
cands.emplace_back(0, options[i].name);
continue;
}
// Use cost 0 for suffix match, but match at least 3 characters
if(unkoptlen >= 3 &&
iendsWith(options[i].name, options[i].name + optnamelen,
unkopt, unkopt + unkoptlen)) {
cands.emplace_back(0, options[i].name); cands.emplace_back(0, options[i].name);
continue; continue;
} }
@ -339,7 +351,7 @@ void show_candidates(const char *unkopt, option *options)
int sim = levenshtein(unkopt, options[i].name, 0, 2, 1, 3); int sim = levenshtein(unkopt, options[i].name, 0, 2, 1, 3);
cands.emplace_back(sim, options[i].name); cands.emplace_back(sim, options[i].name);
} }
if(cands.empty()) { if(prefix_match == 1 || cands.empty()) {
return; return;
} }
std::sort(std::begin(cands), std::end(cands)); std::sort(std::begin(cands), std::end(cands));