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

IDEA-164537 Rerun "Find Usages" ignores specified scope

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-12-01 12:48:21 +03:00
parent 7fb1f1c146
commit 8d550f3af4
1 changed files with 7 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+7 -48
View File
@@ -27,10 +27,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.progress.util.ProgressWrapper;
import com.intellij.openapi.progress.util.TooManyUsagesStatus;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.openapi.project.Project;
@@ -46,7 +43,6 @@ import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.Navigatable;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiManager;
import com.intellij.psi.SmartPointerManager;
import com.intellij.psi.SmartPsiElementPointer;
import com.intellij.psi.impl.PsiDocumentManagerBase;
@@ -59,7 +55,10 @@ import com.intellij.usageView.UsageViewBundle;
import com.intellij.usageView.UsageViewManager;
import com.intellij.usages.*;
import com.intellij.usages.rules.*;
import com.intellij.util.*;
import com.intellij.util.Alarm;
import com.intellij.util.Consumer;
import com.intellij.util.EditSourceOnDoubleClickHandler;
import com.intellij.util.ReflectionUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.TransferToEDTQueue;
import com.intellij.util.enumeration.EmptyEnumeration;
@@ -85,7 +84,6 @@ import java.awt.event.*;
import java.util.*;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
/**
* @author max
@@ -867,48 +865,9 @@ public class UsageViewImpl implements UsageView {
}
private void doReRun() {
final AtomicInteger usageCountWithoutDefinition = new AtomicInteger(0);
final Project project = myProject;
Task.Backgroundable task = new Task.Backgroundable(project, UsageViewManagerImpl.getProgressTitle(myPresentation)) {
@Override
public void run(@NotNull final ProgressIndicator indicator) {
final TooManyUsagesStatus tooManyUsagesStatus = TooManyUsagesStatus.createFor(indicator);
setSearchInProgress(true);
associateProgress(indicator);
Processor<Usage> processor = usage -> {
if (searchHasBeenCancelled()) return false;
tooManyUsagesStatus.pauseProcessingIfTooManyUsages();
boolean incrementCounter = !com.intellij.usages.UsageViewManager.isSelfUsage(usage, myTargets);
if (incrementCounter) {
final int usageCount = usageCountWithoutDefinition.incrementAndGet();
if (usageCount > UsageLimitUtil.USAGES_LIMIT) {
if (tooManyUsagesStatus.switchTooManyUsagesStatus()) {
UsageViewManagerImpl
.showTooManyUsagesWarning(project, tooManyUsagesStatus, indicator, getPresentation(), usageCountWithoutDefinition.get(),
UsageViewImpl.this);
}
}
ApplicationManager.getApplication().runReadAction(() -> appendUsage(usage));
}
return !indicator.isCanceled();
};
myChangesDetected = false;
PsiManager.getInstance(project).startBatchFilesProcessingMode();
try {
myUsageSearcherFactory.create().generate(processor);
drainQueuedUsageNodes();
}
finally {
PsiManager.getInstance(project).finishBatchFilesProcessingMode();
}
setSearchInProgress(false);
}
};
ProgressManager.getInstance().run(task);
close();
com.intellij.usages.UsageViewManager.getInstance(getProject()).
searchAndShowUsages(myTargets, myUsageSearcherFactory, true, true, myPresentation, null);
}
private void reset() {