From de766d647465d031cb054728aa9dcff81fe56d54 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 11 Mar 2016 08:55:26 +0100 Subject: [PATCH] redundant write actions in tests --- .../extractMethodObject/ExtractMethodObjectHandler.java | 7 ++++++- .../com/intellij/refactoring/ExtractMethodObjectTest.java | 5 +---- .../ExtractMethodObjectWithMultipleExitPointsTest.java | 4 +--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java index d6a3ac5da79e..911c55047624 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java @@ -124,7 +124,12 @@ public class ExtractMethodObjectHandler implements RefactoringActionHandler, Con PsiDocumentManager.getInstance(project).commitAllDocuments(); if (processor.isCreateInnerClass()) { - processor.moveUsedMethodsToInner(); + ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override + public void run() { + processor.moveUsedMethodsToInner(); + } + }); PsiDocumentManager.getInstance(project).commitAllDocuments(); if (editor != null) { DuplicatesImpl.processDuplicates(extractProcessor, project, editor); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java index fcfd04b125ba..c42cc596baa3 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java @@ -57,10 +57,7 @@ public class ExtractMethodObjectTest extends LightRefactoringTestCase { extractProcessor.prepare(); extractProcessor.testPrepare(); - ApplicationManager.getApplication().runWriteAction(() -> { - ExtractMethodObjectHandler.run(getProject(), getEditor(), processor, extractProcessor); - }); - + ExtractMethodObjectHandler.run(getProject(), getEditor(), processor, extractProcessor); checkResultByFile("/refactoring/extractMethodObject/" + testName + ".java" + ".after"); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java index a65792cffd6c..0dcfe73574ab 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java @@ -64,9 +64,7 @@ public class ExtractMethodObjectWithMultipleExitPointsTest extends LightRefactor processor.setCreateInnerClass(createInnerClass); - ApplicationManager.getApplication().runWriteAction(() -> { - ExtractMethodObjectHandler.run(getProject(), getEditor(), processor, extractProcessor); - }); + ExtractMethodObjectHandler.run(getProject(), getEditor(), processor, extractProcessor); checkResultByFile("/refactoring/extractMethodObject/multipleExitPoints/" + testName + ".java" + ".after");