From cc41a83d4beb89cdd90cf0d0750ed8cf8789e5f8 Mon Sep 17 00:00:00 2001 From: Neil C Smith Date: Tue, 28 Mar 2023 17:43:26 +0100 Subject: [PATCH] Revert "Use wait node in VSCode for long running computation of children" --- .../modules/java/lsp/server/explorer/TreeViewProvider.java | 4 +++- java/java.lsp.server/vscode/package.json | 4 ---- 2 files changed, 3 insertions(+), 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 index 8cafcedc1dea..5ed7cbfdcb2a 100644 --- 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 getChildren(int id) { public final CompletionStage 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 getParent(Node node) { diff --git a/java/java.lsp.server/vscode/package.json b/java/java.lsp.server/vscode/package.json index 76d1199d96fb..ceaa9214181a 100644 --- 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",