Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Print "^^" for a 2-wide error

Browse source
This commit is contained in:
Fabian Boehm 2022-08-11 18:15:15 +02:00
parent eaf92918e6
commit c1bf06d5b1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/parse_tree.cpp
View file

@ -132,7 +132,7 @@ wcstring parse_error_t::describe_with_prefix(const wcstring &src, const wcstring
// ^~~^
// With a "^" under the start and end, and squiggles in-between.
auto width = fish_wcswidth(src.c_str() + source_start, source_length);
if (width > 2) {
if (width >= 2) {
// Subtract one for each of the carets - this is important in case
// the starting char has a width of > 1.
result.append(width - 2, L'~');

2
tests/checks/redirect.fish
View file

@ -32,7 +32,7 @@ echo noclobber &>>?$tmpdir/file.txt
eval "echo foo |& false"
#CHECKERR: {{.*}} |& is not valid. In fish, use &| to pipe both stdout and stderr.
#CHECKERR: echo foo |& false
#CHECKERR: ^
#CHECKERR: ^^
# Ensure that redirection empty data still creates the file.
rm -f $tmpdir/file.txt