Merge branch 'master' into orca-dev

1 files changed, 10 insertions, 2 deletions

diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index fe61903ae..3ff6a9d02 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -394,6 +394,7 @@ struct BuildContext {
 	bool   warnings_as_errors;
 	bool   hide_error_line;
 	bool   terse_errors;
+	bool   json_errors;
 	bool   has_ansi_terminal_colours;
 
 	bool   ignore_lazy;
@@ -1281,10 +1282,17 @@ gb_internal String get_fullpath_core_collection(gbAllocator a, String path, bool
 }
 
 gb_internal bool show_error_line(void) {
-	return !build_context.hide_error_line;
+	return !build_context.hide_error_line && !build_context.json_errors;
+}
+
+gb_internal bool terse_errors(void) {
+	return build_context.terse_errors;
+}
+gb_internal bool json_errors(void) {
+	return build_context.json_errors;
 }
 gb_internal bool has_ansi_terminal_colours(void) {
-	return build_context.has_ansi_terminal_colours;
+	return build_context.has_ansi_terminal_colours && !json_errors();
 }
 
 gb_internal bool has_asm_extension(String const &path) {