falsepattern/ZigBrains
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

fix(lsp): Better shutdown sequence

Browse source
This commit is contained in:
FalsePattern 2023-08-18 15:36:07 +02:00 • committed by FalsePattern
parent bc408b1d50
commit cab13c3edd
Signed by: falsepattern
GPG key ID: FDF7126A9E124447
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/com/falsepattern/zigbrains/lsp/client/languageserver/wrapper/LanguageServerWrapper.java
View file

@ -120,6 +120,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
import static com.falsepattern.zigbrains.lsp.client.languageserver.ServerStatus.INITIALIZED;
import static com.falsepattern.zigbrains.lsp.client.languageserver.ServerStatus.STARTED;
@ -150,6 +151,7 @@ public class LanguageServerWrapper {
private volatile boolean alreadyShownTimeout = false;
private volatile boolean alreadyShownCrash = false;
private volatile ServerStatus status = STOPPED;
private final AtomicReference<Thread> shutdownHook = new AtomicReference<>();
private static final Map<Pair<String, String>, LanguageServerWrapper> uriToLanguageServerWrapper =
new ConcurrentHashMap<>();
private static final Map<Project, LanguageServerWrapper> projectToLanguageServerWrapper = new ConcurrentHashMap<>();
@ -623,6 +625,20 @@ public class LanguageServerWrapper {
private void setStatus(ServerStatus status) {
this.status = status;
getWidget().ifPresent(widget -> widget.setStatus(status));
synchronized (shutdownHook) {
if ((status == STARTED || status == INITIALIZED) && shutdownHook.get() == null) {
shutdownHook.set(new Thread(() -> {
shutdownHook.set(null);
stop(true);
}));
Runtime.getRuntime().addShutdownHook(shutdownHook.get());
} else if (status == STOPPED && shutdownHook.get() != null) {
try {
Runtime.getRuntime().removeShutdownHook(shutdownHook.get());
} catch (IllegalStateException ignored) {} //Shouldn't happen
shutdownHook.set(null);
}
}
}
public void crashed(Exception e) {

10
src/main/java/com/falsepattern/zigbrains/lsp/listeners/LSPProjectManagerListener.java
View file

@ -31,15 +31,9 @@ public class LSPProjectManagerListener implements ProjectManagerListener {
@Override
public void projectClosing(@NotNull Project project) {
// Removes all the attached LSP status widgets before closing a project. Otherwise the old status widget will
// not be removed when opening a new project in the same project window.
Set<LanguageServerWrapper> languageServerWrappers = IntellijLanguageClient.getProjectToLanguageWrappers().get(
FileUtils.projectToUri(project));
if (languageServerWrappers == null) {
// nothing to do
return;
}
Set<LanguageServerWrapper> languageServerWrappers = IntellijLanguageClient.getAllServerWrappersFor(FileUtils.projectToUri(project));
languageServerWrappers.forEach(wrapper -> {
wrapper.stop(false);
wrapper.removeWidget();
IntellijLanguageClient.removeWrapper(wrapper);
});

2
src/main/java/com/falsepattern/zigbrains/zig/lsp/ZLSStartupActivity.java
View file

@ -47,7 +47,7 @@ public class ZLSStartupActivity implements ProjectActivity {
for (var wrapper : wrappers) {
if (wrapper.serverDefinition.ext.equals("zig")) {
wrapper.stop(false);
wrapper.stop(true);
wrapper.removeWidget();
IntellijLanguageClient.removeWrapper(wrapper);
}
}