experimental_ui: when analyzing analyzing one target, show it

In the progress bar of the experimental state tracker, when
reporting that precisely one target is being analyzed, show
that target. While there, also consistently switch to American
spelling.

--
Change-Id: Ib9027145aed69e757a7caf7076abdeb1c5ebeb30
Reviewed-on: https://bazel-review.googlesource.com/#/c/3583
MOS_MIGRATED_REVID=121833343

2 files changed, 9 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java
index c8fab64cd5..7beff75c70 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java
@@ -97,8 +97,12 @@ class ExperimentalStateTracker {
   void loadingComplete(LoadingPhaseCompleteEvent event) {
     loadingProgressReceiver = null;
     int count = event.getTargets().size();
-    status = "Analysing";
-    additionalMessage = "" + count + " targets";
+    status = "Analyzing";
+    if (count == 1) {
+      additionalMessage = "target " + event.getTargets().asList().get(0).getLabel();
+    } else {
+      additionalMessage = "" + count + " targets";
+    }
   }
 
   void analysisComplete(AnalysisPhaseCompleteEvent event) {
diff --git a/src/test/shell/integration/experimental_ui_test.sh b/src/test/shell/integration/experimental_ui_test.sh
index ea250e32a6..cfcb76f638 100755
--- a/src/test/shell/integration/experimental_ui_test.sh
+++ b/src/test/shell/integration/experimental_ui_test.sh
@@ -75,6 +75,9 @@ function test_basic_progress() {
   expect_log '\[[0-9,]* / [0-9,]*\]'
   # curses are used to delete at least one line
   expect_log $'\x1b\[1A\x1b\[K'
+  # As precisely one target is specified, it should be reported during
+  # analysis phase.
+  expect_log 'Analy.*pkg:true'
 }
 
 function test_basic_progress_no_curses() {