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

make indexing pauseable again (and IDEA-176474 now works, yay!)

Browse Source
This commit is contained in:
peter
2017-09-15 15:33:10 +02:00
parent 0a4527f77d
commit bd7340b731
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
+15 -10
View File
@@ -82,8 +82,7 @@ public class CacheUpdateRunner {
while (!project.isDisposed()) {
indicator.checkCanceled();
// todo wait for the user...
if (processSomeFilesWhileUserIsInactive(queue, progressUpdater, project, processor)) {
if (processSomeFilesWhileUserIsInactive(queue, progressUpdater, indicator, project, processor)) {
break;
}
}
@@ -101,6 +100,7 @@ public class CacheUpdateRunner {
private static boolean processSomeFilesWhileUserIsInactive(@NotNull FileContentQueue queue,
@NotNull ProgressUpdater progressUpdater,
@NotNull ProgressIndicator suspendableIndicator,
@NotNull Project project,
@NotNull Consumer<FileContent> fileProcessor) {
final ProgressIndicatorBase innerIndicator = new ProgressIndicatorBase() {
@@ -122,7 +122,7 @@ public class CacheUpdateRunner {
try {
int threadsCount = indexingThreadCount();
if (threadsCount == 1 || application.isWriteAccessAllowed()) {
Runnable process = new MyRunnable(innerIndicator, queue, isFinished, progressUpdater, project, fileProcessor);
Runnable process = new MyRunnable(innerIndicator, suspendableIndicator, queue, isFinished, progressUpdater, project, fileProcessor);
ProgressManager.getInstance().runProcess(process, innerIndicator);
}
else {
@@ -131,7 +131,7 @@ public class CacheUpdateRunner {
for (int i = 0; i < threadsCount; i++) {
AtomicBoolean ref = new AtomicBoolean();
finishedRefs[i] = ref;
Runnable process = new MyRunnable(innerIndicator, queue, ref, progressUpdater, project, fileProcessor);
Runnable process = new MyRunnable(innerIndicator, suspendableIndicator, queue, ref, progressUpdater, project, fileProcessor);
futures[i] = application.executeOnPooledThread(process);
}
isFinished.set(waitForAll(finishedRefs, futures));
@@ -179,19 +179,22 @@ public class CacheUpdateRunner {
private static class MyRunnable implements Runnable {
private final ProgressIndicatorBase myInnerIndicator;
private final ProgressIndicator mySuspendableIndicator;
private final FileContentQueue myQueue;
private final AtomicBoolean myFinished;
private final ProgressUpdater myProgressUpdater;
@NotNull private final Project myProject;
@NotNull private final Consumer<FileContent> myProcessor;
public MyRunnable(@NotNull ProgressIndicatorBase innerIndicator,
@NotNull FileContentQueue queue,
@NotNull AtomicBoolean finished,
@NotNull ProgressUpdater progressUpdater,
@NotNull Project project,
@NotNull Consumer<FileContent> fileProcessor) {
MyRunnable(@NotNull ProgressIndicatorBase innerIndicator,
@NotNull ProgressIndicator suspendableIndicator,
@NotNull FileContentQueue queue,
@NotNull AtomicBoolean finished,
@NotNull ProgressUpdater progressUpdater,
@NotNull Project project,
@NotNull Consumer<FileContent> fileProcessor) {
myInnerIndicator = innerIndicator;
mySuspendableIndicator = suspendableIndicator;
myQueue = queue;
myFinished = finished;
myProgressUpdater = progressUpdater;
@@ -206,6 +209,8 @@ public class CacheUpdateRunner {
return;
}
try {
mySuspendableIndicator.checkCanceled();
final FileContent fileContent = myQueue.take(myInnerIndicator);
if (fileContent == null) {
myFinished.set(true);