Skip to content
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

Fix NPE if the property ResolveProvider is null #1001

Merged
merged 2 commits into from
May 16, 2024
Merged

Fix NPE if the property ResolveProvider is null #1001

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc77be3
NPE fix
rubenporras May 16, 2024
10b1224
Fix NPE if the property ResolveProvider is null
rubenporras May 16, 2024
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: 14 additions & 5 deletions org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/completion/LSCompletionProposal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
import org.eclipse.lsp4j.InsertTextMode;
import org.eclipse.lsp4j.Position;
import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.ServerCapabilities;
import org.eclipse.lsp4j.TextEdit;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.eclipse.swt.SWT;
Expand Down Expand Up @@ -326,11 +327,8 @@ protected IInformationControl doCreateInformationControl(Shell parent) {

@Override
public String getAdditionalProposalInfo(IProgressMonitor monitor) {
if (languageServerWrapper.isActive()) {
CompletionOptions completionProvider = languageServerWrapper.getServerCapabilities().getCompletionProvider();
if (completionProvider != null && completionProvider.getResolveProvider()) {
resolveItem();
}
if (languageServerWrapper.isActive() && resolvesCompletionItem(languageServerWrapper.getServerCapabilities())) {
resolveItem();
}

final var res = new StringBuilder();
Expand All @@ -350,6 +348,17 @@ public String getAdditionalProposalInfo(IProgressMonitor monitor) {
return res.toString();
}

private boolean resolvesCompletionItem(final ServerCapabilities capabilities) {
if (capabilities != null) {
CompletionOptions completionProvider = capabilities.getCompletionProvider();
if (completionProvider != null) {
Boolean hasResolveProvider = completionProvider.getResolveProvider();
return hasResolveProvider != null && hasResolveProvider;
}
}
return false;
}

private void resolveItem() {
try {
languageServerWrapper.execute(ls -> ls.getTextDocumentService().resolveCompletionItem(item).thenAccept(this::updateCompletionItem))
Expand Down