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

Expire computation when a project is disposed (IDEA-227185 AssertionError: Already disposed)

Browse Source 
GitOrigin-RevId: 89b033ae5eb5b0f098b2d729cda0d946bcba4d82
This commit is contained in:
Rustam Vishnyakov
2019-11-25 14:04:51 +00:00
committed by intellij-monorepo-bot
parent f50f12eda8
commit a8b41e3969
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/application/options/CodeStyleCachedValueProvider.java
+15 -13
View File
@@ -90,15 +90,6 @@ class CodeStyleCachedValueProvider implements CachedValueProvider<CodeStyleSetti
return instance;
}
private void notifyCachedValueComputed(@NotNull PsiFile file) {
Project project = file.getProject();
if (!project.isDisposed()) {
final CodeStyleSettingsManager settingsManager = CodeStyleSettingsManager.getInstance(project);
settingsManager.fireCodeStyleSettingsChanged(file);
}
myComputation.reset();
}
private static void logCached(@NotNull PsiFile file, @NotNull CodeStyleSettings settings) {
LOG.debug(String.format(
"File: %s (%s), cached: %s, tracker: %d", file.getName(), Integer.toHexString(file.hashCode()), settings,
@@ -114,9 +105,11 @@ class CodeStyleCachedValueProvider implements CachedValueProvider<CodeStyleSetti
private volatile @NotNull CodeStyleSettings myCurrResult;
private final @NotNull CodeStyleSettingsManager mySettingsManager;
private final SimpleModificationTracker myTracker = new SimpleModificationTracker();
private final Project myProject;
private AsyncComputation() {
mySettingsManager = CodeStyleSettingsManager.getInstance(myFile.getProject());
myProject = myFile.getProject();
mySettingsManager = CodeStyleSettingsManager.getInstance(myProject);
//noinspection deprecation
myCurrResult = mySettingsManager.getCurrentSettings();
}
@@ -124,7 +117,8 @@ class CodeStyleCachedValueProvider implements CachedValueProvider<CodeStyleSetti
private void start() {
if (isRunOnBackground()) {
ReadAction.nonBlocking(() -> computeSettings())
.finishOnUiThread(ModalityState.NON_MODAL, val -> notifyCachedValueComputed(myFile))
.expireWith(myProject)
.finishOnUiThread(ModalityState.NON_MODAL, val -> notifyCachedValueComputed())
.submit(ourExecutorService);
}
else {
@@ -141,10 +135,10 @@ class CodeStyleCachedValueProvider implements CachedValueProvider<CodeStyleSetti
private void notifyOnEdt() {
final Application application = ApplicationManager.getApplication();
if (application.isDispatchThread()) {
notifyCachedValueComputed(myFile);
notifyCachedValueComputed();
}
else {
application.invokeLater(() -> notifyCachedValueComputed(myFile), ModalityState.any());
application.invokeLater(() -> notifyCachedValueComputed(), ModalityState.any());
}
}
@@ -194,5 +188,13 @@ class CodeStyleCachedValueProvider implements CachedValueProvider<CodeStyleSetti
void reset() {
myIsActive.set(false);
}
private void notifyCachedValueComputed() {
if (!myProject.isDisposed()) {
final CodeStyleSettingsManager settingsManager = CodeStyleSettingsManager.getInstance(myProject);
settingsManager.fireCodeStyleSettingsChanged(myFile);
}
myComputation.reset();
}
}
}