Skip to content

fix: Perform updates to Stop Language Server Timer synchronously. (#905) #906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: Perform updates to Stop Language Server Timer synchronously. (#905) #906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 40 additions & 22 deletions src/main/java/com/redhat/devtools/intellij/lsp4ij/LanguageServerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import com.redhat.devtools.intellij.lsp4ij.internal.SupportedFeatures;
import com.redhat.devtools.intellij.lsp4ij.server.ProcessStreamConnectionProvider;
import com.redhat.devtools.intellij.lsp4ij.server.StreamConnectionProvider;
import com.redhat.devtools.intellij.lsp4ij.settings.ServerTrace;
import com.redhat.devtools.intellij.lsp4ij.settings.UserDefinedLanguageServerSettings;
import com.redhat.devtools.intellij.lsp4ij.lifecycle.LanguageServerLifecycleManager;
import com.redhat.devtools.intellij.lsp4ij.lifecycle.NullLanguageServerLifecycleManager;
import org.eclipse.lsp4j.*;
Expand Down Expand Up @@ -114,7 +112,11 @@ public void fileClosed(@NotNull FileEditorManager source, @NotNull VirtualFile f
private LanguageServer languageServer;
private LanguageClientImpl languageClient;
private ServerCapabilities serverCapabilities;
private Timer timer;

private final Timer timer = new Timer("Stop Language Server Task Processor"); //$NON-NLS-1$

private TimerTask stopTimerTask;

private final AtomicBoolean stopping = new AtomicBoolean(false);

private final ExecutorService dispatcher;
Expand Down Expand Up @@ -295,7 +297,7 @@ public synchronized void start() throws IOException {
messageBusConnection = ApplicationManager.getApplication().getMessageBus().connect();
messageBusConnection.subscribe(AppTopics.FILE_DOCUMENT_SYNC, fileBufferListener);
messageBusConnection.subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, fileBufferListener);
getLanguageServerLifecycleManager().onStartedLanguageServer(this, null);
getLanguageServerLifecycleManager().onStartedLanguageServer(this, null);
}).exceptionally(e -> {
LOGGER.error("Error while starting language server '" + serverDefinition.id + "'", e);
initializeFuture.completeExceptionally(e);
Expand Down Expand Up @@ -372,23 +374,36 @@ private void logMessage(Message message, MessageConsumer consumer) {
getLanguageServerLifecycleManager().logLSPMessage(message, consumer, this);
}

private void removeStopTimer() {
if (timer != null) {
timer.cancel();
timer = null;
getLanguageServerLifecycleManager().onStartedLanguageServer(this, null);
private void removeStopTimerTask() {
if (!shouldUseStopTimer()) {
return;
}
synchronized (timer) {
if (stopTimerTask != null) {
stopTimerTask.cancel();
stopTimerTask = null;
getLanguageServerLifecycleManager().onStartedLanguageServer(this, null);
}
}
}

private void startStopTimer() {
timer = new Timer("Stop Language Server Timer"); //$NON-NLS-1$
getLanguageServerLifecycleManager().onStoppingLanguageServer(this);
timer.schedule(new TimerTask() {
@Override
public void run() {
stop();
private void startStopTimerTask() {
if (!shouldUseStopTimer()) {
return;
}
synchronized (timer) {
if (stopTimerTask != null) {
stopTimerTask.cancel();
}
}, TimeUnit.SECONDS.toMillis(this.serverDefinition.lastDocumentDisconnectedTimeout));
getLanguageServerLifecycleManager().onStoppingLanguageServer(this);
stopTimerTask = new TimerTask() {
@Override
public void run() {
stop();
}
};
timer.schedule(stopTimerTask, TimeUnit.SECONDS.toMillis(this.serverDefinition.lastDocumentDisconnectedTimeout));
}
}

/**
Expand All @@ -413,7 +428,7 @@ public synchronized void stop() {
return;
}
getLanguageServerLifecycleManager().onStoppingLanguageServer(this);
removeStopTimer();
removeStopTimerTask();
if (this.languageClient != null) {
this.languageClient.dispose();
}
Expand Down Expand Up @@ -619,7 +634,7 @@ private boolean supportsWorkspaceFolderCapability() {
* @noreference internal so far
*/
private CompletableFuture<LanguageServer> connect(@Nonnull URI absolutePath, Document document) throws IOException {
removeStopTimer();
removeStopTimerTask();
final URI thePath = absolutePath; // should be useless

VirtualFile file = FileDocumentManager.getInstance().getFile(document);
Expand Down Expand Up @@ -676,9 +691,8 @@ private void disconnect(URI path, boolean stopping) {
documentListener.documentClosed();
}
if (!stopping && this.connectedDocuments.isEmpty()) {
if (this.serverDefinition.lastDocumentDisconnectedTimeout != 0 && !ApplicationManager.getApplication().isUnitTestMode()) {
removeStopTimer();
startStopTimer();
if (shouldUseStopTimer()) {
startStopTimerTask();
} else {
stop();
}
Expand Down Expand Up @@ -980,4 +994,8 @@ private static int getParentProcessId() {
public Long getCurrentProcessId() {
return lspStreamProvider instanceof ProcessStreamConnectionProvider ? ((ProcessStreamConnectionProvider) lspStreamProvider).getPid() : null;
}

private boolean shouldUseStopTimer() {
return this.serverDefinition.lastDocumentDisconnectedTimeout != 0 && !ApplicationManager.getApplication().isUnitTestMode();
}
}