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 8ab4fe47ce7d..d158cb7b361f 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java @@ -1252,7 +1252,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { private static final Key MARK_KEY = Key.create(""); - private PsiReferenceExpression[] addBracesWhenNeeded(PsiReferenceExpression[] refs) throws IncorrectOperationException { + public PsiReferenceExpression[] addBracesWhenNeeded(PsiReferenceExpression[] refs) throws IncorrectOperationException { ArrayList refsVector = new ArrayList(); ArrayList addedBracesVector = new ArrayList(); myAddedClassInitializers = new HashMap(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java index b9503e220c68..7b7be2c8c795 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java @@ -62,8 +62,10 @@ public class InlineCallFix extends InspectionGadgetsFix { } protected void inline(Project project, PsiReferenceExpression methodExpression, PsiMethod method) { - new InlineMethodProcessor(project, method, methodExpression, null, true, - JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_METHOD, - JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_METHOD).inlineMethodCall(methodExpression); + final JavaRefactoringSettings settings = JavaRefactoringSettings.getInstance(); + final InlineMethodProcessor processor = new InlineMethodProcessor(project, method, methodExpression, null, true, + settings.RENAME_SEARCH_IN_COMMENTS_FOR_METHOD, + settings.RENAME_SEARCH_FOR_TEXT_FOR_METHOD); + processor.inlineMethodCall(processor.addBracesWhenNeeded(new PsiReferenceExpression[]{methodExpression})[0]); } } diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/simple_setter/Parentheses.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/simple_setter/Parentheses.after.java new file mode 100644 index 000000000000..ee86691391b7 --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/simple_setter/Parentheses.after.java @@ -0,0 +1,14 @@ +class Test { + + private int field = 5; + + private void reproduce() { + if (field == 5) { + field = 10; + } + } + + private void setField(int value) { + field = value; + } +} \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/simple_setter/Parentheses.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/simple_setter/Parentheses.java new file mode 100644 index 000000000000..d06849bae487 --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/simple_setter/Parentheses.java @@ -0,0 +1,13 @@ +class Test { + + private int field = 5; + + private void reproduce() { + if (field == 5) + setField(10); + } + + private void setField(int value) { + field = value; + } +} \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/performance/InlineCallFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/performance/InlineCallFixTest.java new file mode 100644 index 000000000000..ae7dd26fbf1b --- /dev/null +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/performance/InlineCallFixTest.java @@ -0,0 +1,33 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.siyeh.ig.fixes.performance; + +import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.IGQuickFixesTestCase; +import com.siyeh.ig.performance.CallToSimpleSetterInClassInspection; +import com.siyeh.ig.performance.TrivialStringConcatenationInspection; + +public class InlineCallFixTest extends IGQuickFixesTestCase { + + @Override + protected void setUp() throws Exception { + super.setUp(); + myFixture.enableInspections(new CallToSimpleSetterInClassInspection()); + myRelativePath = "performance/simple_setter"; + } + + public void testParentheses() { doTest(InspectionGadgetsBundle.message("call.to.simple.setter.in.class.inline.quickfix")); } +} \ No newline at end of file