Skip to content

Commit cc75b7a

Browse files
committed
Fix catch of NPE in context of Optionals
1 parent 8cfe32f commit cc75b7a

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

jabls/src/main/java/org/jabref/languageserver/util/definition/BibDefinitionProvider.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,13 @@ public List<Location> provideDefinition(String uri, String content, Position pos
6868
int end = start + rangeInFileString.end();
6969
Range linkRange = LspRangeUtil.convertToLspRange(content, start, end);
7070
if (LspRangeUtil.isPositionInRange(position, linkRange)) {
71-
try {
72-
Optional<Path> filePath = FileUtil.find(parserResult.get().getDatabaseContext(), linkedFile.getLink(), preferences.getFilePreferences());
73-
return List.of(new Location(filePath.get().toUri().toString(), EMPTY_RANGE));
74-
} catch (NullPointerException e) {
75-
LOGGER.debug("Error while getting file path", e);
71+
Optional<Path> filePath = FileUtil.find(parserResult.get().getDatabaseContext(), linkedFile.getLink(), preferences.getFilePreferences());
72+
if (LOGGER.isDebugEnabled() && filePath.isEmpty()) {
73+
LOGGER.debug("filePath is empty");
7674
}
75+
return filePath
76+
.map(p -> List.of(new Location(p.toUri().toString(), EMPTY_RANGE)))
77+
.orElse(List.of());
7778
}
7879
}
7980
}

0 commit comments

Comments
 (0)