KT-7212 Convert member function to extension intenton positions caret improperly

#KT-7212 Fixed

idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt

@@ -121,13 +121,16 @@ public class ConvertMemberToExtensionIntention : JetSelfTargetingRangeIntention<
             }
         }
 
-        if (bodyToSelect != null) {
-            PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument())
+        PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument())
 
+        if (bodyToSelect != null) {
             val range = bodyToSelect!!.getTextRange()
             editor.moveCaret(range.getStartOffset(), ScrollType.CENTER)
             editor.getSelectionModel().setSelection(range.getStartOffset(), range.getEndOffset())
         }
+        else {
+            editor.moveCaret(extension.getTextOffset(), ScrollType.CENTER)
+        }
     }
 
     private val THROW_UNSUPPORTED_OPERATION_EXCEPTION = "throw UnsupportedOperationException()"

idea/testData/intentions/declarations/convertMemberToExtension/explicitUnit.kt.after

@@ -1,4 +1,4 @@
 class Owner {
 }
 
-fun Owner.f(): Unit {}
+fun Owner.<caret>f(): Unit {}

idea/testData/intentions/declarations/convertMemberToExtension/functionType.kt.after

@@ -1,6 +1,6 @@
 class Owner {
 }
 
-fun Owner.f(p: () -> Unit): (Int) -> String {
+fun Owner.<caret>f(p: () -> Unit): (Int) -> String {
     return { it.toString() }
 }

idea/testData/intentions/declarations/convertMemberToExtension/genericClass.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner<T> {
 }
 
-fun <T> Owner<T>.f(t: T): T = t
+fun <T> Owner<T>.<caret>f(t: T): T = t

idea/testData/intentions/declarations/convertMemberToExtension/genericFun.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner {
 }
 
-fun <T> Owner.f(t: T): T = t
+fun <T> Owner.<caret>f(t: T): T = t

idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner<T> {
 }
 
-fun Owner<T>.f<T, R>(t: T, r: R): R = r
+fun Owner<T>.<caret>f<T, R>(t: T, r: R): R = r

idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClassWithUpperBounds.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner<T, X: List<T>> {
 }
 
-fun <T, X : List<T>, R : T> Owner<T, X>.f(t: T, r: R): R = r
+fun <T, X : List<T>, R : T> Owner<T, X>.<caret>f(t: T, r: R): R = r

idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner {
 }
 
-fun Owner.f<T>(t: T): T = t
+fun Owner.<caret>f<T>(t: T): T = t

idea/testData/intentions/declarations/convertMemberToExtension/internal.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner {
 }
 
-internal fun Owner.f() = 1
+internal fun Owner.<caret>f() = 1

idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyNoType.kt.after

@@ -1,4 +1,4 @@
 class Owner {
 }
 
-fun Owner.f() = 1
+fun Owner.<caret>f() = 1

idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyWithType.kt.after

@@ -1,4 +1,4 @@
 class Owner {
 }
 
-fun Owner.f(): Int = 1
+fun Owner.<caret>f(): Int = 1

idea/testData/intentions/declarations/convertMemberToExtension/private.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner {
 }
 
-private fun Owner.f() = 1
+private fun Owner.<caret>f() = 1

idea/testData/intentions/declarations/convertMemberToExtension/protected.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner {
 }
 
-fun Owner.f(): Int = 1
+fun Owner.<caret>f(): Int = 1

idea/testData/intentions/declarations/convertMemberToExtension/public.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner {
 }
 
-public fun Owner.f(): Int = 1
+public fun Owner.<caret>f(): Int = 1

idea/testData/intentions/declarations/convertMemberToExtension/simple.kt.after

@@ -1,4 +1,4 @@
 class Owner {
 }
 
-fun Owner.f() {}
+fun Owner.<caret>f() {}

idea/testData/intentions/declarations/convertMemberToExtension/typeFqName.kt.after

@@ -1,6 +1,6 @@
 class Owner {
 }
 
-fun Owner.f(p: kotlin.Int): kotlin.String {
+fun Owner.<caret>f(p: kotlin.Int): kotlin.String {
     return p.toString()
 }

idea/testData/intentions/declarations/convertMemberToExtension/unknownType.kt.after

@@ -5,5 +5,5 @@
 class Owner {
 }
 
-fun Owner.f(p: Foo): bar.Baz {
+fun Owner.<caret>f(p: Foo): bar.Baz {
 }

idea/testData/intentions/declarations/convertMemberToExtension/valWithGetter.kt.after

@@ -1,5 +1,5 @@
 class Owner {
 }
 
-val Owner.p: Int
+val Owner.<caret>p: Int
   get() = 1

idea/testData/intentions/declarations/convertMemberToExtension/valWithGetterBlockBody.kt.after

@@ -1,5 +1,5 @@
 class Owner {
 }
 
-val Owner.p: Int
+val Owner.<caret>p: Int
     get() { return 1}

idea/testData/intentions/declarations/convertMemberToExtension/varWithGetterAndSetter.kt.after

@@ -1,6 +1,6 @@
 class Owner {
 }
 
-var Owner.p: Int
+var Owner.<caret>p: Int
   get() = 1
   set(v) {}

idea/testData/intentions/declarations/convertMemberToExtension/withType.kt.after

@@ -1,4 +1,4 @@
 class Owner {
 }
 
-fun Owner.f(): Int { return 1 }
+fun Owner.<caret>f(): Int { return 1 }