From 786feab780bc0810969095eccd68b1d77a03bd5b Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Wed, 11 Oct 2017 23:02:18 +0300
Subject: [PATCH] drop Loading... node when hidden root is empty

Other less confusing means are available to signal an empty tree
---
 .../com/intellij/ide/util/treeView/AbstractTreeUi.java    | 5 -----
 .../ide/util/treeView/FilteringTreeBuilderTest.java       | 2 +-
 .../com/intellij/ide/util/treeView/TreeUiTest.java        | 8 ++++----
 xml/tests/testData/structureView/Empty.tree               | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
index 12ebf01c3f6f..3e9b839c16bc 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
@@ -2804,11 +2804,6 @@ public class AbstractTreeUi {
       }
     }
 
-    if (parent == getRootNode() && !myTree.isRootVisible() && parent.getChildCount() == 0) {
-      insertLoadingNode(parent, false);
-      reallyRemoved = false;
-    }
-
     maybeReady();
     if (reallyRemoved) {
       nodeStructureChanged(parent);
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/FilteringTreeBuilderTest.java b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/FilteringTreeBuilderTest.java
index 4c9cfa2744a2..7a687a971ca0 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/FilteringTreeBuilderTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/FilteringTreeBuilderTest.java
@@ -100,7 +100,7 @@ public class FilteringTreeBuilderTest extends BaseTreeTestCase  {
              + " folder2\n");
 
     updateFilter("fo_");
-    assertTree("+/\n");
+    assertTree("/\n");
 
     updateFilter("");
     assertTree("-/\n"
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
index 6fa65d7f1bd5..fc60a39661a2 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
@@ -50,13 +50,13 @@ public class TreeUiTest extends AbstractTreeBuilderTest {
   public void testEmptyInvisibleRoot() throws Exception {
     myTree.setRootVisible(false);
     showTree();
-    assertTree("+/\n");
+    assertTree("/\n");
 
     updateFromRoot();
-    assertTree("+/\n");
+    assertTree("/\n");
 
     buildNode("/", false);
-    assertTree("+/\n");
+    assertTree("/\n");
 
     myTree.setRootVisible(true);
     buildNode("/", false);
@@ -449,7 +449,7 @@ public class TreeUiTest extends AbstractTreeBuilderTest {
     myRoot.removeAll();
     updateFromRoot();
 
-    assertTree("+/\n");
+    assertTree("/\n");
   }
 
   public void testAutoExpand() throws Exception {
diff --git a/xml/tests/testData/structureView/Empty.tree b/xml/tests/testData/structureView/Empty.tree
index becaf0af7fde..a8ac0fe85681 100644
--- a/xml/tests/testData/structureView/Empty.tree
+++ b/xml/tests/testData/structureView/Empty.tree
@@ -1 +1 @@
-+HtmlFile:Empty.html
\ No newline at end of file
+HtmlFile:Empty.html
\ No newline at end of file