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

Java: Inspection that checks if a field or method accessed via reflection does exist and is visible - review follow up (IDEA-168837, IDEA-CR-20535)

Browse Source
This commit is contained in:
Pavel Dolgov
2017-04-26 15:43:52 +03:00
parent 5150098f18
commit d971724a00
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceUtil.java
+3 -16
View File
@@ -144,11 +144,9 @@ public class JavaReflectionReferenceUtil {
if (!isJavaLangClass(resolvedElement)) return null;
final PsiTypeParameter[] parameters = resolvedElement.getTypeParameters();
if (parameters.length == 1) {
PsiType typeArgument = resolveResult.getSubstitutor().substitute(parameters[0]);
if (typeArgument instanceof PsiCapturedWildcardType) {
typeArgument = ((PsiCapturedWildcardType)typeArgument).getUpperBound();
}
final PsiClass argumentClass = unwrapTypeParameter(PsiTypesUtil.getPsiClass(typeArgument));
final PsiType typeArgument = resolveResult.getSubstitutor().substitute(parameters[0]);
final PsiType erasure = TypeConversionUtil.erasure(typeArgument);
final PsiClass argumentClass = PsiTypesUtil.getPsiClass(erasure);
if (argumentClass != null && !isJavaLangObject(argumentClass)) {
return ReflectiveType.create(argumentClass);
}
@@ -200,17 +198,6 @@ public class JavaReflectionReferenceUtil {
return ReflectiveType.create(expression.getType(), expression);
}
@Contract("null -> null")
@Nullable
private static PsiClass unwrapTypeParameter(@Nullable PsiClass psiClass) {
int preventEndlessLoop = 5;
while (psiClass instanceof PsiTypeParameter && --preventEndlessLoop > 0) {
final PsiClassType[] extendsList = psiClass.getExtendsListTypes();
psiClass = extendsList.length != 0 ? extendsList[0].resolve() : null;
}
return psiClass;
}
@Contract("null,_->null")
@Nullable
public static <T> T computeConstantExpression(@Nullable PsiExpression expression, @NotNull Class<T> expectedType) {