lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

some colors

Browse source
This commit is contained in:
Ben Burdette 2020-03-25 11:20:44 -06:00
parent 3582dc3c88
commit d44c9c5581
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libutil/error.cc
View file

@ -62,7 +62,7 @@ void print_code_lines(string &prefix, NixCode &nix_code)
arrows.append("^"); arrows.append("^");
} }
cout << format("%1% |%2%%3%") % prefix % spaces % arrows; cout << format("%1% |%2%" ANSI_RED "%3%" ANSI_NORMAL) % prefix % spaces % arrows;
} }
@ -90,12 +90,16 @@ void print_error(ErrorInfo &einfo)
{ {
case ErrLevel::elError: case ErrLevel::elError:
{ {
level_string = "error:"; // TODO make red. level_string = ANSI_RED;
level_string += "error:";
level_string += ANSI_NORMAL;
break; break;
} }
case ErrLevel::elWarning: case ErrLevel::elWarning:
{ {
level_string = "warning:"; // TODO make yellow. level_string = ANSI_YELLOW;
level_string += "warning:";
level_string += ANSI_NORMAL;
break; break;
} }
default: default:
@ -113,7 +117,7 @@ void print_error(ErrorInfo &einfo)
dashes.append("-"); dashes.append("-");
// divider. // divider.
cout << format("%1%%2% %3% %4% %5% %6%") cout << format("%1%%2%" ANSI_BLUE " %3% %4% %5% %6%" ANSI_NORMAL)
% prefix % prefix
% level_string % level_string
% "---" % "---"
@ -131,7 +135,8 @@ void print_error(ErrorInfo &einfo)
? string(" ") + showErrLine(*einfo.nixCode->errLine) ? string(" ") + showErrLine(*einfo.nixCode->errLine)
: ""; : "";
cout << format("%1%in file: %2%%3%") % prefix % *einfo.nixCode->nixFile % eline << endl; cout << format("%1%in file: " ANSI_BLUE "%2%%3%" ANSI_NORMAL)
% prefix % *einfo.nixCode->nixFile % eline << endl;
cout << prefix << endl; cout << prefix << endl;
} }
else else

2
tests/errors/main.cc
View file

@ -59,7 +59,7 @@ using namespace nix;
print_error(MkNixError() print_error(MkNixError()
.name("error name") .name("error name")
.description("warning description") .description("error description")
.nixFile("myfile.nix") .nixFile("myfile.nix")
.lineNumber(40) .lineNumber(40)
.columnRange(13,7) .columnRange(13,7)