h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-05 00:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some error messages. Don't show the line in the error message

Browse Source 
if it's the first line and we're interactive, since then it's obvious
This commit is contained in:
ridiculousfish
2013-12-16 16:52:23 -08:00
parent 0e421ea31d
commit 3e9153d955
6 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
reader.cpp
View File

@@ -2478,22 +2478,15 @@ int reader_shell_test(const wchar_t *b)
if (res & PARSER_TEST_ERROR)
{
const int tmp[1] = {0};
const int tmp2[1] = {0};
const wcstring empty;
s_write(&data->screen,
empty,
empty,
empty,
0,
tmp,
tmp2,
0);
wcstring sb;
parser_t::principal_parser().get_backtrace(bstr, errors, &sb);
fwprintf(stderr, L"%ls", sb.c_str());
// ensure we end with a newline. Also add an initial newline, because it's likely the user just hit enter and so there's junk on the current line
if (! string_suffixes_string(L"\n", sb))
{
sb.push_back(L'\n');
}
fwprintf(stderr, L"\n%ls", sb.c_str());
}
return res;
}