From 01c31f29e13cd1ae39659d3d18b66a8abba4a6f1 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 15 Feb 2017 16:22:38 +0100 Subject: [PATCH] PT ##139933339: simple language server responds correctly to a shutdown message now, and exists itself when exit message arrives --- .../commons/languageserver/util/SimpleLanguageServer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java index 3191933a3..858c5a050 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016-2017 Pivotal, Inc. + * Copyright (c) 2016, 2017 Pivotal, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -37,7 +37,6 @@ import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcil import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity; import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem; import org.springframework.ide.vscode.commons.util.BadLocationException; -import org.springframework.ide.vscode.commons.util.Futures; import org.springframework.ide.vscode.commons.util.text.TextDocument; import reactor.core.publisher.Mono; @@ -118,14 +117,14 @@ public abstract class SimpleLanguageServer implements LanguageServer, LanguageCl @Override public CompletableFuture shutdown() { - return Futures.of(null); + return CompletableFuture.completedFuture(new Object()); } @Override public void exit() { + System.exit(0); } - public Path getWorkspaceRoot() { return workspaceRoot; }