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

[^kb] prefer our Disposable to picocontainer's

Browse Source
This commit is contained in:
peter
2011-05-03 18:25:39 +04:00
parent 06b56cf449
commit e0967f4396
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java
+13 -6
View File
@@ -18,6 +18,7 @@ package com.intellij.codeInsight.completion.impl;
import com.intellij.codeInsight.lookup.Classifier;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
import java.util.*;
@@ -90,16 +91,22 @@ class LiftShorterItemsClassifier extends Classifier<LookupElement> {
}
Collections.sort(prefixes);
for (String prefix : prefixes) {
List<LookupElement> shorter = new SmartList<LookupElement>();
for (LookupElement shorterElement : myElements.get(prefix)) {
if (srcSet.contains(shorterElement) && processed.add(shorterElement)) {
lifted.add(shorterElement);
if (group.isEmpty()) {
result.add(Collections.singletonList(shorterElement));
} else {
group.add(shorterElement);
}
shorter.add(shorterElement);
}
}
lifted.addAll(shorter);
final Iterable<List<LookupElement>> shorterClassified = myNext.classify(shorter);
if (group.isEmpty()) {
ContainerUtil.addAll(result, shorterClassified);
} else {
group.addAll(ContainerUtil.flatten(shorterClassified));
}
}
group.add(element);