Fix NPE in inlay hints

spring-projects · Sep 29, 2024 · 88d357f · 88d357f
1 parent 3dd95fa
commit 88d357f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...ain/java/org/springframework/ide/vscode/commons/languageserver/util/InlayHintHandler.java b/...ain/java/org/springframework/ide/vscode/commons/languageserver/util/InlayHintHandler.java
@@ -16,9 +16,10 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.jsonrpc.CancelChecker;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
+import org.springframework.lang.NonNull;
 
 public interface InlayHintHandler {
 
-	List<InlayHint> handle(TextDocument doc, Range range, CancelChecker cancelChecker);
+	@NonNull List<InlayHint> handle(TextDocument doc, Range range, CancelChecker cancelChecker);
 
 }
diff --git a/...e-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtInlayHintsHandler.java b/...e-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtInlayHintsHandler.java
@@ -56,7 +56,7 @@ public List<InlayHint> handle(TextDocument doc, Range range, CancelChecker cance
 
 	private List<InlayHint> computeInlayHints(List<JdtInlayHintsProvider> applicableInlayHintsProviders, IJavaProject jp, CompilationUnit cu, Range r, TextDocument doc) {
 		if (cu == null) {
-			return null;
+			return Collections.emptyList();
 		}
 		Collector<InlayHint> collector = new Collector<>();
 		CompositeASTVisitor visitor = new CompositeASTVisitor();