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

DetectIndentTask: shutdown in continuation

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2016-05-30 21:08:43 +03:00
parent 1000ecea19
commit b6ace04d59
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/codeStyle/DetectAndAdjustIndentOptionsTask.java
+10 -5
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.util.ReadTask;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.EmptyRunnable;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings.IndentOptions;
@@ -79,8 +80,7 @@ class DetectAndAdjustIndentOptionsTask extends ReadTask {
public Continuation performInReadAction(@NotNull ProgressIndicator indicator) throws ProcessCanceledException {
PsiFile file = getFile();
if (file == null) {
myBoundedExecutor.shutdown();
return null;
return continuationWithExecutorShutdown(EmptyRunnable.INSTANCE);
}
if (!PsiDocumentManager.getInstance(myProject).isCommitted(myDocument)) {
@@ -90,9 +90,14 @@ class DetectAndAdjustIndentOptionsTask extends ReadTask {
IndentOptionsDetectorImpl detector = new IndentOptionsDetectorImpl(file, indicator);
IndentOptionsAdjuster adjuster = detector.getIndentOptionsAdjuster();
myBoundedExecutor.shutdown();
return adjuster != null ? new Continuation(() -> adjustOptions(adjuster)) : null;
return continuationWithExecutorShutdown(adjuster != null ? () -> adjustOptions(adjuster) : EmptyRunnable.INSTANCE);
}
private Continuation continuationWithExecutorShutdown(Runnable runnable) {
return new Continuation(() -> {
myBoundedExecutor.shutdown();
runnable.run();
});
}
private void adjustOptions(IndentOptionsAdjuster adjuster) {