Extract Function: Do not allow property extraction if return type is Unit

#KT-6017 Fixed
2014-10-20 16:30:19 +04:00
parent f5f1aec47b
commit 40da4bd423
4 changed files with 15 additions and 1 deletions
@@ -66,6 +66,7 @@ import org.jetbrains.jet.lang.psi.JetCallElement
 import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector
 import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange
 import org.jetbrains.jet.lang.resolve.BindingContext
+import org.jetbrains.jet.plugin.util.isUnit

 trait Parameter {
    val argumentText: String
@@ -388,6 +389,7 @@ class ExtractableCodeDescriptorWithConflicts(

 fun ExtractableCodeDescriptor.canGenerateProperty(): Boolean {
    if (!parameters.empty) return false
+    if (controlFlow.outputValueBoxer.returnType.isUnit()) return false

    val parent = extractionData.targetSibling.getParent()
    return parent is JetFile || parent is JetClassBody
@@ -0,0 +1,5 @@
+// EXTRACT_AS_PROPERTY
+// SIBLING:
+fun foo() {
+    <selection>1 + 1</selection>
+}
@@ -0,0 +1 @@
+Can't generate property: 1 + 1
@@ -296,7 +296,13 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/asProperty/extractToFunction.kt");
                doExtractFunctionTest(fileName);
            }
-
+            
+            @TestMetadata("extractUnit.kt")
+            public void testExtractUnit() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/asProperty/extractUnit.kt");
+                doExtractFunctionTest(fileName);
+            }
+            
            @TestMetadata("extractWithParams.kt")
            public void testExtractWithParams() throws Exception {
                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/asProperty/extractWithParams.kt");