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

IDEA-238172 Make postponed formatting consistent in tests and production

Browse Source 
GitOrigin-RevId: dee00ac38946b8a8a5165dffd083e67c85935723
This commit is contained in:
Peter Gromov
2020-04-20 12:36:00 +00:00
committed by intellij-monorepo-bot
parent fdd879c02e
commit 63cd246f7b
7 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/java/psi/OptimizeImportsTestCase.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
*/
public abstract class OptimizeImportsTestCase extends LightJavaCodeInsightFixtureTestCase {
protected void doTest(@NotNull String extension) {
WriteCommandAction.runWriteCommandAction(null, () -> {
WriteCommandAction.runWriteCommandAction(getProject(), () -> {
String fileName = getTestName(false) + extension;
try {
PsiFile file = myFixture.configureByFile(fileName);
java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
+1 -1
View File
@@ -147,7 +147,7 @@ public abstract class TypeMigrationTestBase extends LightMultiFileTestCase {
final UsageInfo[] usages = pr.findUsages();
final String report = pr.getLabeler().getMigrationReport();
WriteCommandAction.runWriteCommandAction(null, () -> pr.performRefactoring(usages));
WriteCommandAction.runWriteCommandAction(getProject(), () -> pr.performRefactoring(usages));
WriteCommandAction.runWriteCommandAction(getProject(), () -> PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting());
platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
+1 -1
View File
@@ -161,7 +161,7 @@ public final class PostprocessReformattingAspect implements PomModelAspect {
atomic(new Runnable() {
@Override
public void run() {
if (isDisabled() || getContext().myPostponedCounter == 0 && !ApplicationManager.getApplication().isUnitTestMode()) return;
if (isDisabled() || getContext().myPostponedCounter == 0) return;
final TreeChangeEvent changeSet = (TreeChangeEvent)event.getChangeSet(myTreeAspect.getValue());
if (changeSet == null) return;
final PsiElement psiElement = changeSet.getRootElement().getPsi();
plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckTest.java
+1 -3
View File
@@ -7,7 +7,6 @@ import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import org.jetbrains.plugins.groovy.codeInspection.GroovyFix;
@@ -35,9 +34,8 @@ public class GroovyRangeTypeCheckTest extends LightJavaCodeInsightFixtureTestCas
LocalQuickFix[] fixes = {fix};
final ProblemDescriptor descriptor = InspectionManager.getInstance(getProject()).createProblemDescriptor(range, "bla-bla", false, fixes, ProblemHighlightType.WEAK_WARNING);
WriteCommandAction.runWriteCommandAction(null, () -> {
WriteCommandAction.runWriteCommandAction(getProject(), () -> {
fix.applyFix(myFixture.getProject(), descriptor);
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
});
plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/ConvertMapToClassTest.java
+1 -1
View File
@@ -66,7 +66,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(null, () -> ConvertMapToClassIntention
WriteCommandAction.runWriteCommandAction(getProject(), () -> ConvertMapToClassIntention
.replaceMapWithClass(getProject(), map, psiClass, ConvertMapToClassIntention.checkForReturnFromMethod(map),
ConvertMapToClassIntention.checkForVariableDeclaration(map),
ConvertMapToClassIntention.checkForMethodParameter(map)));
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/IntroduceConstantTest.groovy
+1 -4
View File
@@ -21,7 +21,6 @@ import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiModifier
import com.intellij.psi.PsiType
import com.intellij.psi.impl.source.PostprocessReformattingAspect
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
import com.intellij.util.VisibilityUtil
@@ -32,7 +31,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpres
import org.jetbrains.plugins.groovy.refactoring.introduce.constant.GrIntroduceConstantHandler
import org.jetbrains.plugins.groovy.refactoring.introduce.constant.GrIntroduceConstantSettings
import org.jetbrains.plugins.groovy.util.TestUtils
/**
* @author Maxim.Medvedev
*/
@@ -107,9 +105,8 @@ class IntroduceConstantTest extends LightJavaCodeInsightFixtureTestCase {
def type = getType(useExplicitType, expression, variable, stringPart)
final GrIntroduceConstantSettings settings = new MockIntroduceConstantSettings(targetClass, replaceAllOccurrences, type, modifier)
WriteCommandAction.runWriteCommandAction(null) {
WriteCommandAction.runWriteCommandAction(project) {
handler.runRefactoring(context, settings)
PostprocessReformattingAspect.getInstance(project).doPostponedFormatting()
}
myFixture.checkResultByFile(getTestName(false) + "_after.groovy", true)
}
plugins/groovy/testdata/intentions/convertMapToClass/variableTypeReplace/Expected.groovy
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
class Foo {
String a
Date b
Date b
}