From d2c8eba5a673005e2f50179872585657b0fb3a68 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Wed, 4 May 2016 13:45:58 +0200 Subject: [PATCH] create parameter from usage: invokeLater for tests same as normal case (to avoid refactoring start from write action) --- .../quickfix/CreateParameterFromUsageFix.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java index 6b5103040a9d..30e9efeaa5b4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java @@ -97,19 +97,19 @@ public class CreateParameterFromUsageFix extends CreateVarFromUsageFix { } final Application application = ApplicationManager.getApplication(); - if (application.isUnitTestMode()) { - ParameterInfoImpl[] array = parameterInfos.toArray(new ParameterInfoImpl[parameterInfos.size()]); - String modifier = PsiUtil.getAccessModifier(PsiUtil.getAccessLevel(method.getModifierList())); - ChangeSignatureProcessor processor = - new ChangeSignatureProcessor(project, method, false, modifier, method.getName(), method.getReturnType(), array); - processor.run(); - } - else { - final PsiMethod finalMethod = method; - application.invokeLater(new Runnable() { - @Override - public void run() { - if (project.isDisposed()) return; + final PsiMethod finalMethod = method; + application.invokeLater(new Runnable() { + @Override + public void run() { + if (project.isDisposed()) return; + if (application.isUnitTestMode()) { + ParameterInfoImpl[] array = parameterInfos.toArray(new ParameterInfoImpl[parameterInfos.size()]); + String modifier = PsiUtil.getAccessModifier(PsiUtil.getAccessLevel(finalMethod.getModifierList())); + ChangeSignatureProcessor processor = + new ChangeSignatureProcessor(project, finalMethod, false, modifier, finalMethod.getName(), finalMethod.getReturnType(), array); + processor.run(); + } + else { try { JavaChangeSignatureDialog dialog = JavaChangeSignatureDialog.createAndPreselectNew(project, finalMethod, parameterInfos, true, myReferenceExpression); @@ -141,8 +141,8 @@ public class CreateParameterFromUsageFix extends CreateVarFromUsageFix { throw new RuntimeException(e); } } - }); - } + } + }); } @Override