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

after common prefix insertion, frozen items may suddenly disappear from the lookup model (EA-27207)

Browse Source
This commit is contained in:
peter
2011-06-01 16:20:04 +02:00
parent c2e13969c4
commit 045b5445b2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+6 -3
View File
@@ -378,7 +378,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
final Pair<List<LookupElement>,Iterable<List<LookupElement>>> snapshot = myModel.getModelSnapshot();
final List<LookupElement> items = matchingItems(snapshot);
final LinkedHashSet<LookupElement> items = matchingItems(snapshot);
checkMinPrefixLengthChanges(items);
@@ -389,7 +389,10 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
LinkedHashSet<LookupElement> model = new LinkedHashSet<LookupElement>();
model.addAll(getPrefixItems(items, true));
model.addAll(getPrefixItems(items, false));
myFrozenItems.retainAll(items);
model.addAll(myFrozenItems);
addMostRelevantItems(model, snapshot.second);
if (hasPreselected) {
model.add(myPreselectedItem);
@@ -431,8 +434,8 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
}
}
private List<LookupElement> matchingItems(Pair<List<LookupElement>, Iterable<List<LookupElement>>> snapshot) {
final List<LookupElement> items = new ArrayList<LookupElement>();
private LinkedHashSet<LookupElement> matchingItems(Pair<List<LookupElement>, Iterable<List<LookupElement>>> snapshot) {
final LinkedHashSet<LookupElement> items = new LinkedHashSet<LookupElement>();
for (LookupElement element : snapshot.first) {
if (prefixMatches(element)) {
items.add(element);