Skip to content

Commit 88d357f

Browse files
committed
Fix NPE in inlay hints
1 parent 3dd95fa commit 88d357f

File tree

2 files changed

+3
-2
lines changed
  • headless-services
    • commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util
    • spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java

2 files changed

+3
-2
lines changed

headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/InlayHintHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
import org.eclipse.lsp4j.Range;
1717
import org.eclipse.lsp4j.jsonrpc.CancelChecker;
1818
import org.springframework.ide.vscode.commons.util.text.TextDocument;
19+
import org.springframework.lang.NonNull;
1920

2021
public interface InlayHintHandler {
2122

22-
List<InlayHint> handle(TextDocument doc, Range range, CancelChecker cancelChecker);
23+
@NonNull List<InlayHint> handle(TextDocument doc, Range range, CancelChecker cancelChecker);
2324

2425
}

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtInlayHintsHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public List<InlayHint> handle(TextDocument doc, Range range, CancelChecker cance
5656

5757
private List<InlayHint> computeInlayHints(List<JdtInlayHintsProvider> applicableInlayHintsProviders, IJavaProject jp, CompilationUnit cu, Range r, TextDocument doc) {
5858
if (cu == null) {
59-
return null;
59+
return Collections.emptyList();
6060
}
6161
Collector<InlayHint> collector = new Collector<>();
6262
CompositeASTVisitor visitor = new CompositeASTVisitor();

0 commit comments

Comments
 (0)