Skip to content

Fix #3492 #3498

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

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

Fix #3492 #3498

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
19 changes: 12 additions & 7 deletions org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@ public class LanguageServerImpl implements LanguageServer, WorkspaceService, Tex

private WorkspaceManager workspaceManager;

private InitializeParams initializeParams;
protected InitializeParams initializeParams;

private InitializeResult initializeResult;
protected InitializeResult initializeResult;

private WorkspaceResourceAccess resourceAccess;

Expand Down Expand Up @@ -229,10 +229,13 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
initializeParams = params;

InitializeResult result = new InitializeResult();

result.setCapabilities(createServerCapabilities(params));
access.addBuildListener(this);
return requestManager.runWrite(() -> {

initializeResult = result;

// Schedule a background build of the project
requestManager.runWrite(() -> {
if (clientSupportsWorkspaceFolders() && workspaceManager.isSupportsWorkspaceFolders()) {
List<WorkspaceFolder> workspaceFolders = params.getWorkspaceFolders();
if (workspaceFolders == null)
Expand All @@ -242,8 +245,10 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
URI baseDir = getBaseDir(params);
workspaceManager.initialize(baseDir, this::publishDiagnostics, CancelIndicator.NullImpl);
}
return result;
}, (cancelIndicator, it) -> it).thenApply(it -> initializeResult = it);
return null;
}, (cancelIndicator, it) -> it);

return CompletableFuture.completedFuture(result);
}

protected boolean clientSupportsWorkspaceFolders() {
Expand Down Expand Up @@ -508,7 +513,7 @@ public void didChangeWorkspaceFolders(DidChangeWorkspaceFoldersParams params) {
}, (a, b) -> null);
}

private void publishDiagnostics(URI uri, Iterable<? extends Issue> issues) {
protected void publishDiagnostics(URI uri, Iterable<? extends Issue> issues) {
initialized.thenAccept((initParams) -> {
PublishDiagnosticsParams publishDiagnosticsParams = new PublishDiagnosticsParams();
publishDiagnosticsParams.setUri(uriExtensions.toUriString(uri));
Expand Down