From 2c2ee76c0fb014d2b80cb8203e4c19b64b16cfa2 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Sun, 18 Feb 2018 16:09:39 +0700
Subject: [PATCH] GuessManagerImpl: ignore null assignment in GuessTypeVisitor
 (IDEA-CR-29504)

---
 .../com/intellij/codeInsight/guess/impl/GuessManagerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java
index 6bef8ce17605..ae1959c9cb6f 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java
@@ -414,7 +414,7 @@ public class GuessManagerImpl extends GuessManager {
       if (expression == null) return;
       PsiType type = expression.getType();
       PsiType rawType = type instanceof PsiClassType ? ((PsiClassType)type).rawType() : type;
-      if (rawType == null) return;
+      if (rawType == null || rawType.equals(PsiType.NULL)) return;
       if (mySpecificType == null) {
         mySpecificType = rawType;
       }