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

Make complete() return the completion list directly

Browse Source 
Returning it through a pointer was a remnant of pre C++-11 days.
This commit is contained in:
ridiculousfish
2020-01-15 16:41:30 -08:00
parent 4bb18eaf42
commit db98ee13a9
6 changed files with 61 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/reader.cpp
View File

@@ -1325,8 +1325,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
// Try normal completions.
completion_request_flags_t complete_flags = completion_request_t::autosuggestion;
completion_list_t completions;
complete(search_string, &completions, complete_flags, *vars, nullptr);
completion_list_t completions = complete(search_string, complete_flags, *vars, nullptr);
completions_sort_and_prioritize(&completions, complete_flags);
if (!completions.empty()) {
const completion_t &comp = completions.at(0);
@@ -2567,7 +2566,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
// std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
completion_request_flags_t complete_flags = {completion_request_t::descriptions,
completion_request_t::fuzzy_match};
complete_func(buffcpy, &rls.comp, complete_flags, vars, parser_ref);
rls.comp = complete_func(buffcpy, complete_flags, vars, parser_ref);
// User-supplied completions may have changed the commandline - prevent buffer
// overflow.