Simplify unfolding of properties, fix caret position

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String? {
-    val res:<caret> String?
-    if (n == 1) {
+    val res: String?
+    <caret>if (n == 1) {
         res = if (3 > 2) {
             println("***")
             "one"

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs2.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String? {
-    var res:<caret> String?
-    if (n == 1) {
+    var res: String?
+    <caret>if (n == 1) {
         res = if (3 > 2) {
             println("***")
             "one"

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String {
-    val <caret>res: String
-    if (n == 1) res = "one" else res = "two"
+    val res: String
+    <caret>if (n == 1) res = "one" else res = "two"
 
     return res
 }

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf2.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String {
-    var <caret>res: String
-    if (n == 1) res = "one" else res = "two"
+    var res: String
+    <caret>if (n == 1) res = "one" else res = "two"
 
     return res
 }

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String {
-    val res<caret>: String
-    if (n == 1) {
+    val res: String
+    <caret>if (n == 1) {
         println("***")
         res = "one"
     } else {

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String {
-    var res<caret>: String
-    if (n == 1) {
+    var res: String
+    <caret>if (n == 1) {
         println("***")
         res = "one"
     } else {

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithType.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String {
-    val <caret>res: jet.String
-    if (n == 1) res = "one" else res = "two"
+    val res: jet.String
+    <caret>if (n == 1) res = "one" else res = "two"
 
     return res
 }

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String? {
-    val res<caret>: String?
-    when(n) {
+    val res: String?
+    <caret>when(n) {
         1 -> res = "one"
         2 -> res = "two"
         else -> res = null

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen2.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String? {
-    var res<caret>: String?
-    when(n) {
+    var res: String?
+    <caret>when(n) {
         1 -> res = "one"
         2 -> res = "two"
         else -> res = null

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String {
-    val res<caret>: String
-    when (n) {
+    val res: String
+    <caret>when (n) {
         1 -> {
             println("***")
             res = "one"

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String {
-    var res<caret>: String
-    when (n) {
+    var res: String
+    <caret>when (n) {
         1 -> {
             println("***")
             res = "one"

idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String? {
-    val res<caret>: jet.String?
-    when(n) {
+    val res: jet.String?
+    <caret>when(n) {
         1 -> res = "one"
         2 -> res = "two"
         else -> res = null