deprecate AbstractLayoutCodeProcessor.preprocessFile, support several nontrivial prepareTask activities in a row

GitOrigin-RevId: 76ce8d08e6f111e767bbffc4af3e22d4863b739e
This commit is contained in:
Peter Gromov
2020-01-21 07:18:45 +01:00
committed by intellij-monorepo-bot
parent 6d71b92a62
commit 43aacb5f86
2 changed files with 32 additions and 131 deletions

View File

@@ -30,7 +30,6 @@ import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.psi.*;
import com.intellij.refactoring.rename.RenameProcessor;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.util.IncorrectOperationException;
import kotlin.text.Charsets;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -38,7 +37,6 @@ import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.concurrent.FutureTask;
public class GlobalUndoTest extends UndoTestCase implements TestDialog {
private TestDialog myOldTestDialogValue;
@@ -181,25 +179,11 @@ public class GlobalUndoTest extends UndoTestCase implements TestDialog {
createClass("foo");
final PsiFile file = myContainingFile;
final Editor editor = openEditor("foo.java");
reformatFile(file);
new ReformatCodeProcessor(myProject, file, null, false).run();
undo(editor);
assertFileDoesNotExist("foo", myRoot);
}
private void reformatFile(final PsiFile file) throws IncorrectOperationException {
final Runnable r = new ReformatCodeProcessor(myProject, file, null, false) {
@Override
@NotNull
public FutureTask<Boolean> preprocessFile(@NotNull final PsiFile file, boolean processChangedTextOnly)
throws IncorrectOperationException {
return super.preprocessFile(file, false);
}
}.preprocessFile(file, false);
CommandProcessor.getInstance().executeCommand(myProject, () -> ApplicationManager.getApplication().runWriteAction(r), "Reformat", null,
UndoConfirmationPolicy.REQUEST_CONFIRMATION);
}
public void testUndoMoveFile() {
VirtualFile dir1 = createChildDirectory(myRoot, myDirName);
VirtualFile dir2 = createChildDirectory(myRoot, "dir2");