Add quickfix to make referenced primary constructor parameter a property

Fixes #KT-12089

compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt

@@ -454,3 +454,8 @@ fun checkReservedPrefixWord(sink: DiagnosticSink, element: PsiElement, word: Str
     }
 }
 
+fun KtElement.nonStaticOuterClasses(): Sequence<KtClass> {
+    return generateSequence(containingClass()) { if (it.isInner()) it.containingClass() else null }
+}
+
+fun KtElement.containingClass(): KtClass? = getStrictParentOfType<KtClass>()

idea/src/org/jetbrains/kotlin/idea/quickfix/MakeConstructorParameterPropertyFix.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2016 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
+
+import com.intellij.codeInsight.intention.IntentionAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiFile
+import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtNameReferenceExpression
+import org.jetbrains.kotlin.psi.KtParameter
+import org.jetbrains.kotlin.psi.KtPsiFactory
+import org.jetbrains.kotlin.psi.psiUtil.containingClass
+import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS
+import org.jetbrains.kotlin.psi.psiUtil.nonStaticOuterClasses
+
+class MakeConstructorParameterPropertyFix(
+        element: KtParameter, private val kotlinValVar: KotlinValVar, private val className: String?
+) : KotlinQuickFixAction<KtParameter>(element) {
+    override fun getFamilyName() = "Make primary constructor parameter a property"
+
+    private val suffix = if (className != null) " in class '$className'" else ""
+    override fun getText() = "Make primary constructor parameter '${element.name}' a property" + suffix
+
+    override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
+        return super.isAvailable(project, editor, file) && !element.hasValOrVar()
+    }
+
+    override fun invoke(project: Project, editor: Editor?, file: KtFile) {
+        element.addBefore(kotlinValVar.createKeyword(KtPsiFactory(project))!!, element.firstChild)
+    }
+
+    companion object Factory : KotlinIntentionActionsFactory() {
+
+        override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
+            val ktReference = Errors.UNRESOLVED_REFERENCE.cast(diagnostic).a as? KtNameReferenceExpression ?: return emptyList()
+
+            val valOrVar = if (ktReference.getAssignmentByLHS() != null) KotlinValVar.Var else KotlinValVar.Val
+
+            val ktParameter = ktReference.getPrimaryConstructorParameterWithSameName() ?: return emptyList()
+            val containingClass = ktParameter.containingClass()!!
+            val className = if (containingClass != ktReference.containingClass()) containingClass.nameAsSafeName.asString() else null
+
+            return listOf(MakeConstructorParameterPropertyFix(ktParameter, valOrVar, className))
+        }
+    }
+}
+
+fun KtNameReferenceExpression.getPrimaryConstructorParameterWithSameName(): KtParameter? {
+    return nonStaticOuterClasses()
+            .mapNotNull { it.getPrimaryConstructor()?.valueParameters?.firstOrNull { it.name == getReferencedName() } }
+            .firstOrNull()
+}

idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt

@@ -19,13 +19,9 @@ package org.jetbrains.kotlin.idea.quickfix
 import com.intellij.codeInsight.intention.IntentionAction
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.diagnostics.Errors.*
-import org.jetbrains.kotlin.idea.inspections.PlatformUnresolvedProvider
 import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementAsConstructorParameter
 import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
-import org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory
+import org.jetbrains.kotlin.idea.inspections.*
-import org.jetbrains.kotlin.idea.inspections.AddReflectionQuickFix
-import org.jetbrains.kotlin.idea.inspections.AddTestLibQuickFix
-import org.jetbrains.kotlin.idea.inspections.InfixCallFix
 import org.jetbrains.kotlin.idea.intentions.AddValVarToConstructorParameterAction
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createCallable.*
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClassFromCallWithConstructorCalleeActionFactory
@@ -381,6 +377,8 @@ class QuickFixRegistrar : QuickFixContributor {
 
         NON_LOCAL_RETURN_NOT_ALLOWED.registerFactory(AddCrossInlineFix)
 
+        UNRESOLVED_REFERENCE.registerFactory(MakeConstructorParameterPropertyFix)
+
         SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE.registerFactory(ConvertExtensionToFunctionTypeFix)
     }
 }

idea/testData/quickfix/makeConstructorParameterProperty/inner.kt

@@ -0,0 +1,10 @@
+// "Make primary constructor parameter 'bar' a property in class 'B'" "true"
+
+class B(bar: String) {
+
+    inner class A {
+        fun foo() {
+            val a = bar<caret>
+        }
+    }
+}

idea/testData/quickfix/makeConstructorParameterProperty/inner.kt.after

@@ -0,0 +1,10 @@
+// "Make primary constructor parameter 'bar' a property in class 'B'" "true"
+
+class B(val bar: String) {
+
+    inner class A {
+        fun foo() {
+            val a = bar<caret>
+        }
+    }
+}

idea/testData/quickfix/makeConstructorParameterProperty/val.kt

@@ -0,0 +1,7 @@
+// "Make primary constructor parameter 'foo' a property" "true"
+
+class A(foo: String) {
+    fun bar() {
+        val a = foo<caret>
+    }
+}

idea/testData/quickfix/makeConstructorParameterProperty/val.kt.after

@@ -0,0 +1,7 @@
+// "Make primary constructor parameter 'foo' a property" "true"
+
+class A(val foo: String) {
+    fun bar() {
+        val a = foo<caret>
+    }
+}

idea/testData/quickfix/makeConstructorParameterProperty/var.kt

@@ -0,0 +1,7 @@
+// "Make primary constructor parameter 'foo' a property" "true"
+
+class A(foo: String) {
+    fun bar() {
+        foo<caret> = ""
+    }
+}

idea/testData/quickfix/makeConstructorParameterProperty/var.kt.after

@@ -0,0 +1,7 @@
+// "Make primary constructor parameter 'foo' a property" "true"
+
+class A(var foo: String) {
+    fun bar() {
+        foo<caret> = ""
+    }
+}

idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java

@@ -5089,6 +5089,33 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         }
     }
 
+    @TestMetadata("idea/testData/quickfix/makeConstructorParameterProperty")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class MakeConstructorParameterProperty extends AbstractQuickFixTest {
+        public void testAllFilesPresentInMakeConstructorParameterProperty() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/makeConstructorParameterProperty"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("inner.kt")
+        public void testInner() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/makeConstructorParameterProperty/inner.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("val.kt")
+        public void testVal() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/makeConstructorParameterProperty/val.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("var.kt")
+        public void testVar() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/makeConstructorParameterProperty/var.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("idea/testData/quickfix/migration")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)