Make constructor parameter a property: select 'private' to be able to remove it #KT-13187 Fixed

(cherry picked from commit dc8c195)

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

@@ -28,9 +28,7 @@ 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.*
-import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS
-import org.jetbrains.kotlin.psi.psiUtil.nonStaticOuterClasses
 
 class MakeConstructorParameterPropertyFix(
         element: KtParameter, private val kotlinValVar: KotlinValVar, className: String?
@@ -49,6 +47,12 @@ class MakeConstructorParameterPropertyFix(
     override fun invoke(project: Project, editor: Editor?, file: KtFile) {
         element.addBefore(kotlinValVar.createKeyword(KtPsiFactory(project))!!, element.firstChild)
         element.addModifier(KtTokens.PRIVATE_KEYWORD)
+        element.visibilityModifier()?.let { private ->
+            editor?.apply {
+                selectionModel.setSelection(private.startOffset, private.endOffset)
+                caretModel.moveToOffset(private.endOffset)
+            }
+        }
     }
 
     companion object Factory : KotlinIntentionActionsFactory() {

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

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

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

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

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

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