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 completion: don't deselect TreeMap (IDEA-189544)

Browse Source 
it wasn't preselected because there were 8 signatures "to implement",
coming from Map default methods
This commit is contained in:
peter
2018-04-17 18:12:28 +02:00
parent 07ae4deaf9
commit e45f94c07d
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/AbstractExpectedTypeSkipper.java
+6 -2
View File
@@ -16,7 +16,7 @@
package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.ExpectedTypeInfo;
import com.intellij.codeInsight.generation.OverrideImplementUtil;
import com.intellij.codeInsight.generation.OverrideImplementExploreUtil;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.psi.*;
import com.intellij.psi.statistics.StatisticsManager;
@@ -65,7 +65,11 @@ public class AbstractExpectedTypeSkipper extends CompletionPreselectSkipper {
}
}
toImplement += OverrideImplementUtil.getMethodSignaturesToImplement(psiClass).size();
toImplement += OverrideImplementExploreUtil.getMapToOverrideImplement(psiClass, true)
.values()
.stream()
.filter(c -> ((PsiMethod)c.getElement()).hasModifierProperty(PsiModifier.ABSTRACT))
.count();
if (toImplement > 2) return Result.ABSTRACT;
final ExpectedTypeInfo[] infos = JavaCompletionUtil.EXPECTED_TYPES.getValue(location);
java/java-tests/testData/codeInsight/completion/smartType/PreselectTreeMapWhenSortedMapExpected.java
+7
View File
@@ -0,0 +1,7 @@
import java.util.*;
class F {
{
SortedMap<String, String> m = new <caret>
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartType18CompletionTest.java
+5
View File
@@ -269,4 +269,9 @@ public void testConvertToObjectStream() {
assertOrderedEquals(myFixture.getLookupElementStrings(), "() -> ");
}
public void testPreselectTreeMapWhenSortedMapExpected() {
configureByTestName();
myFixture.assertPreferredCompletionItems(2, "SortedMap", "NavigableMap", "TreeMap", "ConcurrentNavigableMap", "ConcurrentSkipListMap");
}
}