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

Tweak error reporting in new parser to use fewer lines

Browse Source
This commit is contained in:
ridiculousfish
2014-02-17 14:51:51 -08:00
parent 2253c57628
commit 2e1024d275
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
parser.cpp
View File

@@ -3002,20 +3002,24 @@ void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &erro
assert(err.source_start <= src.size());
size_t which_line = 1 + std::count(src.begin(), src.begin() + err.source_start, L'\n');
// Don't include the caret if we're interactive, this is the first line of text, and our source is at its beginning, because then it's obvious
bool skip_caret = (get_is_interactive() && which_line == 1 && err.source_start == 0);
wcstring prefix;
const wchar_t *filename = this->current_filename();
if (filename)
{
append_format(*output, _(L"fish: line %lu of %ls:\n"), which_line, user_presentable_path(filename).c_str());
prefix = format_string(_(L"%ls (line %lu): "), user_presentable_path(filename).c_str(), which_line);
//append_format(*output, _(L"%ls (line %lu):\n"), user_presentable_path(filename).c_str(), which_line);
}
else
{
output->append(L"fish: ");
prefix = L"fish: ";
//output->append(L"fish: ");
}
// Don't include the caret if we're interactive, this is the first line of text, and our source is at its beginning, because then it's obvious
bool skip_caret = (get_is_interactive() && which_line == 1 && err.source_start == 0);
output->append(err.describe(src, skip_caret));
output->append(err.describe_with_prefix(src, prefix, skip_caret));
output->push_back(L'\n');
this->stack_trace(0, *output);