Move the TerminalColors type to ansi_codes

This places it closer to related code.

Bug: b/507940443

Author: Databean

base/cvd/cuttlefish/ansi_codes/BUILD.bazel

@@ -12,3 +12,12 @@ cf_cc_library(
         "@abseil-cpp//absl/strings",
     ],
 )
+
+cf_cc_library(
+    name = "terminal_colors",
+    srcs = ["terminal_colors.cc"],
+    hdrs = ["terminal_colors.h"],
+    deps = [
+        "//cuttlefish/ansi_codes",
+    ],
+)

base/cvd/cuttlefish/ansi_codes/terminal_colors.cc

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "cuttlefish/ansi_codes/terminal_colors.h"
+
+#include <string_view>
+
+#include "cuttlefish/ansi_codes/ansi_codes.h"
+
+namespace cuttlefish {
+
+std::string_view TerminalColors::Reset() const {
+  return is_tty_ ? kAnsiReset : "";
+}
+
+std::string_view TerminalColors::BoldRed() const {
+  return is_tty_ ? kAnsiRed : "";
+}
+
+std::string_view TerminalColors::Red() const { return is_tty_ ? kAnsiRed : ""; }
+
+std::string_view TerminalColors::Cyan() const {
+  return is_tty_ ? kAnsiCyan : "";
+}
+
+}  // namespace cuttlefish

base/cvd/cuttlefish/ansi_codes/terminal_colors.h

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <string_view>
+
+namespace cuttlefish {
+
+class TerminalColors {
+ public:
+  TerminalColors(bool is_tty) : is_tty_(is_tty) {}
+  std::string_view Reset() const;
+  std::string_view BoldRed() const;
+  std::string_view Red() const;
+  std::string_view Cyan() const;
+
+ private:
+  bool is_tty_;
+};
+
+}  // namespace cuttlefish

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

@@ -30,14 +30,14 @@ cf_cc_binary(
     srcs = ["main.cc"],
     deps = [
         ":libcvd",
+        "//cuttlefish/ansi_codes:terminal_colors",
         "//cuttlefish/common/libs/utils:environment",
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:subprocess",
         "//cuttlefish/common/libs/utils:tee_logging",
         "//cuttlefish/flag_parser",
         "//cuttlefish/host/commands/cvd/cli:log_files",
-        "//cuttlefish/host/commands/cvd/cli:utils",
-        "//cuttlefish/host/commands/cvd/utils",
+        "//cuttlefish/host/commands/cvd/utils:common",
         "//cuttlefish/host/commands/cvd/version",
         "//cuttlefish/host/libs/vm_manager",
         "//cuttlefish/posix:strerror",

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

@@ -180,7 +180,7 @@ cf_cc_library(
     deps = [
         ":command_request",
         ":types",
-        "//cuttlefish/ansi_codes",
+        "//cuttlefish/ansi_codes:terminal_colors",
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:contains",
         "//cuttlefish/common/libs/utils:files",

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

@@ -65,10 +65,10 @@ cf_cc_library(
     srcs = ["selector.cpp"],
     hdrs = ["selector.h"],
     deps = [
+        "//cuttlefish/ansi_codes:terminal_colors",
         "//cuttlefish/common/libs/utils:users",
         "//cuttlefish/host/commands/cvd/cli:command_request",
         "//cuttlefish/host/commands/cvd/cli:interruptible_terminal",
-        "//cuttlefish/host/commands/cvd/cli:utils",
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:instance_manager",
         "//cuttlefish/result",

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

@@ -24,12 +24,11 @@
 #include <utility>
 #include <vector>
 
-#include "absl/strings/ascii.h"
 #include "absl/strings/numbers.h"
 
+#include "cuttlefish/ansi_codes/terminal_colors.h"
 #include "cuttlefish/host/commands/cvd/cli/command_request.h"
 #include "cuttlefish/host/commands/cvd/cli/interruptible_terminal.h"
-#include "cuttlefish/host/commands/cvd/cli/utils.h"
 #include "cuttlefish/host/commands/cvd/instances/local_instance.h"
 #include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
 #include "cuttlefish/host/commands/cvd/instances/status_fetcher.h"

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

@@ -33,7 +33,7 @@
 #include "fmt/format.h"
 #include "fmt/ranges.h"  // NOLINT(misc-include-cleaner): version difference
 
-#include "cuttlefish/ansi_codes/ansi_codes.h"
+#include "cuttlefish/ansi_codes/terminal_colors.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/contains.h"
 #include "cuttlefish/common/libs/utils/files.h"
@@ -244,20 +244,6 @@ Result<std::vector<Flag>> GetSiblingCommandFlags(const std::string& bin_name,
   return flags;
 }
 
-std::string_view TerminalColors::Reset() const {
-  return is_tty_ ? kAnsiReset : "";
-}
-
-std::string_view TerminalColors::BoldRed() const {
-  return is_tty_ ? kAnsiRed : "";
-}
-
-std::string_view TerminalColors::Red() const { return is_tty_ ? kAnsiRed : ""; }
-
-std::string_view TerminalColors::Cyan() const {
-  return is_tty_ ? kAnsiCyan : "";
-}
-
 std::string NoGroupMessage(const CommandRequest& request) {
   TerminalColors colors(isatty(1));
   return fmt::format("{}Command `{}{}{}{}` is not applicable: {}{}{}",

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

@@ -19,7 +19,6 @@
 #include <signal.h>
 
 #include <string>
-#include <string_view>
 #include <vector>
 
 #include "cuttlefish/common/libs/utils/subprocess.h"
@@ -85,18 +84,6 @@ struct TerminalSize {
 };
 Result<TerminalSize> GetTerminalSize();
 
-class TerminalColors {
- public:
-  TerminalColors(bool is_tty) : is_tty_(is_tty) {}
-  std::string_view Reset() const;
-  std::string_view BoldRed() const;
-  std::string_view Red() const;
-  std::string_view Cyan() const;
-
- private:
-  bool is_tty_;
-};
-
 std::vector<std::string> ExpandProductPaths(const std::string& product_path,
                                             size_t num_instances);
 

base/cvd/cuttlefish/host/commands/cvd/main.cc

@@ -32,14 +32,14 @@
 #include "android-base/file.h"
 #include "fmt/format.h"
 
+#include "cuttlefish/ansi_codes/terminal_colors.h"
 #include "cuttlefish/common/libs/utils/environment.h"
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/subprocess.h"
 #include "cuttlefish/common/libs/utils/tee_logging.h"
 #include "cuttlefish/flag_parser/flag.h"
 #include "cuttlefish/flag_parser/gflags_compat.h"
 #include "cuttlefish/host/commands/cvd/cli/log_files.h"
-#include "cuttlefish/host/commands/cvd/cli/utils.h"
 #include "cuttlefish/host/commands/cvd/cvd.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
 #include "cuttlefish/host/commands/cvd/version/version.h"