From fa025d47b442f9ff54b9097f71ffa4a2902aa46a Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 26 Apr 2012 19:53:07 +0200
Subject: [PATCH] don't intersect null type with anything (EA-35696)

---
 .../intellij/codeInsight/completion/JavaCompletionUtil.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
index 5d78b19644d4..a97e1316b6ed 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
@@ -436,8 +436,9 @@ public class JavaCompletionUtil {
 
     PsiType runtimeQualifier = getQualifierCastType(javaReference, parameters);
     if (runtimeQualifier != null) {
-      javaReference = (PsiReferenceExpression) JavaPsiFacade.getElementFactory(element.getProject()).createExpressionFromText("xxx.xxx", createContextWithXxxVariable(element,
-                                                                                                                                                                      PsiIntersectionType.createIntersection(qualifierType, runtimeQualifier)));
+      PsiType composite = qualifierType == null ? runtimeQualifier : PsiIntersectionType.createIntersection(qualifierType, runtimeQualifier);
+      PsiElement ctx = createContextWithXxxVariable(element, composite);
+      javaReference = (PsiReferenceExpression) JavaPsiFacade.getElementFactory(element.getProject()).createExpressionFromText("xxx.xxx", ctx);
       qualifierType = runtimeQualifier;
     }