From 46c5ed5466f786a4d0783054b2110d840cf220f5 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Tue, 24 May 2016 15:12:21 +0200
Subject: [PATCH] revert revert

---
 .../src/com/intellij/psi/impl/PsiSubstitutorImpl.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
index e0917860dbad..1f03e144be73 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
@@ -233,7 +233,11 @@ public class PsiSubstitutorImpl implements PsiSubstitutor {
           final PsiType result = substituteTypeParameter(typeParameter);
           if (result != null) {
             PsiUtil.ensureValidType(result);
-            if (false) {
+            if (result instanceof PsiImmediateClassType ||
+                result instanceof PsiClassReferenceType ||
+                result instanceof TypeCorrector.PsiCorrectedClassType ||
+                result instanceof PsiArrayType ||
+                result instanceof PsiWildcardType) {
               return result.annotate(new TypeAnnotationProvider() {
                 @NotNull
                 @Override
@@ -243,7 +247,7 @@ public class PsiSubstitutorImpl implements PsiSubstitutor {
               });
             }
           }
-          return null;
+          return result;
         }
         return classType;
       }