From 21db1f6a209c2b9233ecff20b6bc0ab21bfc1514 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Tue, 19 Jun 2018 14:49:59 +0300
Subject: [PATCH] Build view: reduce the horizontal space between the black and
 grey text (IDEA-193422)

---
 .../intellij/build/BuildTreeConsoleView.java   |  2 +-
 .../src/com/intellij/build/ExecutionNode.java  | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java b/platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java
index 5f4f5ed424f1..356f3bf25c63 100644
--- a/platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java
+++ b/platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java
@@ -402,7 +402,7 @@ public class BuildTreeConsoleView implements ConsoleView, DataProvider, BuildCon
     if (event instanceof FinishBuildEvent) {
       String aHint = event.getHint();
       String time = DateFormatUtil.formatDateTime(event.getEventTime());
-      aHint = aHint == null ? "  at " + time : aHint + "  at " + time;
+      aHint = aHint == null ? "at " + time : aHint + " at " + time;
       currentNode.setHint(aHint);
       updateTimeColumnWidth(myTimeColumnWidth);
       if (myDetailsHandler.myExecutionNode == null) {
diff --git a/platform/lang-impl/src/com/intellij/build/ExecutionNode.java b/platform/lang-impl/src/com/intellij/build/ExecutionNode.java
index 49be3baeda6e..175927c99b07 100644
--- a/platform/lang-impl/src/com/intellij/build/ExecutionNode.java
+++ b/platform/lang-impl/src/com/intellij/build/ExecutionNode.java
@@ -43,7 +43,7 @@ public class ExecutionNode extends CachingSimpleNode {
   private static final Icon NODE_ICON_OK = AllIcons.Process.State.GreenOK;
   private static final Icon NODE_ICON_ERROR = AllIcons.General.Error;
   private static final Icon NODE_ICON_WARNING = AllIcons.General.Warning;
-  private static final Icon NODE_ICON_INFO =  AllIcons.General.Information;
+  private static final Icon NODE_ICON_INFO = AllIcons.General.Information;
   private static final Icon NODE_ICON_SKIPPED = AllIcons.Process.State.YellowStr;
   private static final Icon NODE_ICON_STATISTICS = AllIcons.General.Mdot_empty;
   private static final Icon NODE_ICON_SIMPLE = AllIcons.General.Mdot_empty;
@@ -82,16 +82,20 @@ public class ExecutionNode extends CachingSimpleNode {
     setIcon(getCurrentIcon());
     presentation.setPresentableText(myName);
     presentation.setIcon(getIcon());
-    if (myTitle != null) {
+    if (StringUtil.isNotEmpty(myTitle)) {
       presentation.addText(myTitle + ": ", SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
     }
 
     String hint = getCurrentHint();
-    if (myTitle != null || hint != null) {
+    boolean isNotEmptyName = StringUtil.isNotEmpty(myName);
+    if (isNotEmptyName && myTitle != null || hint != null) {
       presentation.addText(myName, SimpleTextAttributes.REGULAR_ATTRIBUTES);
     }
-    if (hint != null) {
-      presentation.addText("  " + hint, SimpleTextAttributes.GRAY_ATTRIBUTES);
+    if (StringUtil.isNotEmpty(hint)) {
+      if (isNotEmptyName) {
+        hint = "  " + hint;
+      }
+      presentation.addText(hint, SimpleTextAttributes.GRAY_ATTRIBUTES);
     }
     if (myTooltip != null) {
       presentation.setTooltip(myTooltip);
@@ -225,7 +229,7 @@ public class ExecutionNode extends CachingSimpleNode {
 
     if (myResult instanceof FailureResult) {
       List<Navigatable> result = new SmartList<>();
-      for (Failure failure : ((FailureResult)myResult).getFailures()) {
+      for (Failure failure: ((FailureResult)myResult).getFailures()) {
         ContainerUtil.addIfNotNull(result, failure.getNavigatable());
       }
       return result;
@@ -260,7 +264,7 @@ public class ExecutionNode extends CachingSimpleNode {
       if (hint == null) {
         hint = "";
       }
-      hint += (getParent() == null ? isRunning() ? "   " : "   with " : " (");
+      hint += (getParent() == null ? isRunning() ? "  " : "  with " : " (");
       if (errors > 0) {
         hint += (errors + " " + StringUtil.pluralize("error", errors));
         if (warnings > 0) {