From f33811b72d94e1aa570d4eb698eab2625011440a Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 30 May 2012 15:39:09 +0400 Subject: [PATCH] inline superclass: do not call for refactoring which would be invoked later: call method instead (IDEA-86806) --- .../com/intellij/refactoring/inline/InlineMethodProcessor.java | 2 +- .../inlineSuperClass/usageInfo/InlineSuperCallUsageInfo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java index 983a510f4a68..d008ebdce664 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java @@ -412,7 +412,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { } } - private void inlineMethodCall(PsiReferenceExpression ref) throws IncorrectOperationException { + public void inlineMethodCall(PsiReferenceExpression ref) throws IncorrectOperationException { InlineUtil.TailCallType tailCall = InlineUtil.getTailCallType(ref); ChangeContextUtil.encodeContextInfo(myMethod, false); myMethodCopy = (PsiMethod)myMethod.copy(); diff --git a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/InlineSuperCallUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/InlineSuperCallUsageInfo.java index 1115aefe8cb6..d2b5ba2b1837 100644 --- a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/InlineSuperCallUsageInfo.java +++ b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/InlineSuperCallUsageInfo.java @@ -72,7 +72,7 @@ public class InlineSuperCallUsageInfo extends FixableUsageInfo { assert inliningClass != null; methodCopy = (PsiMethod)inliningClass.add(methodCopy); final InlineMethodProcessor inlineMethodProcessor = new InlineMethodProcessor(getProject(), methodCopy, methodExpression, null, true); - inlineMethodProcessor.run(); + inlineMethodProcessor.inlineMethodCall(methodExpression); methodCopy.delete(); } }