From 7c708a0eac9eb743123b1d82757c333364d8a3e3 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 25 Jan 2016 20:37:09 +0300
Subject: [PATCH] EA-78369 - NPE:
 PsiDiamondTypeImpl$InferredAnonymTypeVisitor.visitClassType

---
 java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java | 2 +-
 .../advHighlighting9/DiamondsWithAnonymous.java                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
index 6d0d853a5098..470b48033987 100644
--- a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
@@ -543,7 +543,7 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
         }
         
         for (PsiType psiType : resolveResult.getSubstitutor().getSubstitutionMap().values()) {
-          final Boolean accepted = psiType.accept(this);
+          final Boolean accepted = psiType != null ? psiType.accept(this) : null;
           if (accepted != null && !accepted.booleanValue()) {
             return false;
           }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/DiamondsWithAnonymous.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/DiamondsWithAnonymous.java
index 5e37ab978a0f..fe38837d4c91 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/DiamondsWithAnonymous.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/DiamondsWithAnonymous.java
@@ -11,5 +11,6 @@ class Pos {
   void testQualified() {
     Member<?> m1 = this.new Member<>() {};
     Nested<?> m2 = new Pos.Nested<>() {};
+    Nested<java.util.List> m3 = new Pos.Nested<>() {};
   }
 }
\ No newline at end of file