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

don't show progress forever in goto popups when the calculating thread throws an exception

Browse Source
This commit is contained in:
peter
2016-10-10 19:02:26 +02:00
parent e812742d89
commit 69375e6833
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+20 -7
View File
@@ -1506,13 +1506,7 @@ public abstract class ChooseByNameBase {
if (myProject != null && myProject.isDisposed()) return null;
final Set<Object> elements = new LinkedHashSet<>();
boolean scopeExpanded = fillWithScopeExpansion(elements, myPattern);
String lowerCased = patternToLowerCase(myPattern);
if (elements.isEmpty() && !lowerCased.equals(myPattern)) {
scopeExpanded = fillWithScopeExpansion(elements, lowerCased);
}
boolean scopeExpanded = populateElements(elements);
final String cardToShow = elements.isEmpty() ? NOT_FOUND_CARD : scopeExpanded ? NOT_FOUND_IN_PROJECT_CARD : CHECK_BOX_CARD;
Set<Object> filtered = filter(elements);
@@ -1528,6 +1522,25 @@ public abstract class ChooseByNameBase {
}, myModalityState);
}
private boolean populateElements(Set<Object> elements) {
boolean scopeExpanded = false;
try {
scopeExpanded = fillWithScopeExpansion(elements, myPattern);
String lowerCased = patternToLowerCase(myPattern);
if (elements.isEmpty() && !lowerCased.equals(myPattern)) {
scopeExpanded = fillWithScopeExpansion(elements, lowerCased);
}
}
catch (ProcessCanceledException e) {
throw e;
}
catch (Exception e) {
LOG.error(e);
}
return scopeExpanded;
}
private boolean fillWithScopeExpansion(Set<Object> elements, String pattern) {
if (!ourLoadNamesEachTime) ensureNamesLoaded(myCheckboxState);
addElementsByPattern(pattern, elements, myProgress, myCheckboxState);