Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid NPE in case of document being null

Browse Source
This commit is contained in:
Martin Lippert
2019-03-12 10:11:02 +01:00
parent f4ca5c4dd3
commit c928b61c31
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/HighlightsCodeLensProvider.java
View File

@@ -73,29 +73,33 @@ public class HighlightsCodeLensProvider extends AbstractCodeMiningProvider {
IPreferenceStore store = LanguageServerCommonsActivator.getInstance().getPreferenceStore();
if (store.getBoolean(PreferenceConstants.HIGHLIGHT_CODELENS_PREFS)) {
IDocument document = viewer.getDocument();
return CompletableFuture.supplyAsync(() -> {
List<LSPDocumentInfo> docInfos = LanguageServiceAccessor.getLSPDocumentInfosFor(document, (x) -> true);
if (!docInfos.isEmpty()) {
LSPDocumentInfo info = docInfos.get(0);
HighlightParams highlights = STS4LanguageClientImpl.currentHighlights.get(info.getFileUri().toString());
if (highlights != null) {
return highlights.getCodeLenses().stream()
.filter(codeLens -> codeLens.getCommand() != null)
.map(codeLens -> {
try {
return new HighlightCodeMining(codeLens, document, this, action(codeLens.getCommand()));
} catch (BadLocationException e) {
LanguageServerCommonsActivator.logError(e, "Failed to create Eclipse client CodeLens");
return null;
}
})
.filter(Objects::nonNull)
.collect(Collectors.toList());
if (document != null) {
return CompletableFuture.supplyAsync(() -> {
List<LSPDocumentInfo> docInfos = LanguageServiceAccessor.getLSPDocumentInfosFor(document, (x) -> true);
if (!docInfos.isEmpty()) {
LSPDocumentInfo info = docInfos.get(0);
HighlightParams highlights = STS4LanguageClientImpl.currentHighlights.get(info.getFileUri().toString());
if (highlights != null) {
return highlights.getCodeLenses().stream()
.filter(codeLens -> codeLens.getCommand() != null)
.map(codeLens -> {
try {
return new HighlightCodeMining(codeLens, document, this, action(codeLens.getCommand()));
} catch (BadLocationException e) {
LanguageServerCommonsActivator.logError(e, "Failed to create Eclipse client CodeLens");
return null;
}
})
.filter(Objects::nonNull)
.collect(Collectors.toList());
}
}
}
return null;
});
}
else {
return null;
});
}
}
return null;
}