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

method chains completion: fix tests

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-05-04 18:40:04 +03:00
parent 1006e1c2f0
commit 6466f66af2
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/chainsSearch/completion/MethodsChainsCompletionContributor.java
+10 -7
View File
@@ -53,7 +53,8 @@ import static com.intellij.patterns.PsiJavaPatterns.psiElement;
public class MethodsChainsCompletionContributor extends CompletionContributor {
public static final String REGISTRY_KEY = "compiler.ref.chain.search";
private static final Logger LOG = Logger.getInstance(MethodsChainsCompletionContributor.class);
public static final CompletionType COMPLETION_TYPE = ApplicationManager.getApplication().isUnitTestMode() ? CompletionType.BASIC : CompletionType.SMART;
private static final boolean UNIT_TEST_MODE = ApplicationManager.getApplication().isUnitTestMode();
public static final CompletionType COMPLETION_TYPE = UNIT_TEST_MODE ? CompletionType.BASIC : CompletionType.SMART;
@SuppressWarnings("unchecked")
public MethodsChainsCompletionContributor() {
@@ -77,12 +78,14 @@ public class MethodsChainsCompletionContributor extends CompletionContributor {
result.passResult(completionResult);
});
List<LookupElement> elementsFoundByMethodsChainsSearch = searchForLookups(completionContext);
Iterator<LookupElement> it = elementsFoundByMethodsChainsSearch.iterator();
while (it.hasNext()) {
LookupElement lookupElement = it.next();
PsiElement psi = lookupElement.getPsiElement();
if (psi instanceof PsiMethod && alreadySuggested.contains(psi)) {
it.remove();
if (!UNIT_TEST_MODE) {
Iterator<LookupElement> it = elementsFoundByMethodsChainsSearch.iterator();
while (it.hasNext()) {
LookupElement lookupElement = it.next();
PsiElement psi = lookupElement.getPsiElement();
if (psi instanceof PsiMethod && alreadySuggested.contains(psi)) {
it.remove();
}
}
}
result.addAllElements(elementsFoundByMethodsChainsSearch);