Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trying to improve the 'cleanup' of classpath listeners

Browse Source
This commit is contained in:
Kris De Volder
2018-03-20 17:23:35 -07:00
parent f737f06228
commit 7482c26ccb
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/jdt/ls/ClasspathListenerManager.java
View File

@@ -84,11 +84,19 @@ public class ClasspathListenerManager {
// Cleanups:
return () -> {
unregisterCommand.dispose();
thenLog(log, this.server.getClient().removeClasspathListener(new ClasspathListenerParams(callbackCommandId)));
thenLog(log, this.server.getClient().unregisterCapability(new UnregistrationParams(ImmutableList.of(
new Unregistration(registrationId, WORKSPACE_EXECUTE_COMMAND)
))));
try {
log.info("Unregistering classpath callback "+callbackCommandId +" ...");
this.server.getClient().removeClasspathListener(
new ClasspathListenerParams(callbackCommandId)
).join();
log.info("Unregistering classpath callback "+callbackCommandId +" OK");
this.server.getClient().unregisterCapability(new UnregistrationParams(ImmutableList.of(
new Unregistration(registrationId, WORKSPACE_EXECUTE_COMMAND)
))).join();
unregisterCommand.dispose();
} catch (Exception e) {
log.error("", e);
}
};
}

4
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
View File

@@ -432,12 +432,14 @@ public class SimpleLanguageServer implements Sts4LanguageServer, LanguageClientA
@Override
public CompletableFuture<Object> shutdown() {
return async.invoke(() -> {
Runnable h = shutdownHandler;
if (h!=null) {
h.run();
}
getWorkspaceService().dispose();
return CompletableFuture.completedFuture(new Object());
return "OK";
});
}
@Override

2
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/jdt/ls/JdtLsProjectCache.java
View File

@@ -76,7 +76,7 @@ public class JdtLsProjectCache implements JavaProjectFinder, ProjectObserver {
}))
);
this.server.onShutdown(() ->
disposable.thenAccept(Disposable::dispose)
disposable.thenAccept(Disposable::dispose).join()
);
}

10
vscode-extensions/commons-vscode/src/classpath.ts
View File

@@ -6,10 +6,16 @@ import { LanguageClient, RequestType } from 'vscode-languageclient';
export function registerClasspathService(client : LanguageClient) : void {
let classpathListenerRequest = new RequestType<ClasspathListenerParams, ClasspathListenerResponse, void, void>("sts/addClasspathListener");
client.onRequest(classpathListenerRequest, async (params: ClasspathListenerParams) => {
let addRequest = new RequestType<ClasspathListenerParams, ClasspathListenerResponse, void, void>("sts/addClasspathListener");
client.onRequest(addRequest, async (params: ClasspathListenerParams) => {
return <ClasspathListenerResponse> await VSCode.commands.executeCommand("java.execute.workspaceCommand", "sts.java.addClasspathListener", params.callbackCommandId);
});
let removeRequest = new RequestType<ClasspathListenerParams, ClasspathListenerResponse, void, void>("sts/removeClasspathListener");
client.onRequest(removeRequest, async (params: ClasspathListenerParams) => {
return <ClasspathListenerResponse> await VSCode.commands.executeCommand("java.execute.workspaceCommand", "sts.java.removeClasspathListener", params.callbackCommandId);
});
}
interface ClasspathListenerParams {

2
vscode-extensions/vscode-spring-boot/lib/Main.ts
View File

@@ -20,7 +20,7 @@ const JAVA_LANGUAGE_ID = "java";
export function activate(context: VSCode.ExtensionContext) {
let options : commons.ActivatorOptions = {
DEBUG: false,
CONNECT_TO_LS: false,
CONNECT_TO_LS: true,
extensionId: 'vscode-spring-boot',
preferJdk: true,
checkjvm: (context: VSCode.ExtensionContext, jvm: commons.JVM) => {