From 2c729faff30a8014e29bb1e2c03697209a75a6a5 Mon Sep 17 00:00:00 2001
From: Brayden Krus <151576863+braydenkrus@users.noreply.github.com>
Date: Wed, 20 May 2026 12:44:39 -0400
Subject: [PATCH] Remove unnecessary NO_COLOR checks, condense checks for
 CLICOLOR_FORCE and FORCE_COLOR

---
 src/line_printer.cc | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/line_printer.cc b/src/line_printer.cc
index a9fc2851..b52ba301 100644
--- a/src/line_printer.cc
+++ b/src/line_printer.cc
@@ -70,9 +70,6 @@ LinePrinter::LinePrinter() : have_blank_line_(true), console_locked_(false) {
 #ifdef _WIN32
   // Try enabling ANSI escape sequence support on Windows 10 terminals.
   if (supports_color_) {
-    if (EnvHasNoColor()) {
-      supports_color_ = false;
-    }
     DWORD mode;
     if (GetConsoleMode(console_, &mode)) {
       if (!SetConsoleMode(console_, mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING)) {
@@ -83,13 +80,8 @@ LinePrinter::LinePrinter() : have_blank_line_(true), console_locked_(false) {
 #endif
   if (!supports_color_) {
     // NO_COLOR and CLICOLOR_FORCE: NO_COLOR "overrides" CLICOLOR_FORCE
-    if (EnvHasNoColor()) {
-      supports_color_ = false;
-    } else if (EnvHasCliColorForce()) {
-      supports_color_ = true;
-    }
     // NO_COLOR and FORCE_COLOR: FORCE_COLOR "overrides" NO_COLOR
-    if (EnvHasForceColor()) {
+    if ((!EnvHasNoColor() && EnvHasCliColorForce()) || EnvHasForceColor()) {
       supports_color_ = true;
     }
   }