revert revert

2026-09-27 10:03:11 +07:00 · 2016-05-24 15:14:02 +02:00
parent 84412b4555
commit 46c5ed5466
1 changed files with 6 additions and 2 deletions
@@ -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;
      }