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

goto popups: remove synchronous element calculation when pressing Enter in an empty popup during background update

Browse Source
This commit is contained in:
peter
2014-07-25 17:28:15 +02:00
parent 8343b22655
commit 2275508fe1
1 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+5 -26
View File
@@ -1200,33 +1200,12 @@ public abstract class ChooseByNameBase {
}
protected List<Object> getChosenElements() {
List<Object> values = new ArrayList<Object>(Arrays.asList(myList.getSelectedValues()));
values.remove(EXTRA_ELEM);
values.remove(NON_PREFIX_SEPARATOR);
if (myCalcElementsThread == null || !values.isEmpty()) {
return values;
}
final String text = myTextField.getText();
if (text.length() == 0) return Collections.emptyList();
final boolean checkBoxState = myCheckBox.isSelected();
final String[] names = ourLoadNamesEachTime ? ensureNamesLoaded(checkBoxState) : getNamesSync(checkBoxState);
if (names == null) return Collections.emptyList();
Object uniqueElement = null;
for (final String name : names) {
if (text.equalsIgnoreCase(name)) {
final Object[] elements = myModel.getElementsByName(name, checkBoxState, text);
if (elements.length > 1) return Collections.emptyList();
if (elements.length == 0) continue;
if (uniqueElement != null) return Collections.emptyList();
uniqueElement = elements[0];
return ContainerUtil.filter(myList.getSelectedValues(), new Condition<Object>() {
@Override
public boolean value(Object o) {
return o != EXTRA_ELEM && o != NON_PREFIX_SEPARATOR;
}
}
return uniqueElement == null ? Collections.emptyList() : Collections.singletonList(uniqueElement);
});
}
protected void chosenElementMightChange() {