MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

ensure resolve caches are invalidated inside write action (IDEA-163299)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-10-31 11:36:40 +01:00
parent ed55e36a8d
commit 069c88fb6e
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/migration/MigrationProcessor.java
+18 -2
View File
@@ -17,6 +17,10 @@ package com.intellij.refactoring.migration;
import com.intellij.history.LocalHistory;
import com.intellij.history.LocalHistoryAction;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
@@ -107,12 +111,24 @@ public class MigrationProcessor extends BaseRefactoringProcessor {
}
}
finally {
myPsiMigration.finish();
myPsiMigration = null;
Application application = ApplicationManager.getApplication();
if (application.isUnitTestMode()) {
finishFindMigration();
}
else {
//invalidating resolve caches without write action could lead to situations when somebody with read action resolves reference and gets ResolveResult
//then here, in another read actions, all caches are invalidated but those resolve result is used without additional checks inside that read action - but it's already invalid
application.invokeLater(() -> WriteAction.run(() -> finishFindMigration()), ModalityState.NON_MODAL);
}
}
return usagesVector.toArray(UsageInfo.EMPTY_ARRAY);
}
private void finishFindMigration() {
myPsiMigration.finish();
myPsiMigration = null;
}
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
if (refUsages.get().length == 0) {
Messages.showInfoMessage(myProject, RefactoringBundle.message("migration.no.usages.found.in.the.project"), REFACTORING_NAME);