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

builtin set: make error messages more consistent.

Browse Source 
Now uses the same macro other builtins use for a missing -e arg,
and the error message show the short or long option as it was used.

e.g. before
    $ set -e
    set: Erase needs a variable name

after
    $ set --erase
    set: --erase: option requires an argument
    $ set -e
    set: -e: option requires an argument
This commit is contained in:
Aaron Gyes 2022-08-14 15:34:58 -07:00
parent 8416a52255
commit aacc71e585
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/builtins/set.cpp
View File

@ -80,9 +80,8 @@ static const struct woption long_options[] = {{L"export", no_argument, nullptr,
{}}; {}};
// Hint for invalid path operation with a colon. // Hint for invalid path operation with a colon.
#define BUILTIN_SET_MISMATCHED_ARGS _(L"%ls: You provided %d indexes but %d values\n") #define BUILTIN_SET_MISMATCHED_ARGS _(L"%ls: given %d indexes but %d values\n")
#define BUILTIN_SET_ERASE_NO_VAR _(L"%ls: Erase needs a variable name\n") #define BUILTIN_SET_ARRAY_BOUNDS_ERR _(L"%ls: array index out of bounds\n")
#define BUILTIN_SET_ARRAY_BOUNDS_ERR _(L"%ls: Array index out of bounds\n")
#define BUILTIN_SET_UVAR_ERR \ #define BUILTIN_SET_UVAR_ERR \
_(L"%ls: Universal variable '%ls' is shadowed by the global variable of the same name.\n") _(L"%ls: Universal variable '%ls' is shadowed by the global variable of the same name.\n")
@ -193,9 +192,8 @@ static int parse_cmd_opts(set_cmd_opts_t &opts, int *optind, //!OCLINT(high ncs
return STATUS_CMD_OK; return STATUS_CMD_OK;
} }
static int validate_cmd_opts(const wchar_t *cmd, static int validate_cmd_opts(const wchar_t *cmd, const set_cmd_opts_t &opts, int argc,
const set_cmd_opts_t &opts, //!OCLINT(npath complexity) const wchar_t * argv[], parser_t &parser, io_streams_t &streams) {
int argc, parser_t &parser, io_streams_t &streams) {
// Can't query and erase or list. // Can't query and erase or list.
if (opts.query && (opts.erase || opts.list)) { if (opts.query && (opts.erase || opts.list)) {
streams.err.append_format(BUILTIN_ERR_COMBO, cmd); streams.err.append_format(BUILTIN_ERR_COMBO, cmd);
@ -247,7 +245,7 @@ static int validate_cmd_opts(const wchar_t *cmd,
} }
if (argc == 0 && opts.erase) { if (argc == 0 && opts.erase) {
streams.err.append_format(BUILTIN_SET_ERASE_NO_VAR, cmd); streams.err.append_format(BUILTIN_ERR_MISSING, cmd, argv[-1]);
builtin_print_error_trailer(parser, streams.err, cmd); builtin_print_error_trailer(parser, streams.err, cmd);
return STATUS_INVALID_ARGS; return STATUS_INVALID_ARGS;
} }
@ -821,7 +819,7 @@ maybe_t<int> builtin_set(parser_t &parser, io_streams_t &streams, const wchar_t
return STATUS_CMD_OK; return STATUS_CMD_OK;
} }
retval = validate_cmd_opts(cmd, opts, argc, parser, streams); retval = validate_cmd_opts(cmd, opts, argc, argv, parser, streams);
if (retval != STATUS_CMD_OK) return retval; if (retval != STATUS_CMD_OK) return retval;
if (opts.query) { if (opts.query) {