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

introduce: suggest boxed type if applicable (IDEA-24049)

Browse Source
This commit is contained in:
anna
2010-11-18 16:03:55 +03:00
parent b804cecbb1
commit 52009270a2
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/ui/TypeSelectorManagerImpl.java
+12 -3
View File
@@ -244,20 +244,29 @@ public class TypeSelectorManagerImpl implements TypeSelectorManager {
visitor.visitType(psiType);
}
final PsiType defaultType = getDefaultType();
for (int index = 0; index < result.size(); index++) {
PsiType psiType = result.get(index);
if (psiType.equals(getDefaultType())) {
if (psiType.equals(defaultType)) {
result.remove(index);
break;
}
}
final PsiPrimitiveType unboxedType = PsiPrimitiveType.getUnboxedType(getDefaultType());
final PsiPrimitiveType unboxedType = PsiPrimitiveType.getUnboxedType(defaultType);
if (unboxedType != null) {
result.remove(unboxedType);
result.add(0, unboxedType);
}
result.add(0, getDefaultType());
if (defaultType instanceof PsiPrimitiveType && myMainOccurence != null) {
final PsiClassType boxedType = ((PsiPrimitiveType)defaultType).getBoxedType(myMainOccurence);
if (boxedType != null) {
result.remove(boxedType);
result.add(0, boxedType);
}
}
result.add(0, defaultType);
return result;
}