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

DumbServiceImpl: cleanup and restore the ability to finish indexing in the same modality state where it was started

Browse Source
This commit is contained in:
peter
2016-07-29 19:55:28 +02:00
parent ded3f46951
commit 7628369f75
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java
+4 -5
View File
@@ -293,7 +293,7 @@ public class DumbServiceImpl extends DumbService implements Disposable, Modifica
private void queueUpdateFinished(boolean modal) {
if (myUpdateFinishedQueued) return;
myUpdateFinishedQueued = true;
TransactionGuard.submitTransaction(myProject, () -> ApplicationManager.getApplication().runWriteAction(() -> updateFinished(modal)));
TransactionGuard.getInstance().submitTransaction(myProject, myDumbStartTransaction, () -> WriteAction.run(() -> updateFinished(modal)));
}
private void updateFinished(boolean modal) {
@@ -516,7 +516,7 @@ public class DumbServiceImpl extends DumbService implements Disposable, Modifica
return result.get();
}
private void invokeAndWaitIfNeeded(Runnable runnable) {
private static void invokeAndWaitIfNeeded(Runnable runnable) {
Application app = ApplicationManager.getApplication();
if (app.isDispatchThread()) {
runnable.run();
@@ -525,14 +525,13 @@ public class DumbServiceImpl extends DumbService implements Disposable, Modifica
Semaphore semaphore = new Semaphore();
semaphore.down();
//noinspection SSBasedInspection
SwingUtilities.invokeLater(() -> {
app.invokeLater(() -> {
try {
runnable.run();
} finally {
semaphore.up();
}
});
}, ModalityState.any());
try {
semaphore.waitFor();
}