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

Jump to bottom

Fix NPE when comparing versions in Content Assist #435

Merged
merged 1 commit into from
Jul 7, 2023
Merged

Fix NPE when comparing versions in Content Assist #435

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
8 changes: 6 additions & 2 deletions .../eclipse/lemminx/extensions/maven/participants/completion/MavenCompletionParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,16 @@ public void onXMLContent(ICompletionRequest request, ICompletionResponse respons
// Sort and move nonArtifactCollector items to the response and clear nonArtifactCollector
nonArtifactCollector.entrySet().stream()
.map(entry -> entry.getValue())
.filter(Objects::nonNull)
.filter(item -> item.getSortText() != null || item.getLabel() != null)
.sorted(new Comparator<CompletionItem>() {
// Backward order
@Override
public int compare(CompletionItem o1, CompletionItem o2) {
return new DefaultArtifactVersion(o2.getSortText())
.compareTo(new DefaultArtifactVersion(o1.getSortText()));
String sortText1 = o1.getSortText() != null ? o1.getSortText() : o1.getLabel();
String sortText2 = o2.getSortText() != null ? o2.getSortText() : o2.getLabel();
return new DefaultArtifactVersion(sortText2)
.compareTo(new DefaultArtifactVersion(sortText1));
}
})
.forEach(response::addCompletionItem);
Expand Down