MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't run refactoring tests in write command action

Browse Source
This commit is contained in:
Max Medvedev
2014-09-23 19:54:29 +04:00
parent 3a3f94cee3
commit bec8f14976
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassTest.groovy
+4 -19
View File
@@ -15,12 +15,8 @@
*/
package org.jetbrains.plugins.groovy.refactoring.move
import com.intellij.ide.fileTemplates.FileTemplate
import com.intellij.ide.fileTemplates.FileTemplateManager
import com.intellij.openapi.application.Application
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.command.CommandProcessor
import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.*
@@ -130,21 +126,10 @@ class ${NAME} {
assertNotNull("Package " + newPackageName + " not found", aPackage);
final PsiDirectory[] dirs = aPackage.getDirectories();
final Application application = ApplicationManager.getApplication();
CommandProcessor.getInstance().executeCommand(myFixture.getProject(), new Runnable() {
@Override
public void run() {
application.runWriteAction(new Runnable() {
@Override
public void run() {
final PsiDirectory dir = dirs[dirs.length - 1];
final SingleSourceRootMoveDestination moveDestination =
new SingleSourceRootMoveDestination(PackageWrapper.create(JavaDirectoryService.getInstance().getPackage(dir)), dir);
new MoveClassesOrPackagesProcessor(getProject(), classes, moveDestination, true, true, null).run();
}
});
}
}, "", null);
final PsiDirectory dir = dirs[dirs.length - 1];
final SingleSourceRootMoveDestination moveDestination =
new SingleSourceRootMoveDestination(PackageWrapper.create(JavaDirectoryService.getInstance().getPackage(dir)), dir);
new MoveClassesOrPackagesProcessor(getProject(), classes, moveDestination, true, true, null).run();
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
FileDocumentManager.getInstance().saveAllDocuments();
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java
+1 -6
View File
@@ -90,12 +90,7 @@ public class GroovyMoveScriptTest extends LightCodeInsightFixtureTestCase {
Collections.addAll(classList, ((PsiClassOwner)file).getClasses());
}
final PsiClass[] classes = classList.toArray(new PsiClass[classList.size()]);
new WriteCommandAction(myFixture.getProject()) {
@Override
protected void run(Result result) throws Throwable {
new MoveClassesOrPackagesProcessor(getProject(), classes, new SingleSourceRootMoveDestination(PackageWrapper.create(pkg), psiDirectory), true, true, null).run();
}
}.execute();
new MoveClassesOrPackagesProcessor(getProject(), classes, new SingleSourceRootMoveDestination(PackageWrapper.create(pkg), psiDirectory), true, true, null).run();
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
FileDocumentManager.getInstance().saveAllDocuments();