From e627fcb0e66421d52526d844c01065ba0e043c5e Mon Sep 17 00:00:00 2001
From: Laytan Laats <laytanlaats@hotmail.com>
Date: Fri, 7 Jun 2024 16:41:26 +0200
Subject: [PATCH] fix not printing `Error:` when terminal has no color support

---
 src/error.cpp       | 6 ++----
 tests/issues/run.sh | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/error.cpp b/src/error.cpp
index 2556a8de4..eed69b779 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -390,8 +390,6 @@ gb_internal void error_va(TokenPos const &pos, TokenPos end, char const *fmt, va
 			error_out_empty();
 		} else {
 			error_out_pos(pos);
-		}
-		if (has_ansi_terminal_colours()) {
 			error_out_coloured("Error: ", TerminalStyle_Normal, TerminalColour_Red);
 		}
 		error_out_va(fmt, va);
@@ -427,8 +425,8 @@ gb_internal void warning_va(TokenPos const &pos, TokenPos end, char const *fmt,
 			error_out_empty();
 		} else {
 			error_out_pos(pos);
+			error_out_coloured("Warning: ", TerminalStyle_Normal, TerminalColour_Yellow);
 		}
-		error_out_coloured("Warning: ", TerminalStyle_Normal, TerminalColour_Yellow);
 		error_out_va(fmt, va);
 		error_out("\n");
 		show_error_on_line(pos, end);
@@ -841,4 +839,4 @@ gb_internal void print_all_errors(void) {
 	gb_file_write(f, res, gb_string_length(res));
 
 	errors_already_printed = true;
-}
\ No newline at end of file
+}
diff --git a/tests/issues/run.sh b/tests/issues/run.sh
index 20259ac63..8b4c1e7f2 100755
--- a/tests/issues/run.sh
+++ b/tests/issues/run.sh
@@ -16,7 +16,7 @@ $ODIN test ../test_issue_2466.odin $COMMON
 $ODIN test ../test_issue_2615.odin $COMMON
 $ODIN test ../test_issue_2637.odin $COMMON
 $ODIN test ../test_issue_2666.odin $COMMON
-if [[ $($ODIN build ../test_issue_2395.odin $COMMON 2>&1 >/dev/null | grep -c "must have at least 2 variants") -eq 2 ]] ; then
+if [[ $($ODIN build ../test_issue_2395.odin $COMMON 2>&1 >/dev/null | grep -c "Error:") -eq 2 ]] ; then
 	echo "SUCCESSFUL 1/1"
 else
 	echo "SUCCESSFUL 0/1"