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

#KT-5435 Fixed

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)