h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-16 18:31:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make completion request flags an enum_set

Browse Source
This commit is contained in:
ridiculousfish
2019-05-04 17:55:57 -07:00
parent acd33cbabb
commit 63bdc949ab
5 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/reader.cpp
View File

@@ -1325,7 +1325,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
if (std::wcschr(L"'\"", last_char) && cursor_at_end) return nothing;
// Try normal completions.
completion_request_flags_t complete_flags = COMPLETION_REQUEST_AUTOSUGGESTION;
completion_request_flags_t complete_flags = completion_request_t::autosuggestion;
std::vector<completion_t> completions;
complete(search_string, &completions, complete_flags, *vars);
completions_sort_and_prioritize(&completions, complete_flags);
@@ -2583,9 +2583,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
const wcstring buffcpy = wcstring(cmdsub_begin, token_end);
// std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
complete_flags_t complete_flags = COMPLETION_REQUEST_DEFAULT |
COMPLETION_REQUEST_DESCRIPTIONS |
COMPLETION_REQUEST_FUZZY_MATCH;
completion_request_flags_t complete_flags = {completion_request_t::descriptions,
completion_request_t::fuzzy_match};
complete_func(buffcpy, &rls.comp, complete_flags, vars);
// Munge our completions.