|
| 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