Merge "Use resolvedLevel to choose color" into main am: 95c31ea35d am: 402cf0f748

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2784349

Change-Id: I8dcfcbaa3b50d2f5ebd88896c8081b0b2cfbed31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 17 insertions, 6 deletions

diff --git a/src/com/google/doclava/Errors.java b/src/com/google/doclava/Errors.java
index 83aac96..9d351a1 100644
--- a/src/com/google/doclava/Errors.java
+++ b/src/com/google/doclava/Errors.java
@@ -90,18 +90,29 @@ public class Errors {
       return new LintBaselineEntry(file, message, code);
     }
 
+
     @Override
     public String toString() {
+      final String DEFAULT = "\033[0m";
+      final String BOLD = "\033[1m";
+      final String RED = "\033[31m";
+      final String YELLOW = "\033[33m";
+      final String CYAN = "\033[36m";
+
       StringBuilder res = new StringBuilder();
       if (Doclava.android) {
-        res.append("\033[1m").append(pos.toString()).append(": ");
+        res.append(BOLD).append(pos.toString()).append(": ");
+        switch (resolvedLevel) {
+          case LINT: res.append(CYAN); break;
+          case WARNING: res.append(YELLOW); break;
+          case ERROR: res.append(RED); break;
+        }
         switch (error.getLevel()) {
-          case LINT: res.append("\033[36mlint: "); break;
-          case WARNING: res.append("\033[33mwarning: "); break;
-          case ERROR: res.append("\033[31merror: "); break;
-          default: break;
+          case LINT: res.append("lint: "); break;
+          case WARNING: res.append("warning: "); break;
+          case ERROR: res.append("error: "); break;
         }
-        res.append("\033[0m");
+        res.append(DEFAULT);
         res.append(msg);
         res.append(" [").append(error.code).append("]");
       } else {