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-37682 - NPE: ChangeTypeArgumentsFix.fun

Browse Source
This commit is contained in:
anna
2012-07-26 18:21:16 +02:00
parent 51165c80da
commit 793c7a0a3a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java
+5 -1
View File
@@ -63,7 +63,8 @@ public class ChangeTypeArgumentsFix implements IntentionAction, HighPriorityActi
return "Change type arguments to <" + StringUtil.join(myPsiClass.getTypeParameters(), new Function<PsiTypeParameter, String>() {
@Override
public String fun(PsiTypeParameter typeParameter) {
return substitutor.substitute(typeParameter).getPresentableText();
final PsiType substituted = substitutor.substitute(typeParameter);
return substituted != null ? substituted.getPresentableText() : CommonClassNames.JAVA_LANG_OBJECT;
}
}, ", ") + ">";
}
@@ -94,6 +95,9 @@ public class ChangeTypeArgumentsFix implements IntentionAction, HighPriorityActi
final PsiType actualType = myExpressions[i].getType();
if (expectedType == null || actualType == null || !TypeConversionUtil.isAssignable(expectedType, actualType)) return false;
}
for (PsiTypeParameter parameter : typeParameters) {
if (substitutor.substitute(parameter) == null) return false;
}
return true;
}
}