Skip to content

Commit be1e90c

Browse files
authored
Merge pull request #458 from shivam71/lsp_exit_shutdown_patch
Patch for Netbeans PR #8770
2 parents 2ad0061 + 620e380 commit be1e90c

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

build.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
patches/7893-draft.diff
5454
patches/8460-draft.diff
5555
patches/8745-draft.diff
56+
patches/8770.diff
5657
patches/disable-error-notification.diff
5758
patches/mvn-sh.diff
5859
patches/project-marker-jdk.diff

patches/8770.diff

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
2+
index 747d151600..c4dee13f92 100644
3+
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
4+
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
5+
@@ -142,6 +142,7 @@ import org.netbeans.modules.parsing.spi.indexing.Indexable;
6+
import org.netbeans.modules.progress.spi.InternalHandle;
7+
import org.netbeans.spi.project.ActionProgress;
8+
import org.netbeans.spi.project.ActionProvider;
9+
+import org.openide.LifecycleManager;
10+
import org.openide.filesystems.FileObject;
11+
import org.openide.filesystems.FileUtil;
12+
import org.openide.util.Lookup;
13+
@@ -460,6 +461,7 @@ public final class Server {
14+
private final OpenedDocuments openedDocuments = new OpenedDocuments();
15+
16+
private final LspSession lspSession;
17+
+ private boolean shutdownReqReceived = false;
18+
19+
LanguageServerImpl(LspSession session) {
20+
this.lspSession = session;
21+
@@ -1103,11 +1105,14 @@ public final class Server {
22+
23+
@Override
24+
public CompletableFuture<Object> shutdown() {
25+
+ shutdownReqReceived = true;
26+
return CompletableFuture.completedFuture(null);
27+
}
28+
29+
@Override
30+
public void exit() {
31+
+ int exitCode = shutdownReqReceived ? 0 : 1;
32+
+ LifecycleManager.getDefault().exit(exitCode);
33+
}
34+
35+
@JsonDelegate

0 commit comments

Comments
 (0)