authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-04 09:15:17-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2017-12-04 09:15:17-05:00
log67e6d9bc30dabc295262b1aee8fe5eb044ba5cdc
treea109b552cc30b78fc058b8f4a8fd80c8c344a8ba
parent76f3bdfff8224144e7b57748eb8eda2001d0308d
parentfea016afc0c1102a4847f4e5676260b14d81096e
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #644 from Dubhead/Dubhead-fix-message-color

Fix the color of compiler messages for light-themed terminal.

3 files changed, 10 insertions(+), 4 deletions(-)

src/errmsg.cpp+4-4
......@@ -24,20 +24,20 @@ static void print_err_msg_type(ErrorMsg *err, ErrColor color, ErrType err_type)
2424 bool is_tty = os_stderr_tty();
2525 if (color == ErrColorOn || (color == ErrColorAuto && is_tty)) {
2626 if (err_type == ErrTypeError) {
27 os_stderr_set_color(TermColorWhite);
27 os_stderr_set_color(TermColorBold);
2828 fprintf(stderr, "%s:%" ZIG_PRI_usize ":%" ZIG_PRI_usize ": ", path, line, col);
2929 os_stderr_set_color(TermColorRed);
3030 fprintf(stderr, "error:");
31 os_stderr_set_color(TermColorWhite);
31 os_stderr_set_color(TermColorBold);
3232 fprintf(stderr, " %s", text);
3333 os_stderr_set_color(TermColorReset);
3434 fprintf(stderr, "\n");
3535 } else if (err_type == ErrTypeNote) {
36 os_stderr_set_color(TermColorWhite);
36 os_stderr_set_color(TermColorBold);
3737 fprintf(stderr, "%s:%" ZIG_PRI_usize ":%" ZIG_PRI_usize ": ", path, line, col);
3838 os_stderr_set_color(TermColorCyan);
3939 fprintf(stderr, "note:");
40 os_stderr_set_color(TermColorWhite);
40 os_stderr_set_color(TermColorBold);
4141 fprintf(stderr, " %s", text);
4242 os_stderr_set_color(TermColorReset);
4343 fprintf(stderr, "\n");
src/os.cpp+5
......@@ -931,6 +931,7 @@ int os_self_exe_path(Buf *out_path) {
931931#define VT_GREEN "\x1b[32;1m"
932932#define VT_CYAN "\x1b[36;1m"
933933#define VT_WHITE "\x1b[37;1m"
934#define VT_BOLD "\x1b[0;1m"
934935#define VT_RESET "\x1b[0m"
935936
936937static void set_color_posix(TermColor color) {
......@@ -947,6 +948,9 @@ static void set_color_posix(TermColor color) {
947948 case TermColorWhite:
948949 fprintf(stderr, VT_WHITE);
949950 break;
951 case TermColorBold:
952 fprintf(stderr, VT_BOLD);
953 break;
950954 case TermColorReset:
951955 fprintf(stderr, VT_RESET);
952956 break;
......@@ -989,6 +993,7 @@ void os_stderr_set_color(TermColor color) {
989993 SetConsoleTextAttribute(stderr_handle, FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_INTENSITY);
990994 break;
991995 case TermColorWhite:
996 case TermColorBold:
992997 SetConsoleTextAttribute(stderr_handle,
993998 FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE|FOREGROUND_INTENSITY);
994999 break;
src/os.hpp+1
......@@ -21,6 +21,7 @@ enum TermColor {
2121 TermColorGreen,
2222 TermColorCyan,
2323 TermColorWhite,
24 TermColorBold,
2425 TermColorReset,
2526};
2627