EA-40088 - PIEAE: PsiElementBase.getContainingFile (validity assertions)

This commit is contained in:
peter
2012-10-17 16:23:15 +02:00
parent 1a127adafd
commit 97c089ccf7
3 changed files with 7 additions and 0 deletions
@@ -82,6 +82,9 @@ public class ExpectedTypeInfoImpl implements ExpectedTypeInfo {
}
this.defaultType = defaultType;
assert type.isValid();
assert defaultType.isValid();
}
@Override
@@ -177,6 +177,9 @@ public class JavaCompletionSorting {
final PsiType defaultType = expectedInfo.getDefaultType();
final PsiType expectedType = expectedInfo.getType();
assert expectedType.isValid();
assert defaultType.isValid();
if (defaultType != expectedType && defaultType.isAssignableFrom(itemType)) {
return ExpectedTypeMatching.ofDefaultType;
}
@@ -104,6 +104,7 @@ public class PsiPrimitiveType extends PsiType {
@Nullable
public static PsiPrimitiveType getUnboxedType(PsiType type) {
if (!(type instanceof PsiClassType)) return null;
assert type.isValid();
if (!((PsiClassType)type).getLanguageLevel().isAtLeast(LanguageLevel.JDK_1_5)) return null;
final PsiClass psiClass = ((PsiClassType)type).resolve();
if (psiClass == null) return null;