From db46304375de7fe87a2e6974c0f7f5be4bbcb98f Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 28 Jan 2025 15:24:23 +0100 Subject: [PATCH] [java-highlighting] asConsumer: null-friendly Part of IDEA-365344 Create a new Java error highlighter with minimal dependencies (PSI only) GitOrigin-RevId: c7a48db536365be666bfcb9264dbb78299bf6f45 --- .../codeInsight/daemon/impl/analysis/HighlightUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index 5c99f0ceb236..9dfe06c43797 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -299,7 +299,11 @@ public final class HighlightUtil { if (highlightInfo == null) { return fix -> {}; } - return fix -> highlightInfo.registerFix(fix.asIntention(), null, null, null, null); + return fix -> { + if (fix != null) { + highlightInfo.registerFix(fix.asIntention(), null, null, null, null); + } + }; } static void registerReturnTypeFixes(@NotNull HighlightInfo.Builder info, @NotNull PsiMethod method, @NotNull PsiType expectedReturnType) {