KT-9839: intention introduced: convert primary constructor to secondary one

(cherry picked from commit 93aaa48)

idea/testData/intentions/convertPrimaryConstructorToSecondary/.intention

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ConvertPrimaryConstructorToSecondaryIntention

idea/testData/intentions/convertPrimaryConstructorToSecondary/annotatedConstructor.kt

@@ -0,0 +1,3 @@
+annotation class Ann(val t: String)
+
+class Annotated @Ann("42") constructor<caret>()

idea/testData/intentions/convertPrimaryConstructorToSecondary/annotatedConstructor.kt.after

@@ -0,0 +1,5 @@
+annotation class Ann(val t: String)
+
+class Annotated {
+    @Ann("42") constructor()
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/annotatedParam.kt

@@ -0,0 +1,5 @@
+annotation class Ann
+
+class AnnotatedParam<caret>(@Ann x: Double) {
+    val y = x
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/annotatedParam.kt.after

@@ -0,0 +1,9 @@
+annotation class Ann
+
+class AnnotatedParam {
+    constructor(@Ann x: Double) {
+        this.y = x
+    }
+
+    val y: Double
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/annotatedProperty.kt

@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+annotation class Ann
+
+class AnnotatedParam<caret>(val v: Double, @Ann val x: Int, var s: String)

idea/testData/intentions/convertPrimaryConstructorToSecondary/defaultValueChain.kt

@@ -0,0 +1 @@
+class DefaultValueChain(val<caret> x1: Int, x2: Int = x1, val x3: Int = x2, x4: Int = x3, val x5: Int = x4)

idea/testData/intentions/convertPrimaryConstructorToSecondary/defaultValueChain.kt.after

@@ -0,0 +1,11 @@
+class DefaultValueChain {
+    val x1: Int
+    val x3: Int
+    val x5: Int
+
+    constructor(x1: Int, x2: Int = x1, x3: Int = x2, x4: Int = x3, x5: Int = x4) {
+        this.x1 = x1
+        this.x3 = x3
+        this.x5 = x5
+    }
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/initAndParams.kt

@@ -0,0 +1,13 @@
+class InitAndParams<caret>(x: Int, z: Int) {
+    val y = x
+
+    val w: Int
+
+    init {
+        w = foo(y)
+    }
+
+    fun foo(arg: Int) = arg
+
+    val v = w + z
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/initAndParams.kt.after

@@ -0,0 +1,15 @@
+class InitAndParams {
+    constructor(x: Int, z: Int) {
+        this.y = x
+        w = foo(y)
+        this.v = w + z
+    }
+
+    val y: Int
+
+    val w: Int
+
+    fun foo(arg: Int) = arg
+
+    val v: Int
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/paramsAndProperties.kt

@@ -0,0 +1,7 @@
+class ParamAndProperties<caret>(x: Int, val y: Int, z: Int, val w: Int) {
+    val r = x + z
+
+    val s = r + y
+
+    val t = s + w
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/paramsAndProperties.kt.after

@@ -0,0 +1,18 @@
+class ParamAndProperties {
+    val y: Int
+    val w: Int
+
+    constructor(x: Int, y: Int, z: Int, w: Int) {
+        this.y = y
+        this.w = w
+        this.r = x + z
+        this.s = r + y
+        this.t = s + w
+    }
+
+    val r: Int
+
+    val s: Int
+
+    val t: Int
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/protectedConstructor.kt

@@ -0,0 +1 @@
+class Protected protected<caret> constructor(internal var s: String)

idea/testData/intentions/convertPrimaryConstructorToSecondary/protectedConstructor.kt.after

@@ -0,0 +1,7 @@
+class Protected {
+    internal var s: String
+
+    protected constructor(s: String) {
+        this.s = s
+    }
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/simple.kt

@@ -0,0 +1 @@
+class My<caret>()

idea/testData/intentions/convertPrimaryConstructorToSecondary/simple.kt.after

@@ -0,0 +1,3 @@
+class My {
+    constructor()
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/useParam.kt

@@ -0,0 +1,3 @@
+class UseParam<caret>(x: Int) {
+    val y = x
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/useParam.kt.after

@@ -0,0 +1,7 @@
+class UseParam {
+    constructor(x: Int) {
+        this.y = x
+    }
+
+    val y: Int
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/useParamChain.kt

@@ -0,0 +1,5 @@
+class UseParam<caret>(x: Int) {
+    val y = x
+
+    val z = 2 * y
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/useParamChain.kt.after

@@ -0,0 +1,10 @@
+class UseParam {
+    constructor(x: Int) {
+        this.y = x
+        this.z = 2 * y
+    }
+
+    val y: Int
+
+    val z: Int
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/vararg.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+class VarArg(<caret>vararg x: String) {
+    val strList = x.toList()
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/vararg.kt.after

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+
+class VarArg {
+    constructor(vararg x: String) {
+        this.strList = x.toList()
+    }
+
+    val strList: List<String>
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/varargVal.kt

@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+
+class VarargVal<caret>(vararg val param: String)

idea/testData/intentions/convertPrimaryConstructorToSecondary/varargVal.kt.after

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+
+class VarargVal {
+    val param: Array<out String>
+
+    constructor(vararg param: String) {
+        this.param = param
+    }
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/withBaseClass.kt

@@ -0,0 +1,5 @@
+abstract class Base(val x: Int)
+
+class Derived<caret>(x: Int) : Base(x) {
+    val y = 2 * x
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/withBaseClass.kt.after

@@ -0,0 +1,9 @@
+abstract class Base(val x: Int)
+
+class Derived : Base {
+    constructor(x: Int) : super(x) {
+        this.y = 2 * x
+    }
+
+    val y: Int
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/withMultipleInheritance.kt

@@ -0,0 +1,15 @@
+interface A {
+    val s: String
+}
+
+interface B {
+    val x: Int
+}
+
+abstract class C(open val d: Double)
+
+class D(<caret>open val y: Int, override val d: Double) :  A, C(d), B {
+    override val s = "$y -> $d"
+
+    override val x = y * y
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/withMultipleInheritance.kt.after

@@ -0,0 +1,25 @@
+interface A {
+    val s: String
+}
+
+interface B {
+    val x: Int
+}
+
+abstract class C(open val d: Double)
+
+class D :  A, C, B {
+    open val y: Int
+    override val d: Double
+
+    constructor(y: Int, d: Double) : super(d) {
+        this.y = y
+        this.d = d
+        this.s = "$y -> $d"
+        this.x = y * y
+    }
+
+    override val s: String
+
+    override val x: Int
+}

idea/testData/intentions/convertPrimaryConstructorToSecondary/withProperties.kt

@@ -0,0 +1 @@
+class WithProperties<caret>(val x: Int, val y: Int = 7, private val z: Int = 13)

idea/testData/intentions/convertPrimaryConstructorToSecondary/withProperties.kt.after

@@ -0,0 +1,11 @@
+class WithProperties {
+    val x: Int
+    val y: Int
+    private val z: Int
+
+    constructor(x: Int, y: Int = 7, z: Int = 13) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}

idea/testData/quickfix/addTypeAnnotationToValueParameter/noDefaultValue.kt

@@ -1,5 +1,6 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AddTypeAnnotationToValueParameterFix" "false"
 // ERROR: A type annotation is required on a value parameter
 // ACTION: Create test
+// ACTION: Convert to secondary constructor
 
 class Foo(val bar<caret>)

idea/testData/quickfix/variables/removeValVarFromParameter/constructorParameter.kt

@@ -3,5 +3,6 @@
 // ACTION: Make private
 // ACTION: Make protected
 // ACTION: Create test
+// ACTION: Convert to secondary constructor
 class C(<caret>val x: String) {
 }