inline method: missed braces (IDEA-133700)

java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java

@@ -1269,7 +1269,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
       if (parentStatement != null) {
         PsiElement parent = ref.getParent();
         while (!parent.equals(parentStatement)) {
-          if (parent instanceof PsiExpressionStatement) {
+          if (parent instanceof PsiExpressionStatement || parent instanceof PsiReturnStatement) {
             String text = "{\n}";
             PsiBlockStatement blockStatement = (PsiBlockStatement)myFactory.createStatementFromText(text, null);
             blockStatement = (PsiBlockStatement)myCodeStyleManager.reformat(blockStatement);

java/java-tests/testData/refactoring/inlineMethod/ReturnStatementWithoutBraces.java

@@ -0,0 +1,12 @@
+class JavaClass {
+  String bar() {
+    return "bar";
+  }
+
+  String baz(boolean condition) {
+    if (condition)
+      return b<caret>ar();
+
+    return "default";
+  }
+}

java/java-tests/testData/refactoring/inlineMethod/ReturnStatementWithoutBraces.java.after

@@ -0,0 +1,12 @@
+class JavaClass {
+  String bar() {
+    return "bar";
+  }
+
+  String baz(boolean condition) {
+    if (condition)
+        return "bar";
+
+    return "default";
+  }
+}

java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java

@@ -272,6 +272,10 @@ public class InlineMethodTest extends LightRefactoringTestCase {
     doTest();
   }
 
+  public void testReturnStatementWithoutBraces() throws Exception {
+    doTestInlineThisOnly();
+  }
+
   private void doTestInlineThisOnly() {
     @NonNls String fileName = "/refactoring/inlineMethod/" + getTestName(false) + ".java";
     configureByFile(fileName);