diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java index 7d9ec95e7004..a03fd1869dbf 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java @@ -69,7 +69,7 @@ public abstract class GenerateMembersHandlerBase implements CodeInsightActionHan final ClassMember[] members = chooseOriginalMembers(aClass, project, editor); if (members == null) return; - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(project, new Runnable() { @Override public void run() { doGenerate(project, editor, aClass, members); diff --git a/java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java b/java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java index 94a0929b40d0..649634903574 100644 --- a/java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java +++ b/java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java @@ -195,7 +195,7 @@ public class NullityInferrer { private static void invoke(final Project project, final PsiModifierListOwner element, final String fqn, final String toRemove) { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(project, new Runnable() { @Override public void run() { new AddAnnotationFix(fqn, element, toRemove).invoke(project, null, element.getContainingFile()); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java index 8774f148c94a..4e7cc1f0e6bb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java @@ -204,7 +204,7 @@ public class ClassNameCompletionTest extends LightFixtureCompletionTestCase { } private void cleanupVfs() { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { FileDocumentManager.getInstance().saveAllDocuments(); for (VirtualFile file : myFixture.getTempDirFixture().getFile("").getChildren()) { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/HighlightStressTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/HighlightStressTest.java index 4d7511ff7ef1..101fe0d2aa02 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/HighlightStressTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/HighlightStressTest.java @@ -225,7 +225,7 @@ public class HighlightStressTest extends LightDaemonAnalyzerTestCase { if (v>100) break; } final String text = imports + "\n class X {{\n" + usages + "}}"; - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { getEditor().getDocument().setText(text); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java index a79cee82879e..b50052b71750 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java @@ -74,7 +74,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase { getProject(), new Runnable() { @Override public void run() { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { try { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java index 6643e44fc77c..bb2f2b9fe51e 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java @@ -270,7 +270,7 @@ public class LightAdvHighlightingTest extends LightDaemonAnalyzerTestCase { enableInspectionTool(deadCodeInspection); doTest(true, false); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { PsiDirectory directory = myFile.getParent(); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/RehighlightingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/RehighlightingTest.groovy index 6120fb998cc7..b97c0d6e4a17 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/RehighlightingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/RehighlightingTest.groovy @@ -54,7 +54,7 @@ import java.lang.reflect.Modifier; myFixture.type(' ') assert myFixture.doHighlighting().size() > 0 - WriteCommandAction.runWriteCommandAction { + WriteCommandAction.runWriteCommandAction project, { myFixture.editor.document.insertString(myFixture.editor.caretModel.offset, caption) } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedSymbolLocalTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedSymbolLocalTest.java index 59e5caf8bbcb..2652f737c190 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedSymbolLocalTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedSymbolLocalTest.java @@ -46,7 +46,7 @@ public class UnusedSymbolLocalTest extends DaemonAnalyzerTestCase { assertEquals(0, collection.size()); final int offset = myEditor.getCaretModel().getOffset(); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { document.insertString(offset, "//"); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java index ebb90f314372..d2e17d81fc0f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java @@ -93,7 +93,7 @@ public class OrderEntryTest extends DaemonAnalyzerTestCase { if (!actionShouldBeAvailable) { fail("Action '" + text + "' is available in test " + testFullPath); } - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { action.invoke(getProject(), getEditor(), getFile()); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableAccessFromInnerClass18Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableAccessFromInnerClass18Test.java index 826e7666eb03..2a3b06001a51 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableAccessFromInnerClass18Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableAccessFromInnerClass18Test.java @@ -33,7 +33,7 @@ public class VariableAccessFromInnerClass18Test extends LightQuickFixTestCase { @Override protected void beforeActionStarted(String testName, String contents) { for (int i=0;i<10;i++) { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { myEditor.getDocument().insertString(myEditor.getCaretModel().getOffset(), "//"); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/BlockIndentOnPasteTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/BlockIndentOnPasteTest.groovy index dcb23d557707..d6b1e99047cb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/BlockIndentOnPasteTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/BlockIndentOnPasteTest.groovy @@ -757,7 +757,7 @@ class Test { try { def offset = myFixture.editor.caretModel.offset def column = myFixture.editor.caretModel.logicalPosition.column - com.intellij.openapi.command.WriteCommandAction.runWriteCommandAction { + com.intellij.openapi.command.WriteCommandAction.runWriteCommandAction project, { myFixture.editor.document.insertString(offset, toPaste) PasteHandler.indentBlock(project, myFixture.editor, offset, offset + toPaste.length(), column) } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy index b98625f4abf9..0d83aec2218f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy @@ -57,7 +57,7 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase { CodeInsightSettings.instance.COMPLETION_CASE_SENSITIVE = CodeInsightSettings.FIRST_LETTER CodeInsightSettings.instance.SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS = false if (state != null) { - WriteCommandAction.runWriteCommandAction { + WriteCommandAction.runWriteCommandAction project, { state.gotoEnd() }; } @@ -424,7 +424,7 @@ class Foo { } private writeCommand(Runnable runnable) { - WriteCommandAction.runWriteCommandAction(runnable) + WriteCommandAction.runWriteCommandAction(null, runnable) } public void testSearchByDescriptionWhenTemplatesListed() { diff --git a/java/java-tests/testSrc/com/intellij/index/IndexTest.java b/java/java-tests/testSrc/com/intellij/index/IndexTest.java index 7b3fb47c3922..140d8a4fcee7 100644 --- a/java/java-tests/testSrc/com/intellij/index/IndexTest.java +++ b/java/java-tests/testSrc/com/intellij/index/IndexTest.java @@ -207,7 +207,7 @@ public class IndexTest extends IdeaTestCase { final GlobalSearchScope scope = GlobalSearchScope.allScope(getProject()); final JavaPsiFacade facade = JavaPsiFacade.getInstance(getProject()); assertNotNull(facade.findClass("Foo", scope)); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { PsiFile psiFile = PsiManager.getInstance(getProject()).findFile(vFile); @@ -236,7 +236,7 @@ public class IndexTest extends IdeaTestCase { final GlobalSearchScope scope = GlobalSearchScope.allScope(getProject()); final JavaPsiFacade facade = JavaPsiFacade.getInstance(getProject()); assertNull(facade.findClass("Foo", scope)); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { PsiFile psiFile = PsiManager.getInstance(getProject()).findFile(vFile); diff --git a/java/java-tests/testSrc/com/intellij/openapi/roots/impl/ProjectLibrariesTest.java b/java/java-tests/testSrc/com/intellij/openapi/roots/impl/ProjectLibrariesTest.java index 16e42f799214..bd41a9ccc06d 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/roots/impl/ProjectLibrariesTest.java +++ b/java/java-tests/testSrc/com/intellij/openapi/roots/impl/ProjectLibrariesTest.java @@ -42,7 +42,7 @@ import java.util.Arrays; public class ProjectLibrariesTest extends IdeaTestCase { public void test() { final LibraryTable libraryTable = ProjectLibraryTable.getInstance(myProject); - Library lib = WriteCommandAction.runWriteCommandAction(new Computable() { + Library lib = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public Library compute() { return libraryTable.createLibrary("LIB"); @@ -52,7 +52,7 @@ public class ProjectLibrariesTest extends IdeaTestCase { final JavaPsiFacade manager = getJavaFacade(); assertNull(manager.findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule))); final File file = new File(PathManagerEx.getTestDataPath() + "/psi/repositoryUse/cls"); - final VirtualFile root = WriteCommandAction.runWriteCommandAction(new Computable() { + final VirtualFile root = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public VirtualFile compute() { return LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file); @@ -73,7 +73,7 @@ public class ProjectLibrariesTest extends IdeaTestCase { public void test1() { final LibraryTable libraryTable = ProjectLibraryTable.getInstance(myProject); - Library lib = WriteCommandAction.runWriteCommandAction(new Computable() { + Library lib = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public Library compute() { return libraryTable.createLibrary("LIB"); @@ -86,7 +86,7 @@ public class ProjectLibrariesTest extends IdeaTestCase { final ModifiableRootModel rootModel2 = ModuleRootManager.getInstance(myModule).getModifiableModel(); assertNotNull(rootModel2.findLibraryOrderEntry(lib)); final File file = new File(PathManagerEx.getTestDataPath() + "/psi/repositoryUse/cls"); - final VirtualFile root = WriteCommandAction.runWriteCommandAction(new Computable() { + final VirtualFile root = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public VirtualFile compute() { return LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file); diff --git a/java/java-tests/testSrc/com/intellij/projectView/ProjectViewUpdatingTest.java b/java/java-tests/testSrc/com/intellij/projectView/ProjectViewUpdatingTest.java index a9436916dd39..dc7ab08b524b 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/ProjectViewUpdatingTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/ProjectViewUpdatingTest.java @@ -68,7 +68,7 @@ public class ProjectViewUpdatingTest extends BaseProjectViewTestCase { final PsiClass[] classes = JavaDirectoryService.getInstance() .getPackage(getContentDirectory().findSubdirectory("src").findSubdirectory("com").findSubdirectory("package1")).getClasses(); sortClassesByName(classes); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { classes[0].delete(); } diff --git a/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java b/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java index 43dffde4c63d..e9cd4ecd0f53 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java @@ -18,7 +18,6 @@ package com.intellij.projectView; import com.intellij.JavaTestUtil; import com.intellij.ide.structureView.newStructureView.StructureViewComponent; import com.intellij.ide.util.InheritedMembersNodeProvider; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Document; @@ -150,7 +149,7 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase { @Override public void run() { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { try { diff --git a/java/java-tests/testSrc/com/intellij/psi/AddRemoveInTypeParameterListTest.java b/java/java-tests/testSrc/com/intellij/psi/AddRemoveInTypeParameterListTest.java index 9509bcde109d..0c08c28b0092 100644 --- a/java/java-tests/testSrc/com/intellij/psi/AddRemoveInTypeParameterListTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/AddRemoveInTypeParameterListTest.java @@ -55,7 +55,7 @@ public class AddRemoveInTypeParameterListTest extends LightIdeaTestCase{ PsiReferenceParameterList list = ref.getParameterList(); final PsiTypeElement[] parms = list.getTypeParameterElements(); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { parms[0].delete(); diff --git a/java/java-tests/testSrc/com/intellij/psi/ArrayIndexOutOfBoundsTest.java b/java/java-tests/testSrc/com/intellij/psi/ArrayIndexOutOfBoundsTest.java index 4297a4986f24..4c8ada5b23f5 100644 --- a/java/java-tests/testSrc/com/intellij/psi/ArrayIndexOutOfBoundsTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/ArrayIndexOutOfBoundsTest.java @@ -99,7 +99,7 @@ public class ArrayIndexOutOfBoundsTest extends PsiTestCase { public void run() { final PsiPackage aPackage = JavaPsiFacade.getInstance(myPsiManager.getProject()).findPackage("anotherBla"); assertNotNull("Package anotherBla not found", aPackage); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { aPackage.getDirectories()[0].delete(); diff --git a/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy b/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy index 714f5fcdbb15..4f9e52ebdbc8 100644 --- a/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy +++ b/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy @@ -32,7 +32,7 @@ class AstLeaksTest extends LightCodeInsightFixtureTestCase { assert file.findElementAt(0) instanceof PsiKeyword LeakHunter.checkLeak(file, JavaFileElement) - WriteCommandAction.runWriteCommandAction { + WriteCommandAction.runWriteCommandAction project, { file.viewProvider.document.insertString(0, ' ') PsiDocumentManager.getInstance(project).commitAllDocuments() assert file.findElementAt(0) instanceof PsiWhiteSpace diff --git a/java/java-tests/testSrc/com/intellij/psi/ConstantValuesTest.java b/java/java-tests/testSrc/com/intellij/psi/ConstantValuesTest.java index dac00695175f..5c3b63139860 100644 --- a/java/java-tests/testSrc/com/intellij/psi/ConstantValuesTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/ConstantValuesTest.java @@ -62,7 +62,7 @@ public class ConstantValuesTest extends PsiTestCase{ final PsiJavaFile file = (PsiJavaFile)myClass.getContainingFile(); WriteCommandAction.runWriteCommandAction( - new Runnable() { + null, new Runnable() { @Override public void run() { try { diff --git a/java/java-tests/testSrc/com/intellij/psi/JavaSOEOnReparsePerformanceTest.java b/java/java-tests/testSrc/com/intellij/psi/JavaSOEOnReparsePerformanceTest.java index 52d568dd288b..4de8d98ae8fc 100644 --- a/java/java-tests/testSrc/com/intellij/psi/JavaSOEOnReparsePerformanceTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/JavaSOEOnReparsePerformanceTest.java @@ -52,7 +52,7 @@ public class JavaSOEOnReparsePerformanceTest extends LightDaemonAnalyzerTestCase final int pos = getEditor().getDocument().getText().indexOf("\"\""); // replace small expression with huge binary one - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { getEditor().getDocument().replaceString(pos, pos + 2, myHugeExpr); diff --git a/java/java-tests/testSrc/com/intellij/psi/MiscPsiTest.java b/java/java-tests/testSrc/com/intellij/psi/MiscPsiTest.java index 62a362cf69f0..301a99319cbb 100644 --- a/java/java-tests/testSrc/com/intellij/psi/MiscPsiTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/MiscPsiTest.java @@ -116,7 +116,7 @@ public class MiscPsiTest extends LightCodeInsightFixtureTestCase { final PsiClass aClass = getJavaFacade().getElementFactory().createClassFromText("public int i, j;", null); final PsiField aField = aClass.getFields()[0]; - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { aField.delete(); } diff --git a/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java b/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java index 083a7e7622aa..54712d6b5b49 100644 --- a/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java @@ -52,7 +52,7 @@ public class ModifyAnnotationsTest extends PsiTestCase { CommandProcessor.getInstance().executeCommand(myProject, new Runnable() { @Override public void run() { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { try { diff --git a/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java b/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java index 43a4d93dbdd0..5d1c5051ee2e 100644 --- a/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java @@ -53,7 +53,7 @@ public class OptimizeImportsTest extends PsiTestCase{ getProject(), new Runnable() { @Override public void run() { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { String fileName = getTestName(false) + extension; diff --git a/java/java-tests/testSrc/com/intellij/psi/PsiConcurrencyStressTest.java b/java/java-tests/testSrc/com/intellij/psi/PsiConcurrencyStressTest.java index 131298b5cb4f..95d54bb03a55 100644 --- a/java/java-tests/testSrc/com/intellij/psi/PsiConcurrencyStressTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/PsiConcurrencyStressTest.java @@ -20,7 +20,6 @@ package com.intellij.psi; import com.intellij.codeInsight.daemon.impl.DaemonProgressIndicator; -import com.intellij.codeInsight.daemon.impl.HighlightInfoFilter; import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder; import com.intellij.codeInsight.daemon.impl.analysis.HighlightVisitorImpl; import com.intellij.openapi.application.ApplicationManager; @@ -148,7 +147,7 @@ public class PsiConcurrencyStressTest extends PsiTestCase { mark("-"); final PsiMethod[] psiMethods = getPsiClass().getMethods(); if (psiMethods.length > 0) { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { psiMethods[random.nextInt(psiMethods.length)].delete(); diff --git a/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java b/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java index 893781eb3a75..a81fbe0c2062 100644 --- a/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java @@ -118,7 +118,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase { final Document document = getPsiDocumentManager().getDocument(file); final TextBlock block = TextBlock.get(file); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { block.performAtomically(new Runnable() { @@ -137,7 +137,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase { public void testGetUncommittedDocuments_documentNotRegistered() throws Exception { final Document document = new MockDocument(); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { getPsiDocumentManager().documentChanged(new DocumentEventImpl(document, 0, "", "", document.getModificationStamp(), false)); @@ -153,7 +153,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase { final Document document = getPsiDocumentManager().getDocument(file); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { getPsiDocumentManager().documentChanged(new DocumentEventImpl(document, 0, "", "", document.getModificationStamp(), false)); @@ -170,7 +170,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase { final Document document = getPsiDocumentManager().getDocument(file); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { getPsiDocumentManager().documentChanged(new DocumentEventImpl(document, 0, "", "", document.getModificationStamp(), false)); @@ -205,7 +205,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase { assertEquals(0, alienDocManager.getUncommittedDocuments().length); assertEquals(0, getPsiDocumentManager().getUncommittedDocuments().length); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { getPsiDocumentManager() @@ -251,7 +251,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase { waitAndPump(semaphore, 30000); assertTrue(getPsiDocumentManager().isCommitted(document)); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { document.insertString(0, "class X {}"); @@ -277,7 +277,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase { } }; - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { document.insertString(0, "/**/"); @@ -296,7 +296,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase { assertEquals(1, count.get()); count.set(0); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { document.insertString(0, "/**/"); @@ -347,7 +347,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase { assertEquals(0, alienDocManager.getUncommittedDocuments().length); assertEquals(0, getPsiDocumentManager().getUncommittedDocuments().length); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { document.setText("xxx"); diff --git a/java/java-tests/testSrc/com/intellij/psi/SCR17094Test.java b/java/java-tests/testSrc/com/intellij/psi/SCR17094Test.java index e844b69058a0..501914bce501 100644 --- a/java/java-tests/testSrc/com/intellij/psi/SCR17094Test.java +++ b/java/java-tests/testSrc/com/intellij/psi/SCR17094Test.java @@ -15,7 +15,6 @@ */ package com.intellij.psi; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.roots.ModuleRootModificationUtil; @@ -33,7 +32,7 @@ import java.io.File; public class SCR17094Test extends PsiTestCase { protected void setUpClasses(final String s) throws Exception { final String testRoot = PathManagerEx.getTestDataPath() + "/psi/repositoryUse/scr17094"; - VirtualFile classesRoot = WriteCommandAction.runWriteCommandAction(new Computable() { + VirtualFile classesRoot = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public VirtualFile compute() { String path = testRoot + "/" + s; diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java index c1366a9204b5..72b1e1962d9a 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java @@ -1153,7 +1153,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() { @Override public void run() { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { try { diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR14423Test.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR14423Test.java index ee6cd253ad0e..2870108623b1 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR14423Test.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR14423Test.java @@ -51,7 +51,7 @@ public class SCR14423Test extends PsiTestCase { root.mkdir(); myFilesToDelete.add(root); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { try { diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/BindToElementTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/BindToElementTest.java index d42d2c56189d..c926afd5af8c 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/BindToElementTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/BindToElementTest.java @@ -40,7 +40,7 @@ public class BindToElementTest extends CodeInsightTestCase { @Override protected void setUp() throws Exception { super.setUp(); - VirtualFile root = WriteCommandAction.runWriteCommandAction(new Computable() { + VirtualFile root = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public VirtualFile compute() { return LocalFileSystem.getInstance().refreshAndFindFileByIoFile( diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ExtendsBoundListTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ExtendsBoundListTest.java index 16bf54c06fc0..85aa78f3c4a4 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ExtendsBoundListTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ExtendsBoundListTest.java @@ -26,7 +26,7 @@ import com.intellij.testFramework.LightCodeInsightTestCase; public class ExtendsBoundListTest extends LightCodeInsightTestCase { public void testRemoveBoundFromFront() throws Exception { final PsiTypeParameter typeParameter = getTypeParameter(); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { typeParameter.getExtendsList().getReferenceElements()[0].delete(); diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/JavadocParamTagsTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/JavadocParamTagsTest.java index 67487dd0be49..3c637f871482 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/JavadocParamTagsTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/JavadocParamTagsTest.java @@ -41,7 +41,7 @@ public class JavadocParamTagsTest extends LightIdeaTestCase { final PsiDocComment docComment = method.getDocComment(); assertNotNull(docComment); final PsiDocTag[] tags = docComment.getTags(); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { tags[0].delete(); diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ReferenceParameterListTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ReferenceParameterListTest.java index 3b2dfb9ccf09..964474a521b3 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ReferenceParameterListTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ReferenceParameterListTest.java @@ -56,7 +56,7 @@ public class ReferenceParameterListTest extends PsiTestCase { null); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { try { diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ShortenClassReferencesTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ShortenClassReferencesTest.java index d5f90f1e9432..e21c18022e1e 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ShortenClassReferencesTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ShortenClassReferencesTest.java @@ -77,7 +77,7 @@ public class ShortenClassReferencesTest extends LightCodeInsightFixtureTestCase CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() { @Override public void run() { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { JavaCodeStyleManager.getInstance(getProject()).shortenClassReferences(myFixture.getFile()); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java index edfede5f2b33..5189cafb2555 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java @@ -71,7 +71,7 @@ public class CopyClassTest extends CodeInsightTestCase { private PsiElement performAction(final String oldName, final String copyName) throws IncorrectOperationException { final PsiClass oldClass = JavaPsiFacade.getInstance(myProject).findClass(oldName, ProjectScope.getAllScope(myProject)); - return WriteCommandAction.runWriteCommandAction(new Computable(){ + return WriteCommandAction.runWriteCommandAction(null, new Computable(){ @Override public PsiElement compute() { return CopyClassesHandler.doCopyClasses( diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java index 081168e3ef2f..70cb10ab1cac 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java @@ -87,7 +87,7 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase { protected void preprocessSrcDir(PsiDirectory srcDirectory) { final PsiFile empty = srcDirectory.findFile(EMPTY_TXT); assert empty != null; - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { empty.delete(); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLibraryMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLibraryMethodTest.java index 1c221a45266c..541d75d42109 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLibraryMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLibraryMethodTest.java @@ -51,7 +51,7 @@ public class InlineLibraryMethodTest extends RefactoringTestCase { PsiClass fileClass = getJavaFacade().findClass("mycompany.File"); assertNotNull(fileClass); final PsiFile file = fileClass.getContainingFile(); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { try { ((VirtualFileSystemEntry)file.getVirtualFile()).setWritable(false); diff --git a/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java b/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java index 131955250fcb..ef3800dfa489 100644 --- a/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java @@ -192,7 +192,7 @@ public class MultiModuleEditingTest extends ModuleTestCase { } private VirtualFile getVirtualFileInTestData(final String relativeVfsPath) { - return WriteCommandAction.runWriteCommandAction(new Computable() { + return WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public VirtualFile compute() { final String path = diff --git a/java/java-tests/testSrc/com/intellij/slicer/SliceBackwardTest.java b/java/java-tests/testSrc/com/intellij/slicer/SliceBackwardTest.java index 701536b81bf8..513fcec9d347 100644 --- a/java/java-tests/testSrc/com/intellij/slicer/SliceBackwardTest.java +++ b/java/java-tests/testSrc/com/intellij/slicer/SliceBackwardTest.java @@ -133,7 +133,7 @@ public class SliceBackwardTest extends SliceTestCase { } private static void extract(final Document document, final Map sliceUsageName2Offset, final String name) { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { for (int i = 1; i < 9; i++) { diff --git a/java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java b/java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java index 3fadd688f6ce..d66ff0368ba3 100644 --- a/java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java +++ b/java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java @@ -54,7 +54,7 @@ public abstract class MultiFileTestCase extends CodeInsightTestCase { final VirtualFile rootAfter = LocalFileSystem.getInstance().findFileByPath(pathAfter.replace(File.separatorChar, '/')); performAction.performAction(rootDir, rootAfter); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(getProject(), new Runnable() { public void run() { myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); } diff --git a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java index f821262e51a6..f2e891dafbdf 100644 --- a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java +++ b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java @@ -171,8 +171,8 @@ public abstract class WriteCommandAction extends BaseActionRunnable { protected abstract void run() throws Throwable; } - public static void runWriteCommandAction(@NotNull final Runnable runnable) { - new Simple(null) { + public static void runWriteCommandAction(Project project, @NotNull final Runnable runnable) { + new Simple(project) { @Override protected void run() throws Throwable { runnable.run(); @@ -180,8 +180,8 @@ public abstract class WriteCommandAction extends BaseActionRunnable { }.execute(); } - public static T runWriteCommandAction(@NotNull final Computable computable) { - return new WriteCommandAction(null) { + public static T runWriteCommandAction(Project project, @NotNull final Computable computable) { + return new WriteCommandAction(project) { @Override protected void run(@NotNull Result result) throws Throwable { result.setResult(computable.compute()); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java index f6691cb62685..41cfbad7323e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java @@ -587,7 +587,7 @@ public class TemplateManagerImpl extends TemplateManager implements ProjectCompo file = (PsiFile)file.copy(); final Document document = file.getViewProvider().getDocument(); assert document != null; - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(file.getProject(), new Runnable() { @Override public void run() { document.replaceString(startOffset, endOffset, CompletionUtil.DUMMY_IDENTIFIER_TRIMMED); diff --git a/platform/platform-tests/testSrc/com/intellij/formatting/TestFormattingModel.java b/platform/platform-tests/testSrc/com/intellij/formatting/TestFormattingModel.java index 05a7e72681e0..877709fc8961 100644 --- a/platform/platform-tests/testSrc/com/intellij/formatting/TestFormattingModel.java +++ b/platform/platform-tests/testSrc/com/intellij/formatting/TestFormattingModel.java @@ -65,7 +65,7 @@ public class TestFormattingModel implements FormattingModel, FormattingDocumentM final String whiteSpace ) { if (ApplicationManager.getApplication() != null) { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { myDocument.replaceString(textRange.getStartOffset(), textRange.getEndOffset(), whiteSpace); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/StripTrailingSpacesTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/StripTrailingSpacesTest.java index bc8c66a86eaf..ab388c469398 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/StripTrailingSpacesTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/StripTrailingSpacesTest.java @@ -61,7 +61,7 @@ public class StripTrailingSpacesTest extends LightPlatformCodeInsightTestCase { } private static void stripTrailingSpaces() { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { TrailingSpacesStripper.stripIfNotCurrentLine(getEditor().getDocument(), true); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java index a014c0a8b466..9b39ba18e29a 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java @@ -450,7 +450,7 @@ public class VirtualFilePointerTest extends PlatformLangTestCase { } private static VirtualFile refreshAndFind(@NotNull final String url) { - return WriteCommandAction.runWriteCommandAction(new Computable() { + return WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public VirtualFile compute() { return VirtualFileManager.getInstance().refreshAndFindFileByUrl(url); diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/Eclipse2ModulesTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/Eclipse2ModulesTest.java index b58b04a68926..76924df3ff4e 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/Eclipse2ModulesTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/Eclipse2ModulesTest.java @@ -20,7 +20,6 @@ */ package org.jetbrains.idea.eclipse; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.module.Module; @@ -70,7 +69,7 @@ public abstract class Eclipse2ModulesTest extends IdeaTestCase { protected void doTest(final String workspaceRoot, final String projectRoot) throws Exception { final VirtualFile file = - WriteCommandAction.runWriteCommandAction(new Computable() { + WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override @Nullable public VirtualFile compute() { diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java index c5f783d12d0c..ddfdbb7f442f 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java @@ -81,7 +81,7 @@ public class EclipseClasspathTest extends IdeaTestCase { fileText = fileText.replaceAll(EclipseXml.FILE_PROTOCOL + "/", EclipseXml.FILE_PROTOCOL); } final Element classpathElement = JDOMUtil.loadDocument(fileText).getRootElement(); - final Module module = WriteCommandAction.runWriteCommandAction(new Computable() { + final Module module = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public Module compute() { return ModuleManager.getInstance(project) diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java index e645af6f28b1..cfd6a62a17ef 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java @@ -68,7 +68,7 @@ public class EclipseEmlTest extends IdeaTestCase { } private static Module doLoadModule(final String path, final Project project) throws IOException, JDOMException, InvalidDataException { - final Module module = WriteCommandAction.runWriteCommandAction(new Computable() { + final Module module = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public Module compute() { return ModuleManager.getInstance(project) diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java index 96da8eed1a39..5e1cc3f87921 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java @@ -81,7 +81,7 @@ public class EclipseImlTest extends IdeaTestCase { } fileText = fileText.replaceAll("\\$" + JUNIT + "\\$", communityAppDir); final Element classpathElement = JDOMUtil.loadDocument(fileText).getRootElement(); - final Module module = WriteCommandAction.runWriteCommandAction(new Computable() { + final Module module = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public Module compute() { return ModuleManager.getInstance(project) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckTest.java index a3bd2f9e173b..406a4b0c4a78 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckTest.java @@ -49,7 +49,7 @@ public class GroovyRangeTypeCheckTest extends LightCodeInsightFixtureTestCase { LocalQuickFix[] fixes = {fix}; final ProblemDescriptor descriptor = InspectionManager.getInstance(getProject()).createProblemDescriptor(range, "bla-bla", false, fixes, ProblemHighlightType.WEAK_WARNING); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { fix.applyFix(myFixture.getProject(), descriptor); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/ConvertMapToClassTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/ConvertMapToClassTest.java index f6b041e21872..14d064ebae74 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/ConvertMapToClassTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/ConvertMapToClassTest.java @@ -79,7 +79,7 @@ public class ConvertMapToClassTest extends GrIntentionTestCase { final GrTypeDefinition foo = ConvertMapToClassIntention.createClass(getProject(), map.getNamedArguments(), "", "Foo"); myFixture.addFileToProject(getTestName(true) + "/Foo.groovy", foo.getContainingFile().getText()); final PsiClass psiClass = myFixture.findClass("Foo"); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { ConvertMapToClassIntention .replaceMapWithClass(getProject(), map, psiClass, ConvertMapToClassIntention.checkForReturnFromMethod(map), diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/CreateFieldFromParameterTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/CreateFieldFromParameterTest.groovy index fa0be119e309..88f2e0e9c2e8 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/CreateFieldFromParameterTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/CreateFieldFromParameterTest.groovy @@ -55,7 +55,7 @@ class CreateFieldFromParameterTest extends LightCodeInsightFixtureTestCase { for (intention in intentions) { if (intention instanceof IntentionActionWrapper) intention = intention.delegate if (intention instanceof GrCreateFieldForParameterIntention) { - WriteCommandAction.runWriteCommandAction(new Runnable(){ + WriteCommandAction.runWriteCommandAction(null, new Runnable() { void run() { intention.invoke(myFixture.project, myFixture.editor, myFixture.file) doPostponedFormatting(myFixture.project) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyFixesTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyFixesTest.groovy index 5f368683a6db..ac83d7d6cc01 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyFixesTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyFixesTest.groovy @@ -100,7 +100,7 @@ class FooBarGoo { class Foo {} ''') - WriteCommandAction.runWriteCommandAction { ((GroovyFile) myFixture.file).packageName = 'foo' } + WriteCommandAction.runWriteCommandAction project, { ((GroovyFile)myFixture.file).packageName = 'foo' } myFixture.checkResult '''\ #!/usr/bin/groovy package foo diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyLiveTemplatesTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyLiveTemplatesTest.groovy index aad3bf4976fa..e67b07c4d017 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyLiveTemplatesTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyLiveTemplatesTest.groovy @@ -68,7 +68,7 @@ void usage(int num, boolean someBoolean, List args){ } public static void expandTemplate(final Editor editor) { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override void run() { new ListTemplatesAction().actionPerformedImpl(editor.getProject(), editor); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy index 4371001f468b..5ee104ae28ac 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy @@ -145,7 +145,7 @@ class Test extends Base { } private def generateImplementation(PsiMethod method) { - WriteCommandAction.runWriteCommandAction { + WriteCommandAction.runWriteCommandAction project, { GrTypeDefinition clazz = (myFixture.file as PsiClassOwner).classes[0] as GrTypeDefinition OverrideImplementUtil.overrideOrImplement(clazz, method); PostprocessReformattingAspect.getInstance(myFixture.project).doPostponedFormatting() diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundTestCase.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundTestCase.groovy index f1cb5796ae78..ff86ea448364 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundTestCase.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundTestCase.groovy @@ -31,7 +31,7 @@ public abstract class SurroundTestCase extends LightGroovyTestCase { protected void doTest(final Surrounder surrounder, String textBefore, String textAfter) { myFixture.configureByText("a.groovy", textBefore) - WriteCommandAction.runWriteCommandAction { + WriteCommandAction.runWriteCommandAction project, { SurroundWithHandler.invoke(project, myFixture.editor, myFixture.file, surrounder) doPostponedFormatting(project) } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/implExtQuickFix/ImplementsExtendsQuickFixTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/implExtQuickFix/ImplementsExtendsQuickFixTest.groovy index ae73021db689..214d41f83dcd 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/implExtQuickFix/ImplementsExtendsQuickFixTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/implExtQuickFix/ImplementsExtendsQuickFixTest.groovy @@ -53,7 +53,7 @@ public class ImplementsExtendsQuickFixTest extends LightCodeInsightFixtureTestCa } else { - WriteCommandAction.runWriteCommandAction { + WriteCommandAction.runWriteCommandAction project, { ChangeExtendsImplementsQuickFix fix = new ChangeExtendsImplementsQuickFix(typeDefinition) fix.invoke(project, null, psiFile) doPostponedFormatting(project) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/IntroduceConstantTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/IntroduceConstantTest.java index f318edf589bd..211a1f2e640b 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/IntroduceConstantTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/IntroduceConstantTest.java @@ -103,7 +103,7 @@ public class IntroduceConstantTest extends LightCodeInsightFixtureTestCase { final GrIntroduceConstantSettings settings = new MockIntroduceConstantSettings(targetClass, replaceAllOccurences, getType(useExplicitType, expression, variable, stringPart), modifier); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { handler.runRefactoring(context, settings); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/ExtractClosureTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/ExtractClosureTest.groovy index 264f6ee1d35a..3735be902371 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/ExtractClosureTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/ExtractClosureTest.groovy @@ -60,9 +60,9 @@ public abstract class ExtractClosureTest extends LightGroovyTestCase { } } - WriteCommandAction.runWriteCommandAction { - handler.invoke myFixture.project, myFixture.editor, myFixture.file, null - doPostponedFormatting(myFixture.project) + WriteCommandAction.runWriteCommandAction project, { + handler.invoke myFixture.project, myFixture.editor, myFixture.file, null + doPostponedFormatting(myFixture.project) } myFixture.checkResult after } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy index 05627c594168..fb640f7b59c5 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy @@ -524,8 +524,8 @@ class Test { private def doInplaceRenameTest() { String prefix = "/${getTestName(false)}" myFixture.configureByFile prefix + ".groovy"; - WriteCommandAction.runWriteCommandAction { - CodeInsightTestUtil.doInlineRename(new GrVariableInplaceRenameHandler(), "foo", myFixture); + WriteCommandAction.runWriteCommandAction project, { + CodeInsightTestUtil.doInlineRename(new GrVariableInplaceRenameHandler(), "foo", myFixture); } myFixture.checkResultByFile prefix + "_after.groovy" } diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurationModel.java b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurationModel.java index 83821d3d4082..7e4745db4596 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurationModel.java +++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurationModel.java @@ -174,7 +174,7 @@ public class JUnitConfigurationModel { setDocumentText(index, text, myJUnitDocuments); } - private static void setDocumentText(final int index, final String text, final Object[] documents) { + private void setDocumentText(final int index, final String text, final Object[] documents) { final Object document = documents[index]; if (document instanceof PlainDocument) { try { @@ -186,7 +186,7 @@ public class JUnitConfigurationModel { } } else { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(myProject, new Runnable() { public void run() { ((Document)document).replaceString(0, ((Document)document).getTextLength(), text); } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyResolverTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyResolverTest.java index 267a7555f230..9d31be47880e 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyResolverTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyResolverTest.java @@ -259,7 +259,7 @@ public class MavenPropertyResolverTest extends MavenImportingTestCase { "1"); final Document doc = FileDocumentManager.getInstance().getDocument(myProjectPom); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { doc.setText(createPomXml("test" + "project" + diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/WorkingWithOpenProjectTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/WorkingWithOpenProjectTest.java index b21bfda5d484..e7ac9ca93812 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/WorkingWithOpenProjectTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/WorkingWithOpenProjectTest.java @@ -61,7 +61,7 @@ public class WorkingWithOpenProjectTest extends MavenImportingTestCase { myProjectsManager.listenForExternalChanges(); final Document d = FileDocumentManager.getInstance().getDocument(myProjectPom); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { d.setText(createPomXml("test" + "project" + diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFileTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFileTest.java index cfc5a987d409..159dd58d140d 100644 --- a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFileTest.java +++ b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFileTest.java @@ -64,7 +64,7 @@ public class PropertiesFileTest extends LightPlatformTestCase { public void testAddPropertyAfterProperty() throws Exception { final PropertiesFile propertiesFile = PropertiesElementFactory.createPropertiesFile(getProject(), "xxx=yyy"); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { propertiesFile.addProperty(myPropertyToAdd); } @@ -84,7 +84,7 @@ public class PropertiesFileTest extends LightPlatformTestCase { assertPropertyEquals(properties.get(0), "xxx", "yyy"); assertPropertyEquals(properties.get(1), "zzz", "ttt"); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { properties.get(1).getPsiElement().delete(); } @@ -99,7 +99,7 @@ public class PropertiesFileTest extends LightPlatformTestCase { PropertiesFile propertiesFile = PropertiesElementFactory.createPropertiesFile(getProject(), "xxx=yyy\nxxx2=tyrt\nxxx3=ttt\n\n"); final Property property = (Property)propertiesFile.findPropertyByKey("xxx2"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { property.delete(); } }); @@ -111,7 +111,7 @@ public class PropertiesFileTest extends LightPlatformTestCase { PropertiesFile propertiesFile = PropertiesElementFactory.createPropertiesFile(getProject(), "xxx=yyy\nxxx2=tyrt\nxxx3=ttt\n\n"); final Property property = (Property)propertiesFile.findPropertyByKey("xxx"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { property.delete(); } }); @@ -123,7 +123,7 @@ public class PropertiesFileTest extends LightPlatformTestCase { public void testAddToEnd() throws IncorrectOperationException { final PropertiesFile propertiesFile = PropertiesElementFactory.createPropertiesFile(getProject(), "a=b\\nccc"); assertEquals(1,propertiesFile.getProperties().size()); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { propertiesFile.addProperty(myPropertyToAdd); } }); @@ -144,7 +144,7 @@ public class PropertiesFileTest extends LightPlatformTestCase { public void testAddPropertyAfter() throws IncorrectOperationException { final PropertiesFile propertiesFile = PropertiesElementFactory.createPropertiesFile(getProject(), "a=b\nc=d\ne=f"); final Property c = (Property)propertiesFile.findPropertyByKey("c"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { propertiesFile.addPropertyAfter(myPropertyToAdd, c); } }); @@ -154,7 +154,7 @@ public class PropertiesFileTest extends LightPlatformTestCase { public void testAddPropertyAfterLast() throws IncorrectOperationException { final PropertiesFile propertiesFile = PropertiesElementFactory.createPropertiesFile(getProject(), "a=b\nc=d\ne=f"); final Property p = (Property)propertiesFile.findPropertyByKey("e"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { propertiesFile.addPropertyAfter(myPropertyToAdd, p); } }); diff --git a/python/testSrc/com/jetbrains/python/PyAutoUnindentTest.java b/python/testSrc/com/jetbrains/python/PyAutoUnindentTest.java index 65428ae6e796..995ab6afb180 100644 --- a/python/testSrc/com/jetbrains/python/PyAutoUnindentTest.java +++ b/python/testSrc/com/jetbrains/python/PyAutoUnindentTest.java @@ -78,7 +78,7 @@ public class PyAutoUnindentTest extends PyTestCase { private void doTyping(final char character) { final int offset = myFixture.getEditor().getCaretModel().getOffset(); - final PsiFile file = WriteCommandAction.runWriteCommandAction(new Computable() { + final PsiFile file = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public PsiFile compute() { myFixture.getEditor().getCaretModel().moveToOffset(offset); diff --git a/python/testSrc/com/jetbrains/python/PyEditingTest.java b/python/testSrc/com/jetbrains/python/PyEditingTest.java index 6c453f6726e2..98aefe9589c8 100644 --- a/python/testSrc/com/jetbrains/python/PyEditingTest.java +++ b/python/testSrc/com/jetbrains/python/PyEditingTest.java @@ -20,7 +20,6 @@ import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.LogicalPosition; @@ -324,7 +323,7 @@ public class PyEditingTest extends PyTestCase { } private String doTestTyping(final String text, final int offset, final char character) { - final PsiFile file = WriteCommandAction.runWriteCommandAction(new Computable() { + final PsiFile file = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public PsiFile compute() { final PsiFile file = myFixture.configureByText(PythonFileType.INSTANCE, text); @@ -345,7 +344,7 @@ public class PyEditingTest extends PyTestCase { private void doTyping(final char character) { final int offset = myFixture.getEditor().getCaretModel().getOffset(); - final PsiFile file = WriteCommandAction.runWriteCommandAction(new Computable() { + final PsiFile file = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public PsiFile compute() { myFixture.getEditor().getCaretModel().moveToOffset(offset); diff --git a/python/testSrc/com/jetbrains/python/PyFormatterTest.java b/python/testSrc/com/jetbrains/python/PyFormatterTest.java index 3f6f9d0b3cc9..fb41fbc012ad 100644 --- a/python/testSrc/com/jetbrains/python/PyFormatterTest.java +++ b/python/testSrc/com/jetbrains/python/PyFormatterTest.java @@ -364,7 +364,7 @@ public class PyFormatterTest extends PyTestCase { private void doTest(final boolean reformatText) { myFixture.configureByFile("formatter/" + getTestName(true) + ".py"); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(myFixture.getProject()); diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomChildrenTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomChildrenTest.java index c4e90edc0c78..efd932523d86 100644 --- a/xml/dom-tests/tests/com/intellij/util/xml/DomChildrenTest.java +++ b/xml/dom-tests/tests/com/intellij/util/xml/DomChildrenTest.java @@ -206,7 +206,7 @@ public class DomChildrenTest extends DomTestCase { assertTrue(child2.isValid()); assertEquals(element, child2.getParent()); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { child2.undefine(); assertFalse(child2.isValid()); diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomIncludesTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomIncludesTest.java index c8146cf3b976..732c36b20325 100644 --- a/xml/dom-tests/tests/com/intellij/util/xml/DomIncludesTest.java +++ b/xml/dom-tests/tests/com/intellij/util/xml/DomIncludesTest.java @@ -151,7 +151,7 @@ public class DomIncludesTest extends CodeInsightFixtureTestCase { } for (int i = 0; i < iterationCount; i++) { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { fileB.getViewProvider().getDocument().insertString(0, " "); fileD.getViewProvider().getDocument().insertString(0, " "); @@ -159,14 +159,14 @@ public class DomIncludesTest extends CodeInsightFixtureTestCase { } }); Thread.sleep(10); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { fileC.getViewProvider().getDocument().insertString(0, " "); fileE.getViewProvider().getDocument().insertString(0, " "); PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); //clear xinclude caches } }); Thread.sleep(10); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { fileB.getViewProvider().getDocument().setText(textB); fileC.getViewProvider().getDocument().setText(textC); diff --git a/xml/dom-tests/tests/com/intellij/util/xml/impl/IncrementalUpdateEventsTest.java b/xml/dom-tests/tests/com/intellij/util/xml/impl/IncrementalUpdateEventsTest.java index b9973ccbf1ec..41c6b49fd168 100644 --- a/xml/dom-tests/tests/com/intellij/util/xml/impl/IncrementalUpdateEventsTest.java +++ b/xml/dom-tests/tests/com/intellij/util/xml/impl/IncrementalUpdateEventsTest.java @@ -123,7 +123,7 @@ public class IncrementalUpdateEventsTest extends DomTestCase { private void deleteTag(final int index) throws IncorrectOperationException { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { myElement.getXmlTag().getSubTags()[index].delete(); } diff --git a/xml/dom-tests/tests/com/intellij/util/xml/impl/TreeIncrementalUpdateTest.java b/xml/dom-tests/tests/com/intellij/util/xml/impl/TreeIncrementalUpdateTest.java index 9b3469eb916c..3ad475aa67b3 100644 --- a/xml/dom-tests/tests/com/intellij/util/xml/impl/TreeIncrementalUpdateTest.java +++ b/xml/dom-tests/tests/com/intellij/util/xml/impl/TreeIncrementalUpdateTest.java @@ -372,7 +372,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase { final XmlTag tag = element.getXmlTag(); final XmlTag childTag = tag.getSubTags()[0]; - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { childTag.delete(); } @@ -391,7 +391,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase { final Sepulka element = createElement("", Sepulka.class); final List list = element.getCustomChildren(); final XmlTag tag = element.getXmlTag(); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { tag.getSubTags()[0].delete(); tag.getSubTags()[0].delete(); } diff --git a/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java b/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java index 9fd7052e9707..14d130beafeb 100644 --- a/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java +++ b/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java @@ -46,7 +46,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase { final Listener listener = new Listener(model.getModelAspect(XmlAspect.class)); model.addModelListener(listener); final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText(""); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { tagFromText.setAttribute("a", "b"); @@ -63,7 +63,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase { final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("aaa"); final XmlTag otherTag = XmlElementFactory.getInstance(getProject()).createTagFromText(""); final XmlText xmlText = tagFromText.getValue().getTextElements()[0]; - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { xmlText.insertAtOffset(otherTag, 2); } }); @@ -77,7 +77,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase { model.addModelListener(listener); final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("aaa"); final XmlText xmlText = tagFromText.getValue().getTextElements()[0]; - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { xmlText.insertText("bb", 2); } }); @@ -90,7 +90,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase { final Listener listener = new Listener(model.getModelAspect(XmlAspect.class)); model.addModelListener(listener); final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("a "); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { tagFromText.addAfter(tagFromText.getValue().getTextElements()[0], tagFromText.getValue().getTextElements()[0]); } }); @@ -103,7 +103,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase { final Listener listener = new Listener(model.getModelAspect(XmlAspect.class)); model.addModelListener(listener); final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("aaa"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { tagFromText.delete(); } }); @@ -163,7 +163,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase { final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText(text); final XmlAttribute attribute = tag.getAttribute("name", null); assert attribute != null; - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { attribute.setValue("new"); } }); @@ -182,7 +182,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase { final PsiFileImpl containingFile = (PsiFileImpl)tagFromText.getContainingFile(); final PsiDocumentManager documentManager = PsiDocumentManager.getInstance(getProject()); final Document document = documentManager.getDocument(containingFile); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { document.insertString(positionToInsert, stringToInsert); documentManager.commitDocument(document); } diff --git a/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java b/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java index 66b21019c5e6..19385dd61e5f 100644 --- a/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java +++ b/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java @@ -87,7 +87,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { final XmlTag childTag = rootTag.createChildTag("b", "bNamespace", null, true); assertEquals("bNamespace", childTag.getNamespace()); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { XmlTag beanTag = (XmlTag)rootTag.add(childTag); @@ -99,7 +99,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testDeleteTag() throws Throwable { XmlTag aTag = XmlElementFactory.getInstance(getProject()).createTagFromText(" "); final XmlTag bTag = aTag.findFirstSubTag("b"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { bTag.delete(); } }); @@ -110,7 +110,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testReplaceTag() throws Throwable { final XmlTag aTag = XmlElementFactory.getInstance(getProject()).createTagFromText(""); final XmlTag bTag = aTag.findFirstSubTag("b"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { PsiElement cTag = bTag.replace(XmlElementFactory.getInstance(getProject()).createTagFromText("")); assertEquals(1, aTag.getSubTags().length); assertEquals(cTag, aTag.getSubTags()[0]); @@ -123,7 +123,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { final XmlTag aTag = elementFactory.createTagFromText("1"); final XmlText displayText = elementFactory.createDisplayText("2"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { final PsiElement psiElement = aTag.addAfter(displayText, aTag.getValue().getChildren()[0]); assertEquals(psiElement.getContainingFile(), aTag.getContainingFile()); } @@ -131,7 +131,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { } public void testWhitespaceInsideTag() throws Exception { - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { XmlElementFactory.getInstance(getProject()).createTagFromText("

").getValue().setText("\n"); } }); @@ -141,7 +141,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { XmlFile xhtmlFile = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("dummy.xhtml", ""); final XmlTag rootTag = xhtmlFile.getDocument().getRootTag(); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { rootTag.setAttribute("foo", "bar"); } }); @@ -153,7 +153,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testSetAttribute() throws Exception { final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText(""); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { rootTag.setAttribute("foo", "bar"); } }); @@ -167,7 +167,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testSetAttributeWithQuotes() throws Exception { final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText(""); final String value = "a \"b\" c"; - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { rootTag.setAttribute("foo", value); } }); @@ -181,7 +181,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testSetAttributeWithQuotes2() throws Exception { final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText(""); final String value = "'a \"b\" c'"; - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { rootTag.setAttribute("foo", value); } }); @@ -211,7 +211,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testSetAttributeWithNamespaces() throws Exception { final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText(""); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { rootTag.setAttribute("foo", "", "bar"); } }); @@ -225,7 +225,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testTextEdit1() throws Exception { final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("aaa"); final XmlText xmlText = rootTag.getValue().getTextElements()[0]; - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { xmlText.removeText(0, 3); } }); @@ -235,7 +235,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testTextEdit2() throws Exception { final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("a<a"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { rootTag.getValue().getTextElements()[0].removeText(0, 3); } }); @@ -246,7 +246,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testTextEdit3() throws Exception { final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("a<a"); final XmlText xmlText = rootTag.getValue().getTextElements()[0]; - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { xmlText.removeText(1, 2); } }); @@ -258,7 +258,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testTextEdit4() throws Exception { final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("aaa"); final XmlText xmlText = rootTag.getValue().getTextElements()[0]; - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { xmlText.removeText(1, 2); } }); @@ -293,7 +293,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testTextEdit6() throws Exception { final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("a1c"); final XmlTag xmlTag = rootTag.findFirstSubTag("b"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { xmlTag.delete(); } }); @@ -303,7 +303,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testBrace() throws Exception { final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText(""); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { tagFromText.getValue().setText("<"); } }); @@ -406,7 +406,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { final XmlTagChild child = tag.getValue().getChildren()[0]; assertTrue(child instanceof XmlText && child.getText().equals("234")); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { assertNotNull(tag.getParent().addBefore(child, tag)); tag.delete(); } @@ -424,7 +424,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { final XmlTagChild child = tag.getValue().getChildren()[0]; assertTrue(child instanceof XmlText && child.getText().equals("234")); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { assertNotNull(tag.getParent().addBefore(child, tag)); tag.delete(); } @@ -437,7 +437,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { public void testDisplayText() throws Throwable { final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText(" "); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { tag.add(XmlElementFactory.getInstance(getProject()).createDisplayText("aaa\nbbb")); } }); @@ -453,7 +453,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { final XmlTagChild[] tagElements = tagB.getValue().getChildren(); final PsiElement parent = tagB.getParent(); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { PsiElement first = parent.addBefore(tagElements[0], tagB); assertNotNull(first); } @@ -507,7 +507,7 @@ public class XmlTagTest extends LightCodeInsightTestCase { final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()) .createFileFromText("test.xml", "\n \n \n hasgdgasjdgasdg asgdjhasgd\n \n"); final XmlTag tagB = file.getDocument().getRootTag(); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { tagB.getSubTags()[0].getSubTags()[0].delete(); } }); diff --git a/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java b/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java index 110ee5713c85..89cc1263131a 100644 --- a/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java +++ b/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java @@ -31,7 +31,7 @@ public class XmlTagWriteTest extends LightCodeInsightTestCase{ public void test1() throws IncorrectOperationException { XmlElementFactory elementFactory = XmlElementFactory.getInstance(getProject()); final XmlTag xmlTag = XmlElementFactory.getInstance(getProject()).createTagFromText(""); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { xmlTag.add(xmlTag.createChildTag("tag2", XmlUtil.EMPTY_URI, null, false)); @@ -48,7 +48,7 @@ public class XmlTagWriteTest extends LightCodeInsightTestCase{ public void test2() throws IncorrectOperationException { final XmlTag xmlTag = XmlElementFactory.getInstance(getProject()).createTagFromText(""); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { xmlTag.add(xmlTag.createChildTag("tag2", XmlUtil.EMPTY_URI, null, false)); } }); diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java index dfb24237bf26..844e844830af 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java @@ -388,7 +388,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { try { doDoTest(true,true); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { myEditor.getDocument().insertString(myEditor.getDocument().getCharsSequence().toString().indexOf("?>") + 2, "\n"); @@ -548,7 +548,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { final XmlAttribute attribute = t.getAttribute("name", null); final XmlAttributeValue valueElement = attribute.getValueElement(); final PsiReference nameReference = valueElement.getReferences()[0]; - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { nameReference.handleElementRename("zzz"); } }); @@ -561,7 +561,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { public void testExternalValidatorOnValidXmlWithNamespacesNotSetup() throws Exception { final ExternalResourceManagerEx instanceEx = ExternalResourceManagerEx.getInstanceEx(); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { instanceEx.addIgnoredResource("http://xml.apache.org/axis/wsdd2/"); instanceEx.addIgnoredResource("http://xml.apache.org/axis/wsdd2/providers/java"); instanceEx.addIgnoredResource("http://soapinterop.org/xsd2"); @@ -575,14 +575,14 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { public void testExternalValidatorOnValidXmlWithNamespacesNotSetup2() throws Exception { final ExternalResourceManagerEx instanceEx = ExternalResourceManagerEx.getInstanceEx(); try { - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { instanceEx.addIgnoredResource(""); } }); doTest(getFullRelativeTestName(".xml"), true, false); } finally { - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { instanceEx.removeIgnoredResource(""); } }); @@ -1057,7 +1057,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { } public void testIgnoredNamespaceHighlighting() throws Exception { - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { ExternalResourceManagerEx.getInstanceEx().addIgnoredResource("http://ignored/uri"); } }); @@ -1233,7 +1233,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { doDoTest(true, false); final String text = myEditor.getDocument().getText(); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { myEditor.getSelectionModel().setSelection(0, myEditor.getDocument().getTextLength()); } @@ -1409,7 +1409,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { final Editor schemaEditor = allEditors[0] == myEditor ? allEditors[1]:allEditors[0]; final String text = schemaEditor.getDocument().getText(); final String newText = text.replaceAll("xsd","xs"); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { schemaEditor.getDocument().replaceString(0, text.length(), newText); } }); @@ -1567,7 +1567,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { Collection infos = filterInfos(doHighlighting()); assertEquals(2, infos.size()); - WriteCommandAction.runWriteCommandAction(new Runnable(){public void run() { + WriteCommandAction.runWriteCommandAction(null, new Runnable(){public void run() { EditorModificationUtil.deleteSelectedText(myEditor); } }); @@ -1576,7 +1576,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { assertEquals(11, infos.size()); - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { public void run() { EditorModificationUtil.insertStringAtCaret(myEditor, "<"); } diff --git a/xml/tests/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMoverTest.java b/xml/tests/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMoverTest.java index 068cf387130a..3ae70e34f846 100644 --- a/xml/tests/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMoverTest.java +++ b/xml/tests/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMoverTest.java @@ -71,7 +71,7 @@ public class XmlMoverTest extends CodeInsightTestCase { final boolean enabled = handler.isEnabled(myEditor, null); assertEquals("not enabled for " + afterFileName, new File(getTestDataPath(), afterFileName).exists(), enabled); if (enabled) { - WriteCommandAction.runWriteCommandAction(new Runnable() { + WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { handler.execute(myEditor, null);