Introduce Variable: Convert property accessor body to block when needed

idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java

@@ -257,7 +257,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
         return new Runnable() {
             @Override
             public void run() {
-                if (commonContainer instanceof JetNamedFunction) {
+                if (commonContainer instanceof JetDeclarationWithBody) {
                     JetDeclarationWithBody originalDeclaration = (JetDeclarationWithBody) commonContainer;
                     final JetExpression originalBody = originalDeclaration.getBodyExpression();
                     assert originalBody != null : "Original body is not found: " + originalDeclaration;
@@ -510,11 +510,8 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
                 parent instanceof JetClassBody || parent instanceof JetClassInitializer) {
                 return parent;
             }
-            else if (parent instanceof JetNamedFunction) {
-                JetNamedFunction function = (JetNamedFunction)parent;
-                if (function.getBodyExpression() == place) {
-                    return parent;
-                }
+            if (parent instanceof JetDeclarationWithBody && ((JetDeclarationWithBody) parent).getBodyExpression() == place) {
+                return parent;
             }
             place = parent;
         }
@@ -562,8 +559,8 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
                     result = parent;
                 }
             }
-            else if (parent instanceof JetNamedFunction) {
-                JetNamedFunction function = (JetNamedFunction)parent;
+            else if (parent instanceof JetDeclarationWithBody) {
+                JetDeclarationWithBody function = (JetDeclarationWithBody)parent;
                 if (function.getBodyExpression() == place) {
                     if (!(place instanceof JetBlockExpression)) {
                         result = parent;

idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlock.kt

@@ -0,0 +1 @@
+val x: Int get() = <selection>1</selection>

idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlock.kt.after

@@ -0,0 +1,4 @@
+val x: Int get() {
+    val i = 1
+    return i
+}

idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlockInner.kt

@@ -0,0 +1,8 @@
+val a = 2
+
+val x: Int get() =
+        if (a > 1) {
+            (<selection>a + 1</selection>) * (a - 1)
+        } else {
+            a * (a + 1)
+        }

idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlockInner.kt.after

@@ -0,0 +1,10 @@
+val a = 2
+
+val x: Int get() {
+    val i = a + 1
+    return if (a > 1) {
+        i * (a - 1)
+    } else {
+        a * i
+    }
+}

idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java

@@ -201,6 +201,18 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             doIntroduceVariableTest(fileName);
         }
 
+        @TestMetadata("PropertyAccessorAddBlock.kt")
+        public void testPropertyAccessorAddBlock() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlock.kt");
+            doIntroduceVariableTest(fileName);
+        }
+
+        @TestMetadata("PropertyAccessorAddBlockInner.kt")
+        public void testPropertyAccessorAddBlockInner() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlockInner.kt");
+            doIntroduceVariableTest(fileName);
+        }
+
         @TestMetadata("ReplaceOccurence.kt")
         public void testReplaceOccurence() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ReplaceOccurence.kt");