use GenericsUtil

This commit is contained in:
peter
2013-07-01 10:11:27 +02:00
parent 58b098a141
commit 8d8e924b91
@@ -329,18 +329,9 @@ public class JavaCompletionSorting {
private static PsiType removeClassWildcard(PsiType type) {
if (type instanceof PsiClassType) {
final PsiClassType psiClassType = (PsiClassType)type;
final PsiClass psiClass = psiClassType.resolve();
final PsiClass psiClass = ((PsiClassType)type).resolve();
if (psiClass != null && CommonClassNames.JAVA_LANG_CLASS.equals(psiClass.getQualifiedName())) {
final PsiType[] parameters = psiClassType.getParameters();
PsiTypeParameter[] typeParameters = psiClass.getTypeParameters();
if (parameters.length == 1 && parameters[0] instanceof PsiWildcardType && typeParameters.length == 1) {
final PsiType bound = ((PsiWildcardType)parameters[0]).getExtendsBound();
if (bound instanceof PsiClassType) {
return JavaPsiFacade.getInstance(psiClass.getProject()).getElementFactory()
.createType(psiClass, PsiSubstitutor.EMPTY.put(typeParameters[0], bound));
}
}
return GenericsUtil.eliminateWildcards(type);
}
}
return type;