Skip to content

fix: exception in Outline view when LS fails to start (#1239) #1249

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

Merged
sebthom merged 1 commit into from
Apr 14, 2025
Merged

fix: exception in Outline view when LS fails to start (#1239) #1249

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
13 changes: 11 additions & 2 deletions org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ synchronized void close() {
private final AtomicReference<@Nullable IProgressMonitor> initializeFutureMonitorRef = new AtomicReference<>();
private final int initializeFutureNumberOfStages = 7;
private @Nullable LanguageClientImpl languageClient;
private @Nullable ServerCapabilities serverCapabilities;
private volatile @Nullable ServerCapabilities serverCapabilities;
private final Timer timer = new Timer("Stop Language Server Task Processor"); //$NON-NLS-1$
private @Nullable TimerTask stopTimerTask;

Expand Down Expand Up @@ -935,7 +935,16 @@ public void sendNotification(Consumer<LanguageServer> fn) {
}

public CompletableFuture<ServerCapabilities> getServerCapabilitiesAsync() {
return getInitializedServer().thenApply(ls -> castNonNull(this.serverCapabilities));
return getInitializedServer().thenCompose(ls -> {
final var serverCapabilities = this.serverCapabilities;
if (serverCapabilities == null) {
// This can happen if the server shuts down immediately after initialization,
// but before this callback was invoked.
return CompletableFuture
.failedFuture(new IllegalStateException("serverCapabilities unexpectedly null after initialization")); //$NON-NLS-1$
}
return CompletableFuture.completedFuture(serverCapabilities);
});
}

/**
Expand Down