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

complete: print long option names for less common ones

Browse Source 
we now print --long options for ones I arbitrarily decided
are less likely to be remembered.

Also fixed the `--wraps` items at the end not being escaped
This commit is contained in:
Aaron Gyes 2019-09-19 04:21:24 -07:00
parent e9ee2fb089
commit 620761b9b9
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/complete.cpp
View File

@ -1662,13 +1662,20 @@ void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_c
/// Print the short switch \c opt, and the argument \c arg to the specified /// Print the short switch \c opt, and the argument \c arg to the specified
/// wcstring, but only if \c argument isn't an empty string. /// wcstring, but only if \c argument isn't an empty string.
static void append_switch(wcstring &out, const wchar_t opt, const wcstring arg) { static void append_switch(wcstring &out, wchar_t opt, const wcstring arg) {
if (arg.empty()) return; if (arg.empty()) return;
append_format(out, L" -%lc %ls", opt, escape_string(arg, ESCAPE_ALL).c_str()); append_format(out, L" -%lc %ls", opt, escape_string(arg, ESCAPE_ALL).c_str());
} }
static void append_switch(wcstring &out, const wchar_t opt) { static void append_switch(wcstring &out, const wcstring opt, const wcstring arg) {
if (arg.empty()) return;
append_format(out, L" --%ls %ls", opt.c_str(), escape_string(arg, ESCAPE_ALL).c_str());
}
static void append_switch(wcstring &out, wchar_t opt) {
append_format(out, L" -%lc", opt); append_format(out, L" -%lc", opt);
} }
static void append_switch(wcstring &out, const wcstring opt) {
append_format(out, L" --%ls", opt.c_str());
}
/// Use by the bare `complete`, loaded completions are printed out as commands /// Use by the bare `complete`, loaded completions are printed out as commands
wcstring complete_print() { wcstring complete_print() {
@ -1690,13 +1697,13 @@ wcstring complete_print() {
if (o.flags & COMPLETE_DONT_SORT) append_switch(out, L'k'); if (o.flags & COMPLETE_DONT_SORT) append_switch(out, L'k');
if (o.result_mode.no_files && o.result_mode.requires_param) { if (o.result_mode.no_files && o.result_mode.requires_param) {
append_switch(out, L'x'); append_switch(out, L"exclusive");
} else if (o.result_mode.no_files) { } else if (o.result_mode.no_files) {
append_switch(out, L'f'); append_switch(out, L"no-files");
} else if (o.result_mode.force_files) { } else if (o.result_mode.force_files) {
append_switch(out, L'F'); append_switch(out, L"force-files");
} else if (o.result_mode.requires_param) { } else if (o.result_mode.requires_param) {
append_switch(out, L'r'); append_switch(out, L"requires-param");
} }
append_switch(out, e.cmd_is_path ? L'p' : L'c', e.cmd); append_switch(out, e.cmd_is_path ? L'p' : L'c', e.cmd);
@ -1728,8 +1735,10 @@ wcstring complete_print() {
for (const auto &entry : *locked_wrappers) { for (const auto &entry : *locked_wrappers) {
const wcstring &src = entry.first; const wcstring &src = entry.first;
for (const wcstring &target : entry.second) { for (const wcstring &target : entry.second) {
append_format(out, L"complete -c %ls --wraps %ls\n", src.c_str(), out.append(L"complete");
target.c_str()); append_switch(out, L'c', src);
append_switch(out, L"wraps", target);
out.append(L"\n");
} }
} }
return out; return out;