Surround with try/catch should generate more Kotlin-style code (KT-5435)

#KT-5435 Fixed

idea/testData/codeInsight/surroundWith/functionLiteral/moveDeclarationsOut.kt.after

@@ -1,9 +1,8 @@
 fun foo() {
     val a: String
-    val b: String
-    <selection>run</selection> {
+    val b = <selection>run</selection> {
         a = "aaa"
-        b = "aaa"
+        "aaa"
     }
 
     a.charAt(1)

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valAndClass.kt.after

@@ -3,9 +3,9 @@ fun foo() {
         fun test() {}
     }
 
-    val d: A
+    val d: A =
     if (<caret>) {
-        d = A()
+        A()
     }
 
     d.test()

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valOrder.kt.after

@@ -1,9 +1,8 @@
 fun foo() {
     val a: String
-    val b: String
-    if (<caret>) {
+    val b = if (<caret>) {
         a = "aaa"
-        b = a
+        a
     }
 
     a.charAt(1)

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedType.kt.after

@@ -1,7 +1,6 @@
 fun foo() {
-    val a: kotlin.test.Asserter?
-    if (<caret>) {
-        a = null
+    val a: kotlin.test.Asserter? = if (<caret>) {
+        null
     }
 
     a?.charAt(1)

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedTypeWithoutTypeRef.kt.after

@@ -3,9 +3,8 @@ package test
 class A {}
 
 fun foo() {
-    val a: A
-    if (<caret>) {
-        a = test.A()
+    val a = if (<caret>) {
+        test.A()
     }
 
     a.hashCode()

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWithInitializer.kt.after

@@ -1,7 +1,6 @@
 fun foo() {
-    val a: String
-    if () {
-        a = "aaa"
+    val a: String = if () {
+        "aaa"
     }
 
     a.charAt(1)

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWoTypeWithInitializer.kt.after

@@ -1,7 +1,6 @@
 fun foo() {
-    val a: String
-    if () {
-        a = "aaa"
+    val a = if () {
+        "aaa"
     }
 
     a.charAt(1)

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/boolean.kt.after

@@ -1,7 +1,6 @@
 fun foo() {
-    var a: Boolean = false
-    if (<caret>) {
-        a = true
+    var a: Boolean = if (<caret>) {
+        true
     }
     a = true
 }

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/nullable.kt.after

@@ -1,7 +1,6 @@
 fun foo() {
-    var a: String? = null
-    if (<caret>) {
-        a = "aaa"
+    var a: String? = if (<caret>) {
+        "aaa"
     }
     a = "bbb"
 }

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/primitiveNumbers.kt.after

@@ -5,15 +5,14 @@ fun foo() {
     var d: Long = 0
     var e: Short = 0
     var f: Double = 0.0
-    var g: Float = 0.0f
-    if () {
+    var g: Float = if () {
         a = 1
         b = 1
         c = 1
         d = 1
         e = 1
         f = 1
-        g = 1
+        1
     }
     a = 2
     b = 2

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithNotNullableTypeWithInitializer.kt.after

@@ -1,7 +1,6 @@
 fun foo() {
-    var a: String = ""
-    if () {
-        a = "aaa"
+    var a: String = if () {
+        "aaa"
     }
 
     a.charAt(1)

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWoTypeWithInitializer.kt.after

@@ -1,7 +1,6 @@
 fun foo() {
-    var a: String = ""
-    if () {
-        a = "aaa"
+    var a = if () {
+        "aaa"
     }
 
     a.charAt(1)

idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVal.kt.after

@@ -1,7 +1,6 @@
 fun foo() {
-    val a: String?
-    if (<caret>) {
-        a = "aaa"
+    val a: String? = if (<caret>) {
+        "aaa"
     } else {
     }
     a.toString()

idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVar.kt.after

@@ -1,7 +1,6 @@
 fun foo() {
-    var a: String?
-    if (<caret>) {
-        a = "aaa"
+    var a: String? = if (<caret>) {
+        "aaa"
     } else {
     }
     a = "bbb"

idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt.after

@@ -1,9 +1,8 @@
 fun foo() {
     val a: String
-    val b: String
-    try {
+    val b = try {
         a = "aaa"
-        b = "aaa"
+        "aaa"
     } catch (e: <selection>Exception</selection>) {
     }
 

idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOutSingleStatement.kt

@@ -0,0 +1,5 @@
+fun foo() {
+    <selection>val a = "aaa"</selection>
+
+    a.charAt(1)
+}

idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOutSingleStatement.kt.after

@@ -0,0 +1,8 @@
+fun foo() {
+    val a = try {
+        "aaa"
+    } catch (e: <selection><caret>Exception</selection>) {
+    }
+
+    a.charAt(1)
+}