From 1b5964b4a4a5629532cd01047dc24bec2bef7f9e Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 2 Mar 2018 12:36:46 +0700 Subject: [PATCH] SubstitutionVisitor#visitClassType: keep annotations Necessary for IDEA-186732 --- .../src/com/intellij/psi/impl/PsiSubstitutorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d23c3a6b3e72..72eddf6ad77d 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 @@ -245,7 +245,7 @@ public class PsiSubstitutorImpl implements PsiSubstitutor { } PsiClassType result = JavaPsiFacade.getElementFactory(aClass.getProject()).createType(aClass, createSubstitutor(hashMap), classType.getLanguageLevel()); PsiUtil.ensureValidType(result); - return result; + return result.annotate(classType.getAnnotationProvider()); } private PsiType substituteTypeParameter(@NotNull PsiTypeParameter typeParameter) {