From 6e2f8fab60add046766d80bd59a97e05a25ba607 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Fri, 20 Dec 2019 17:59:24 +0700
Subject: [PATCH] TypeConstraint.Constrained.getPsiType fixed for unresolved
 types

GitOrigin-RevId: 911d40176b49d20d3314225eb173166e2c266b00
---
 .../com/intellij/codeInspection/dataFlow/TypeConstraint.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TypeConstraint.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TypeConstraint.java
index ef51507ba1a4..115a88ad0dde 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TypeConstraint.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TypeConstraint.java
@@ -269,7 +269,7 @@ public interface TypeConstraint {
     @Nullable
     @Override
     public PsiType getPsiType(Project project) {
-      PsiType[] conjuncts = StreamEx.of(myInstanceOf).map(exact -> exact.getPsiType(project)).toArray(PsiType.EMPTY_ARRAY);
+      PsiType[] conjuncts = StreamEx.of(myInstanceOf).map(exact -> exact.getPsiType(project)).nonNull().toArray(PsiType.EMPTY_ARRAY);
       return conjuncts.length == 0 ? null : PsiIntersectionType.createIntersection(true, conjuncts);
     }