From 1149601c1b4c9ab0244616c86275f2c036fbe65f Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Wed, 9 Dec 2015 22:49:42 +0300 Subject: [PATCH] type migration tests fixed --- .../refactoring/typeMigration/TypeMigrationLabeler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java index 1161f68490be..681e5a5a74af 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java @@ -468,9 +468,10 @@ public class TypeMigrationLabeler { if (!userDefinedType) { final Set collector; - if (originalType instanceof PsiClassReferenceType) { + final PsiType rootInitialType = getElementType(getCurrentRoot().getElement()); + if (rootInitialType instanceof PsiClassReferenceType) { collector = new HashSet(); - final PsiJavaCodeReferenceElement reference = ((PsiClassReferenceType)originalType).getReference(); + final PsiJavaCodeReferenceElement reference = ((PsiClassReferenceType)rootInitialType).getReference(); RefactoringUtil.collectTypeParameters(collector, reference); } else { collector = Collections.emptySet();