type migration: do not search for conversion when types are convertible (IDEA-117634)

This commit is contained in:
anna
2013-12-05 20:29:42 +01:00
parent 2ace283778
commit 7cecc22ed3
@@ -464,7 +464,9 @@ class TypeMigrationStatementProcessor extends JavaRecursiveElementVisitor {
case TypeInfection.RIGHT_INFECTED:
PsiType psiType = migrationType != null ? migrationType : right.getType();
if (psiType != null && declarationType != null && !myLabeler.addMigrationRoot(variable, psiType, myStatement, TypeConversionUtil.isAssignable(declarationType, psiType), true)) {
if (psiType != null && declarationType != null &&
!myLabeler.addMigrationRoot(variable, psiType, myStatement, TypeConversionUtil.isAssignable(declarationType, psiType), true) &&
!TypeConversionUtil.isAssignable(left.getType(), psiType)) {
myLabeler.convertExpression(value, psiType, left.getType(), isCovariantPosition);
}
break;