github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Complete all available commands on empty commandline

Browse Source
This commit is contained in:
Johannes Altmanninger 2019-11-03 23:55:54 +01:00
parent 4c73382231
commit 277fca9c6a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/complete.cpp
View File

@ -673,8 +673,6 @@ static wcstring complete_function_desc(const wcstring &fn) {
/// ///
/// \param str_cmd the command string to find completions for /// \param str_cmd the command string to find completions for
void completer_t::complete_cmd(const wcstring &str_cmd) { void completer_t::complete_cmd(const wcstring &str_cmd) {
if (str_cmd.empty()) return;
std::vector<completion_t> possible_comp; std::vector<completion_t> possible_comp;
// Append all possible executables // Append all possible executables
@ -697,8 +695,9 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
vars, parser, NULL); vars, parser, NULL);
UNUSED(ignore); UNUSED(ignore);
if (str_cmd.find(L'/') == wcstring::npos && str_cmd.at(0) != L'~') { if (str_cmd.empty() || (str_cmd.find(L'/') == wcstring::npos && str_cmd.at(0) != L'~')) {
wcstring_list_t names = function_get_names(str_cmd.at(0) == L'_'); bool include_hidden = !str_cmd.empty() && str_cmd.at(0) == L'_';
wcstring_list_t names = function_get_names(include_hidden);
for (wcstring &name : names) { for (wcstring &name : names) {
// Append all known matching functions // Append all known matching functions
append_completion(&possible_comp, std::move(name)); append_completion(&possible_comp, std::move(name));
@ -1485,9 +1484,8 @@ void completer_t::perform() {
// Don't autosuggest anything based on the empty string (generalizes #1631). // Don't autosuggest anything based on the empty string (generalizes #1631).
if (flags & completion_request_t::autosuggestion) return; if (flags & completion_request_t::autosuggestion) return;
// fish has been using generic completion of filenames relative to the current directory. complete_cmd(L"");
// TODO there's some discussion in issue #5418 on what else we could do here. complete_abbr(L"");
complete_param_expand(L"", true /* do_file */);
return; return;
} }