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

some type validity assertions (EA-40027)

Browse Source
This commit is contained in:
peter
2012-10-16 15:00:25 +02:00
parent 217ee03128
commit aa4a27b491
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+6 -1
View File
@@ -370,6 +370,7 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
if (resolve instanceof PsiVariable) {
PsiType type = ((PsiVariable)resolve).getType();
ret = type instanceof PsiEllipsisType ? ((PsiEllipsisType)type).toArrayType() : type;
LOG.assertTrue(ret == null || ret.isValid());
if (resolve instanceof PsiField && !((PsiField)resolve).hasModifierProperty(PsiModifier.STATIC)) {
owner = ((PsiField)resolve).getContainingClass();
}
@@ -377,6 +378,7 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
else if (resolve instanceof PsiMethod) {
PsiMethod method = (PsiMethod)resolve;
ret = method.getReturnType();
LOG.assertTrue(ret == null || ret.isValid());
owner = method;
}
if (ret == null) return null;
@@ -390,7 +392,10 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
final PsiSubstitutor substitutor = result.getSubstitutor();
if (owner == null || !PsiUtil.isRawSubstitutor(owner, substitutor)) {
PsiType substitutedType = substitutor.substitute(ret);
return PsiImplUtil.normalizeWildcardTypeByPosition(substitutedType, expr);
LOG.assertTrue(substitutedType.isValid());
PsiType normalized = PsiImplUtil.normalizeWildcardTypeByPosition(substitutedType, expr);
LOG.assertTrue(normalized.isValid());
return normalized;
}
}