Create from Usage: Generate secondary constructors by delegator to super-calls

2015-03-26 13:44:46 +03:00
parent e8b4c43011
commit e9e8be5b4e
11 changed files with 137 additions and 0 deletions
@@ -261,6 +261,9 @@ public class QuickFixRegistrar {
        QuickFixes.factories.put(NO_VALUE_FOR_PARAMETER, CreateConstructorFromDelegationCallActionFactory.INSTANCE$);
        QuickFixes.factories.put(TOO_MANY_ARGUMENTS, CreateConstructorFromDelegationCallActionFactory.INSTANCE$);

+        QuickFixes.factories.put(NO_VALUE_FOR_PARAMETER, CreateConstructorFromDelegatorToSuperCallActionFactory.INSTANCE$);
+        QuickFixes.factories.put(TOO_MANY_ARGUMENTS, CreateConstructorFromDelegatorToSuperCallActionFactory.INSTANCE$);
+
        QuickFixes.factories.put(UNRESOLVED_REFERENCE_WRONG_RECEIVER, CreateClassFromConstructorCallActionFactory.INSTANCE$);
        QuickFixes.factories.put(UNRESOLVED_REFERENCE, CreateClassFromConstructorCallActionFactory.INSTANCE$);
        QuickFixes.factories.put(EXPRESSION_EXPECTED_PACKAGE_FOUND, CreateClassFromConstructorCallActionFactory.INSTANCE$);
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2010-2015 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 org.jetbrains.kotlin.idea.quickfix.createFromUsage.createCallable
+
+import com.intellij.codeInsight.intention.IntentionAction
+import com.intellij.psi.PsiClass
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.ClassKind
+import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
+import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
+import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.ParameterInfo
+import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.SecondaryConstructorInfo
+import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo
+import org.jetbrains.kotlin.idea.refactoring.canRefactor
+import org.jetbrains.kotlin.psi.JetClass
+import org.jetbrains.kotlin.psi.JetConstructorDelegationCall
+import org.jetbrains.kotlin.psi.JetDelegatorToSuperCall
+import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.DescriptorUtils
+import org.jetbrains.kotlin.types.Variance
+
+object CreateConstructorFromDelegatorToSuperCallActionFactory : JetSingleIntentionActionFactory() {
+    override fun createAction(diagnostic: Diagnostic): IntentionAction? {
+        val delegationCall = diagnostic.getPsiElement().getStrictParentOfType<JetDelegatorToSuperCall>() ?: return null
+        val typeReference = delegationCall.getCalleeExpression().getTypeReference() ?: return null
+
+        val project = delegationCall.getProject()
+
+        val superType = typeReference.analyze()[BindingContext.TYPE, typeReference] ?: return null
+        val superClassDescriptor = superType.getConstructor().getDeclarationDescriptor() as? ClassDescriptor ?: return null
+        if (superClassDescriptor.getKind() != ClassKind.CLASS) return null
+        val targetClass = DescriptorToSourceUtilsIde.getAnyDeclaration(project, superClassDescriptor) ?: return null
+        if (!(targetClass.canRefactor() && (targetClass is JetClass || targetClass is PsiClass))) return null
+
+        val anyType = KotlinBuiltIns.getInstance().getNullableAnyType()
+        val parameters = delegationCall.getValueArguments().map {
+            ParameterInfo(
+                    it.getArgumentExpression()?.let { TypeInfo(it, Variance.IN_VARIANCE) } ?: TypeInfo(anyType, Variance.IN_VARIANCE),
+                    it.getArgumentName()?.getReferenceExpression()?.getReferencedName()
+            )
+        }
+
+        return CreateCallableFromUsageFix(delegationCall, SecondaryConstructorInfo(parameters, targetClass), false)
+    }
+}
@@ -0,0 +1,12 @@
+// "Create secondary constructor" "true"
+
+open class A {
+    constructor(i: Int) {
+        //To change body of created constructors use File | Settings | File Templates.
+    }
+
+}
+
+class B: A(1) {
+
+}
@@ -0,0 +1,9 @@
+// "Create secondary constructor" "true"
+
+open class A {
+
+}
+
+class B: A(<caret>1) {
+
+}
@@ -0,0 +1,10 @@
+// "Create secondary constructor" "false"
+// ERROR: This class does not have a constructor
+
+trait T {
+
+}
+
+class A: T(<caret>1) {
+
+}
@@ -0,0 +1,6 @@
+class J {
+
+    public J(int i) {
+    
+    }
+}
@@ -0,0 +1,6 @@
+// "Create secondary constructor" "true"
+// ERROR: Too many arguments for public/*package*/ constructor J() defined in J
+
+class B: J(1) {
+
+}
@@ -0,0 +1,6 @@
+// "Create secondary constructor" "true"
+// ERROR: Too many arguments for public/*package*/ constructor J() defined in J
+
+class B: J(<caret>1) {
+
+}
@@ -0,0 +1,3 @@
+class J {
+
+}
@@ -765,6 +765,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createSecondaryConstructor"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
            }

+            @TestMetadata("delegatorToSuperCallJavaClass.before.Main.kt")
+            public void testDelegatorToSuperCallJavaClass() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.Main.kt");
+                doTestWithExtraFile(fileName);
+            }
+
            @TestMetadata("groovyConstructor.before.Main.kt")
            public void testGroovyConstructor() throws Exception {
                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/groovyConstructor.before.Main.kt");
@@ -2299,6 +2299,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                doTest(fileName);
            }

+            @TestMetadata("beforeDelegatorToSuperCall.kt")
+            public void testDelegatorToSuperCall() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeDelegatorToSuperCall.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("beforeDelegatorToSuperCallNoClass.kt")
+            public void testDelegatorToSuperCallNoClass() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeDelegatorToSuperCallNoClass.kt");
+                doTest(fileName);
+            }
+
            @TestMetadata("beforeSuperCall.kt")
            public void testSuperCall() throws Exception {
                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeSuperCall.kt");