konevsa/fish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Also print proper caret for too many arguments

Browse Source 
This case is handled specially for unknown reasons and was missed in #6030.
This commit is contained in:
Fabian Homborg 2021-12-24 16:08:08 +01:00
parent 45b302839b
commit 77bac22741
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/builtins/test.cpp
View File

@ -560,9 +560,12 @@ unique_ptr<expression> test_parser::parse_args(const wcstring_list_t &args, wcst
// Handle errors.
// For now we only show the first error.
if (!parser.errors.empty()) {
if (!parser.errors.empty() || result->range.end < args.size()) {
int narg = 0;
int len_to_err = 0;
if (parser.errors.empty()) {
parser.error_idx = result->range.end;
}
wcstring commandline;
for (const wcstring &arg : args) {
if (narg > 0) {
@ -576,7 +579,13 @@ unique_ptr<expression> test_parser::parse_args(const wcstring_list_t &args, wcst
}
err.append(program_name);
err.append(L": ");
err.append(parser.errors.at(0));
if (!parser.errors.empty()) {
err.append(parser.errors.at(0));
} else {
append_format(err, L"unexpected argument at index %lu: '%ls'",
static_cast<unsigned long>(result->range.end) + 1,
args.at(result->range.end).c_str());
}
err.push_back(L'\n');
err.append(commandline);
err.push_back(L'\n');
@ -588,11 +597,6 @@ unique_ptr<expression> test_parser::parse_args(const wcstring_list_t &args, wcst
// parse_expression().
assert(result->range.end <= args.size());
if (result->range.end < args.size()) {
if (err.empty()) {
append_format(err, L"%ls: unexpected argument at index %lu: '%ls'\n", program_name,
static_cast<unsigned long>(result->range.end) + 1,
args.at(result->range.end).c_str());
}
result.reset(nullptr);
}
}

8
tests/checks/test.fish
View File

@ -51,3 +51,11 @@ t 5,2
# CHECKERR: ^
# CHECKERR: in function 't' with arguments '5,2'
# CHECKERR: called on line {{\d+}} of file {{.*}}test.fish
test -x /usr/bin/go /usr/local/bin/go
# CHECKERR: test: unexpected argument at index 3: '/usr/local/bin/go'
# CHECKERR: -x /usr/bin/go /usr/local/bin/go
# CHECKERR: {{ \^}}
# CHECKERR: {{.*}}test.fish (line {{\d+}}):
# CHECKERR: test -x /usr/bin/go /usr/local/bin/go
# CHECKERR: ^