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

move Class wildcard hack from ExpectedTypeInfo to completion

Browse Source
This commit is contained in:
peter
2013-06-27 18:38:26 +02:00
parent 4784b75c39
commit edec60ddfd
4 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java
-17
View File
@@ -65,23 +65,6 @@ public class ExpectedTypeInfoImpl implements ExpectedTypeInfo {
this.myTailType = myTailType;
this.dimCount = dimCount;
if (type == defaultType && type instanceof PsiClassType && dimCount == 0) {
final PsiClassType psiClassType = (PsiClassType)type;
final PsiClass psiClass = psiClassType.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) {
defaultType = JavaPsiFacade.getInstance(psiClass.getProject()).getElementFactory()
.createType(psiClass, PsiSubstitutor.EMPTY.put(typeParameters[0], bound));
}
}
}
}
this.defaultType = defaultType;
PsiUtil.ensureValidType(type);
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
+32 -2
View File
@@ -34,6 +34,7 @@ import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
@@ -260,7 +261,17 @@ public class JavaCompletionSorting {
public PreferDefaultTypeWeigher(ExpectedTypeInfo[] expectedTypes, CompletionParameters parameters) {
super("defaultType");
myExpectedTypes = expectedTypes;
myExpectedTypes = expectedTypes == null ? null : ContainerUtil.map2Array(expectedTypes, ExpectedTypeInfo.class, new Function<ExpectedTypeInfo, ExpectedTypeInfo>() {
@Override
public ExpectedTypeInfo fun(ExpectedTypeInfo info) {
PsiType type = removeClassWildcard(info.getType());
PsiType defaultType = removeClassWildcard(info.getDefaultType());
if (type == info.getType() && defaultType == info.getDefaultType()) {
return info;
}
return new ExpectedTypeInfoImpl(type, info.getKind(), 0, defaultType, info.getTailType());
}
});
myParameters = parameters;
final Pair<PsiClass,Integer> pair = TypeArgumentCompletionProvider.getTypeParameterInfo(parameters.getPosition());
@@ -293,7 +304,7 @@ public class JavaCompletionSorting {
}
for (final ExpectedTypeInfo expectedInfo : myExpectedTypes) {
final PsiType defaultType = expectedInfo.getDefaultType();
final PsiType defaultType = expectedInfo.getDefaultType();
final PsiType expectedType = expectedInfo.getType();
if (!expectedType.isValid()) {
return MyResult.normal;
@@ -316,6 +327,25 @@ public class JavaCompletionSorting {
return MyResult.normal;
}
private static PsiType removeClassWildcard(PsiType type) {
if (type instanceof PsiClassType) {
final PsiClassType psiClassType = (PsiClassType)type;
final PsiClass psiClass = psiClassType.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 type;
}
private enum MyResult {
expectedNoSelect,
exactlyDefault,
java/java-tests/testData/codeInsight/completion/smartType/CastWithGenerics-out.java
+2 -2
View File
@@ -1,9 +1,9 @@
public class Aaaaaaa {
void foo(Class<? extends Object> c) {}
void foo(Class<? extends Aaaaaaa> c) {}
void bar() {
foo((Class<Object>) <caret>Class.forName("sdd"));
foo((Class<? extends Aaaaaaa>) <caret>Class.forName("sdd"));
}
}
java/java-tests/testData/codeInsight/completion/smartType/CastWithGenerics.java
+1 -1
View File
@@ -1,6 +1,6 @@
public class Aaaaaaa {
void foo(Class<? extends Object> c) {}
void foo(Class<? extends Aaaaaaa> c) {}
void bar() {
foo((<caret>Class.forName("sdd"));