MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-33078 - assert: TypeMigrationLabeler.migrateExpressionType

Browse Source 
skip expressions with null type
This commit is contained in:
Anna Kozlova
2012-02-01 11:59:40 +04:00
parent 1c999ff146
commit 955ab350a1
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
+1 -3
View File
@@ -249,9 +249,7 @@ public class TypeMigrationLabeler {
public void migrateExpressionType(final PsiExpression expr, final PsiType migrationType, final PsiElement place, boolean alreadyProcessed, final boolean isCovariant) {
PsiType originalType = expr.getType();
LOG.assertTrue(originalType != null);
if (originalType.equals(migrationType)) return;
if (originalType == null || originalType.equals(migrationType)) return;
if (originalType.equals(PsiType.NULL)) {
if (migrationType instanceof PsiPrimitiveType) {
java/java-impl/src/com/intellij/refactoring/typeMigration/rules/RootTypeConversionRule.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class RootTypeConversionRule extends TypeConversionRule {
}
if (!originalType.equals(type)) {
labeler.migrateExpressionType(actualParams[i], methodTypeParamsSubstitutor.substitute(type), context, originalType.equals(type), true);
labeler.migrateExpressionType(actualParams[i], methodTypeParamsSubstitutor.substitute(type), context, false, true);
}
}
}