dilim/ninja
1
0
Fork 0
mirror of https://github.com/ninja-build/ninja.git synced 2026-06-24 08:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary NO_COLOR checks, condense checks for CLICOLOR_FORCE and FORCE_COLOR

Browse Source
This commit is contained in:
Brayden Krus
2026-05-20 12:44:39 -04:00
parent 044656d45d
commit 2c729faff3
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/line_printer.cc
View File

@@ -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;
}
}