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

Java: Don't start new transaction when extracting method in background (IDEA-186521)

Browse Source
This commit is contained in:
Pavel Dolgov
2018-02-14 17:37:02 +03:00
parent 7738c390a8
commit 72de6a1fa2
1 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+36 -26
View File
@@ -16,6 +16,7 @@ import com.intellij.codeInspection.dataFlow.instructions.Instruction;
import com.intellij.ide.DataManager;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.ide.util.PsiClassListCellRenderer;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.TransactionGuard;
import com.intellij.openapi.command.WriteCommandAction;
@@ -1783,35 +1784,30 @@ public class ExtractMethodProcessor implements MatchProvider {
if (!shouldAcceptCurrentTarget(extractPass, myTargetClass)) {
final LinkedHashMap<PsiClass, List<PsiVariable>> classes = new LinkedHashMap<>();
final PsiElementProcessor<PsiClass> processor = new PsiElementProcessor<PsiClass>() {
@Override
public boolean execute(@NotNull PsiClass selectedClass) {
AnonymousTargetClassPreselectionUtil.rememberSelection(selectedClass, myTargetClass);
final List<PsiVariable> array = classes.get(selectedClass);
myNeedChangeContext = myTargetClass != selectedClass;
myTargetClass = selectedClass;
if (array != null) {
for (PsiVariable variable : array) {
if (!inputVariables.contains(variable)) {
inputVariables.addAll(array);
}
final PsiElementProcessor<PsiClass> processor = selectedClass -> {
AnonymousTargetClassPreselectionUtil.rememberSelection(selectedClass, myTargetClass);
final List<PsiVariable> array = classes.get(selectedClass);
myNeedChangeContext = myTargetClass != selectedClass;
myTargetClass = selectedClass;
if (array != null) {
for (PsiVariable variable : array) {
if (!inputVariables.contains(variable)) {
inputVariables.addAll(array);
}
}
Ref<Boolean> result = Ref.create(Boolean.FALSE);
TransactionGuard.getInstance().submitTransactionAndWait(() -> {
try {
result.set(applyChosenClassAndExtract(inputVariables, extractPass));
}
catch (PrepareFailedException e) {
if (myShowErrorDialogs) {
CommonRefactoringUtil
.showErrorHint(myProject, myEditor, e.getMessage(), ExtractMethodHandler.REFACTORING_NAME, HelpID.EXTRACT_METHOD);
ExtractMethodHandler.highlightPrepareError(e, e.getFile(), myEditor, myProject);
}
}
});
return result.get();
}
final Application app = ApplicationManager.getApplication();
if (!app.isDispatchThread() && app.isReadAccessAllowed()) {
LOG.assertTrue(!myShowErrorDialogs, "in background");
return applyChosenClassAndExtractImpl(inputVariables, extractPass);
}
final Ref<Boolean> result = Ref.create(Boolean.FALSE);
TransactionGuard.getInstance().submitTransactionAndWait(() -> {
if (applyChosenClassAndExtractImpl(inputVariables, extractPass)) {
result.set(Boolean.TRUE);
}
});
return result.get();
};
classes.put(myTargetClass, null);
@@ -1850,6 +1846,20 @@ public class ExtractMethodProcessor implements MatchProvider {
return applyChosenClassAndExtract(inputVariables, extractPass);
}
private boolean applyChosenClassAndExtractImpl(List<PsiVariable> inputVariables, Pass<ExtractMethodProcessor> extractPass) {
try {
return applyChosenClassAndExtract(inputVariables, extractPass);
}
catch (PrepareFailedException e) {
if (myShowErrorDialogs) {
CommonRefactoringUtil.showErrorHint(myProject, myEditor, e.getMessage(),
ExtractMethodHandler.REFACTORING_NAME, HelpID.EXTRACT_METHOD);
ExtractMethodHandler.highlightPrepareError(e, e.getFile(), myEditor, myProject);
}
return false;
}
}
@NotNull
protected Set<PsiVariable> getEffectivelyLocalVariables() {
Set<PsiVariable> effectivelyLocal = new LinkedHashSet<>();