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

EA-38282 - ISE: ChooseByNameBase.getNames

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-12-10 16:23:06 +04:00
parent 8d5426dc31
commit 9a9707df9d
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+9 -6
View File
@@ -1414,9 +1414,10 @@ public abstract class ChooseByNameBase {
@Override
public void run() {
try {
ensureNamesLoaded(myCheckboxState);
boolean everywhere = myCheckboxState;
ensureNamesLoaded(everywhere);
addElementsByPattern(myPattern, elements, myCancelled);
addElementsByPattern(myPattern, elements, myCancelled, everywhere);
for (Object elem : elements) {
if (myCancelled.isCanceled()) {
@@ -1463,10 +1464,11 @@ public abstract class ChooseByNameBase {
private void addElementsByPattern(@NotNull String pattern,
@NotNull final Set<Object> elements,
@NotNull final ProgressIndicator cancelled) {
@NotNull final ProgressIndicator cancelled,
boolean everywhere) {
long start = System.currentTimeMillis();
myProvider.filterElements(
ChooseByNameBase.this, pattern, myCheckboxState,
ChooseByNameBase.this, pattern, everywhere,
cancelled,
new Processor<Object>() {
@Override
@@ -1614,11 +1616,12 @@ public abstract class ChooseByNameBase {
boolean anyPlace = isSearchInAnyPlace();
setSearchInAnyPlace(false);
myCalcElementsThread.addElementsByPattern(text, prefixMatchElementsArray, indicator);
boolean everywhere = myCalcElementsThread.myCheckboxState;
myCalcElementsThread.addElementsByPattern(text, prefixMatchElementsArray, indicator, everywhere);
setSearchInAnyPlace(anyPlace);
if (anyPlace && !overFlow[0]) {
myCalcElementsThread.addElementsByPattern(text, nonPrefixMatchElementsArray, indicator);
myCalcElementsThread.addElementsByPattern(text, nonPrefixMatchElementsArray, indicator, everywhere);
nonPrefixMatchElementsArray.removeAll(prefixMatchElementsArray);
}