From 4e1f6b01593f83c8453a024e1f665f1533b22e0e Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Sat, 28 Mar 2026 09:41:41 +0300
Subject: [PATCH] Fixing NPE in MethodCandidateInfo.getCurrentMethod.

---
 .../intellij/java/language/psi/infos/MethodCandidateInfo.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/infos/MethodCandidateInfo.java b/java-language-api/src/main/java/com/intellij/java/language/psi/infos/MethodCandidateInfo.java
index d650605c8..85f7a4be8 100644
--- a/java-language-api/src/main/java/com/intellij/java/language/psi/infos/MethodCandidateInfo.java
+++ b/java-language-api/src/main/java/com/intellij/java/language/psi/infos/MethodCandidateInfo.java
@@ -480,7 +480,7 @@ public boolean isInferencePossible() {
 
     public static CurrentCandidateProperties getCurrentMethod(PsiElement context) {
         Map<PsiElement, CurrentCandidateProperties> currentMethodCandidates = CURRENT_CANDIDATE.get();
-        return currentMethodCandidates != null ? currentMethodCandidates.get(context) : null;
+        return currentMethodCandidates != null && context != null ? currentMethodCandidates.get(context) : null;
     }
 
     public static void updateSubstitutor(PsiElement context, PsiSubstitutor newSubstitutor) {