From 88d357f45e58fe01a30ec2808b3c137adbb5b925 Mon Sep 17 00:00:00 2001 From: aboyko Date: Sun, 29 Sep 2024 11:16:45 -0400 Subject: [PATCH] Fix NPE in inlay hints --- .../vscode/commons/languageserver/util/InlayHintHandler.java | 3 ++- .../ide/vscode/boot/java/JdtInlayHintsHandler.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/InlayHintHandler.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/InlayHintHandler.java index c3d89d5c6..3f5731518 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/InlayHintHandler.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/InlayHintHandler.java @@ -16,9 +16,10 @@ import org.eclipse.lsp4j.InlayHint; 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 handle(TextDocument doc, Range range, CancelChecker cancelChecker); + @NonNull List handle(TextDocument doc, Range range, CancelChecker cancelChecker); } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtInlayHintsHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtInlayHintsHandler.java index 1bd048b6c..eccf1bedf 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtInlayHintsHandler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtInlayHintsHandler.java @@ -56,7 +56,7 @@ public class JdtInlayHintsHandler implements InlayHintHandler { private List computeInlayHints(List applicableInlayHintsProviders, IJavaProject jp, CompilationUnit cu, Range r, TextDocument doc) { if (cu == null) { - return null; + return Collections.emptyList(); } Collector collector = new Collector<>(); CompositeASTVisitor visitor = new CompositeASTVisitor();