Merge pull request #5733 from apache/revert-5709-GCN-1720

Revert "Use wait node in VSCode for long running computation of children"
apache · Mar 28, 2023 · 5d14b49 · 5d14b49
2 parents 7afb635 + cc41a83
commit 5d14b49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/explorer/TreeViewProvider.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/explorer/TreeViewProvider.java
@@ -476,7 +476,9 @@ public final CompletionStage<int[]> getChildren(int id) {
 
     public final CompletionStage<Node[]> getChildren(Node nodeOrNull) {
         Node node = getNodeOrRoot(nodeOrNull);
-        return CompletableFuture.completedFuture(node.getChildren().getNodes());
+        return CompletableFuture.supplyAsync(() -> {
+            return node.getChildren().getNodes(true);
+        }, INITIALIZE);
     }
 
     public final CompletionStage<Node> getParent(Node node) {

diff --git a/java/java.lsp.server/vscode/package.json b/java/java.lsp.server/vscode/package.json
@@ -1012,10 +1012,6 @@
 				"uriExpression": "nbres:/org/netbeans/modules/db/resources/view.gif",
 				"codeicon": "open-preview"
 			},
-			{
-				"uriExpression": "nbres:/org/openide/nodes/wait.gif",
-				"codeicon": "watch"
-			},
 			{
 				"uriExpression": "nbres:/org/netbeans/modules/cloud/oracle/resources/yellow_dot.svg",
 				"codeicon": "circle-large-outline",