github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 09:03:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

completions: simplify prefix computation

Browse Source
This commit is contained in:
Johannes Altmanninger 2019-09-10 08:39:46 +02:00 committed by ridiculousfish
parent 6c5c0a73eb
commit e9e92178a9
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/reader.cpp
View File

@ -1589,21 +1589,15 @@ bool reader_data_t::handle_completions(const std::vector<completion_t> &comp,
}
// We didn't get a common prefix, or we want to print the list anyways.
size_t len, prefix_start = 0;
wcstring prefix;
parse_util_get_parameter_info(el->text, el->position, NULL, &prefix_start, NULL);
assert(el->position >= prefix_start);
len = el->position - prefix_start;
if (will_replace_token || match_type_requires_full_replacement(best_match_type)) {
prefix.clear(); // no prefix
} else if (len <= PREFIX_MAX_LEN) {
prefix.append(el->text, prefix_start, len);
} else if (tok.size() <= PREFIX_MAX_LEN) {
prefix = tok;
} else {
// Append just the end of the string.
prefix = wcstring{get_ellipsis_char()};
prefix.append(el->text, prefix_start + len - PREFIX_MAX_LEN, PREFIX_MAX_LEN);
prefix.append(tok, tok.size() - PREFIX_MAX_LEN, PREFIX_MAX_LEN);
}
// Update the pager data.