Skip to content

Commit b072dfd

Browse files
committed
Use ansi_codes in cvd/cli/utils.cpp
Bug: b/528061247
1 parent d28f18c commit b072dfd

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ cf_cc_library(
184184
deps = [
185185
":command_request",
186186
":types",
187+
"//cuttlefish/ansi_codes",
187188
"//cuttlefish/common/libs/fs",
188189
"//cuttlefish/common/libs/utils:contains",
189190
"//cuttlefish/common/libs/utils:files",

base/cvd/cuttlefish/host/commands/cvd/cli/utils.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "fmt/format.h"
3434
#include "fmt/ranges.h" // NOLINT(misc-include-cleaner): version difference
3535

36+
#include "cuttlefish/ansi_codes/ansi_codes.h"
3637
#include "cuttlefish/common/libs/fs/shared_fd.h"
3738
#include "cuttlefish/common/libs/utils/contains.h"
3839
#include "cuttlefish/common/libs/utils/files.h"
@@ -247,25 +248,20 @@ Result<std::vector<Flag>> GetSiblingCommandFlags(const std::string& bin_name,
247248
return flags;
248249
}
249250

250-
static constexpr char kTerminalBoldRed[] = "\033[0;1;31m";
251-
static constexpr char kTerminalCyan[] = "\033[0;36m";
252-
static constexpr char kTerminalRed[] = "\033[0;31m";
253-
static constexpr char kTerminalReset[] = "\033[0m";
254-
255251
std::string_view TerminalColors::Reset() const {
256-
return is_tty_ ? kTerminalReset : "";
252+
return is_tty_ ? kAnsiReset : "";
257253
}
258254

259255
std::string_view TerminalColors::BoldRed() const {
260-
return is_tty_ ? kTerminalBoldRed : "";
256+
return is_tty_ ? kAnsiRed : "";
261257
}
262258

263259
std::string_view TerminalColors::Red() const {
264-
return is_tty_ ? kTerminalRed : "";
260+
return is_tty_ ? kAnsiRed : "";
265261
}
266262

267263
std::string_view TerminalColors::Cyan() const {
268-
return is_tty_ ? kTerminalCyan : "";
264+
return is_tty_ ? kAnsiCyan : "";
269265
}
270266

271267
std::string NoGroupMessage(const CommandRequest& request) {

0 commit comments

Comments
 (0)