From 8da986ff24fa84b799e1460b5360fe64088e5016 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 19 Jan 2016 11:43:19 +0300
Subject: [PATCH] Add Initializer Quick-Fix: Place caret at the end of
 generated initializer   #KT-10704 Fixed

---
 .../kotlin/idea/quickfix/InitializePropertyQuickFixFactory.kt   | 1 +
 idea/testData/quickfix/addInitializer/memberProperty.kt.after   | 2 +-
 .../addInitializer/memberPropertyVarGetterOnly.kt.after         | 2 +-
 .../addInitializer/memberPropertyVarSetterOnly.kt.after         | 2 +-
 idea/testData/quickfix/addInitializer/topLevelProperty.kt.after | 2 +-
 .../addInitializer/topLevelPropertyVarGetterOnly.kt.after       | 2 +-
 .../addInitializer/topLevelPropertyVarSetterOnly.kt.after       | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/InitializePropertyQuickFixFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/InitializePropertyQuickFixFactory.kt
index 348032de67d..98485ac64de 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/InitializePropertyQuickFixFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/InitializePropertyQuickFixFactory.kt
@@ -61,6 +61,7 @@ object InitializePropertyQuickFixFactory : KotlinIntentionActionsFactory() {
             if (editor != null) {
                 PsiDocumentManager.getInstance(project).commitDocument(editor.document)
                 editor.selectionModel.setSelection(initializer.startOffset, initializer.endOffset)
+                editor.caretModel.moveToOffset(initializer.endOffset)
             }
         }
     }
diff --git a/idea/testData/quickfix/addInitializer/memberProperty.kt.after b/idea/testData/quickfix/addInitializer/memberProperty.kt.after
index 9bd7b2b303e..bd491940f55 100644
--- a/idea/testData/quickfix/addInitializer/memberProperty.kt.after
+++ b/idea/testData/quickfix/addInitializer/memberProperty.kt.after
@@ -1,4 +1,4 @@
 // "Add initializer" "true"
 class A {
-    <caret>val n: Int = <selection>0</selection>
+    val n: Int = <selection>0</selection><caret>
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addInitializer/memberPropertyVarGetterOnly.kt.after b/idea/testData/quickfix/addInitializer/memberPropertyVarGetterOnly.kt.after
index e3164fd5868..e58b884a71a 100644
--- a/idea/testData/quickfix/addInitializer/memberPropertyVarGetterOnly.kt.after
+++ b/idea/testData/quickfix/addInitializer/memberPropertyVarGetterOnly.kt.after
@@ -1,5 +1,5 @@
 // "Add initializer" "true"
 class A {
-    var n: Int = <selection>0</selection>
+    var n: Int = <selection>0</selection><caret>
         get() = 1
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addInitializer/memberPropertyVarSetterOnly.kt.after b/idea/testData/quickfix/addInitializer/memberPropertyVarSetterOnly.kt.after
index 9f20f21eb30..670dcf65b77 100644
--- a/idea/testData/quickfix/addInitializer/memberPropertyVarSetterOnly.kt.after
+++ b/idea/testData/quickfix/addInitializer/memberPropertyVarSetterOnly.kt.after
@@ -1,5 +1,5 @@
 // "Add initializer" "true"
 class A {
-    var n: Int = <selection>0</selection>
+    var n: Int = <selection>0</selection><caret>
         set(value: Int) {}
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addInitializer/topLevelProperty.kt.after b/idea/testData/quickfix/addInitializer/topLevelProperty.kt.after
index 6637686f91f..3065ca025bb 100644
--- a/idea/testData/quickfix/addInitializer/topLevelProperty.kt.after
+++ b/idea/testData/quickfix/addInitializer/topLevelProperty.kt.after
@@ -1,2 +1,2 @@
 // "Add initializer" "true"
-<caret>val n: Int = <selection>0</selection>
\ No newline at end of file
+val n: Int = <selection>0</selection><caret>
\ No newline at end of file
diff --git a/idea/testData/quickfix/addInitializer/topLevelPropertyVarGetterOnly.kt.after b/idea/testData/quickfix/addInitializer/topLevelPropertyVarGetterOnly.kt.after
index b9ff42ac6de..d41f718aac2 100644
--- a/idea/testData/quickfix/addInitializer/topLevelPropertyVarGetterOnly.kt.after
+++ b/idea/testData/quickfix/addInitializer/topLevelPropertyVarGetterOnly.kt.after
@@ -1,3 +1,3 @@
 // "Add initializer" "true"
-<caret>var n: Int = <selection>0</selection>
+var n: Int = <selection>0</selection><caret>
     get() = 1
\ No newline at end of file
diff --git a/idea/testData/quickfix/addInitializer/topLevelPropertyVarSetterOnly.kt.after b/idea/testData/quickfix/addInitializer/topLevelPropertyVarSetterOnly.kt.after
index 516699b453a..394c3c525a1 100644
--- a/idea/testData/quickfix/addInitializer/topLevelPropertyVarSetterOnly.kt.after
+++ b/idea/testData/quickfix/addInitializer/topLevelPropertyVarSetterOnly.kt.after
@@ -1,3 +1,3 @@
 // "Add initializer" "true"
-<caret>var n: Int = <selection>0</selection>
+var n: Int = <selection>0</selection><caret>
     set(value: Int) {}
\ No newline at end of file