From de482c6f4223aa9abc668e26a57e82d925a2ad80 Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Mon, 13 Nov 2017 12:26:14 +0300
Subject: [PATCH] inspection view: do not append empty spaces to node's tails

---
 .../ui/InspectionTreeTailRenderer.java        | 22 +++++--------------
 .../ui/ProblemDescriptionNode.java            |  9 ++------
 .../ui/SuppressableInspectionTreeNode.java    |  2 +-
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeTailRenderer.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeTailRenderer.java
index c81d378a8dfc..f60f4f1a3031 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeTailRenderer.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeTailRenderer.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * 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.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.codeInspection.ui;
 
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
@@ -55,8 +41,10 @@ public abstract class InspectionTreeTailRenderer {
     appendText("  ");
     final String customizedTailText = node.getTailText();
     if (customizedTailText != null) {
-      appendText("  ");
-      appendText(customizedTailText, SimpleTextAttributes.GRAYED_ATTRIBUTES);
+      if (!customizedTailText.isEmpty()) {
+        appendText("  ");
+        appendText(customizedTailText, SimpleTextAttributes.GRAYED_ATTRIBUTES);
+      }
     }
     else {
       LevelAndCount[] problemLevels = node.getProblemLevels();
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java
index 3af8ee15f9be..0e57e05e308e 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java
@@ -151,12 +151,7 @@ public class ProblemDescriptionNode extends SuppressableInspectionTreeNode {
   @Nullable
   @Override
   public String getTailText() {
-    if (isQuickFixAppliedFromView()) {
-      return "";
-    }
-    else {
-      final String text = super.getTailText();
-      return text == null ? "" : text;
-    }
+    final String text = super.getTailText();
+    return text == null ? "" : text;
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/SuppressableInspectionTreeNode.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/SuppressableInspectionTreeNode.java
index 0e5cf32a6523..d8b9150d2221 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/SuppressableInspectionTreeNode.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/SuppressableInspectionTreeNode.java
@@ -115,7 +115,7 @@ public abstract class SuppressableInspectionTreeNode extends InspectionTreeNode
   @Override
   public String getTailText() {
     if (isQuickFixAppliedFromView()) {
-      return null;
+      return "";
     }
     if (isAlreadySuppressedFromView()) {
       return "Suppressed";