Surround with: move declaration out from block

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

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

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

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

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt

@@ -0,0 +1,6 @@
+fun foo() {
+    <selection>class A {}
+    "bbb"</selection>
+        
+    val myClass: A? = null
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt.after

@@ -0,0 +1,8 @@
+fun foo() {
+    class A {}
+    if (<caret>) {
+        "bbb"
+    }
+
+    val myClass: A? = null
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt

@@ -0,0 +1,6 @@
+fun foo() {
+    <selection>class A {}
+    "bbb"</selection>
+        
+    val myClass = A()
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt.after

@@ -0,0 +1,8 @@
+fun foo() {
+    class A {}
+    if (<caret>) {
+        "bbb"
+    }
+
+    val myClass = A()
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt

@@ -0,0 +1,5 @@
+fun foo() {
+    <selection>fun test() {}
+    "aaa"</selection>
+    test()
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt.after

@@ -0,0 +1,7 @@
+fun foo() {
+    fun test() {}
+    if (<caret>) {
+        "aaa"
+    }
+    test()
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt

@@ -0,0 +1,7 @@
+fun foo() {
+    <selection>"aaa"
+    fun test() {}
+    "aaa"</selection>
+
+    test()
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt.after

@@ -0,0 +1,9 @@
+fun foo() {
+    fun test() {}
+    if (<caret>) {
+        "aaa"
+        "aaa"
+    }
+
+    test()
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt

@@ -0,0 +1,9 @@
+fun foo() {
+    <selection>
+    fun test() {}
+    "aaa"
+    test()
+    </selection>
+
+    val a = "ss"
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt.after

@@ -0,0 +1,11 @@
+fun foo() {
+
+    if (<caret>) {
+        fun test() {}
+        "aaa"
+        test()
+    }
+
+
+    val a = "ss"
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt

@@ -0,0 +1,6 @@
+fun foo() {
+    <selection>object A {}
+    "bbb"</selection>
+        
+    val myClass = A
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt.after

@@ -0,0 +1,8 @@
+fun foo() {
+    object A {}
+    if (<caret>) {
+        "bbb"
+    }
+
+    val myClass = A
+}

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/twoClasses.kt

@@ -0,0 +1,9 @@
+fun foo() {
+    <selection>"start"
+    open class A {}
+    class B: A() {}
+    "end"</selection>
+
+    val c = B()
+    val d = A()
+}

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

@@ -0,0 +1,11 @@
+fun foo() {
+    open class A {}
+    class B: A() {}
+    if (<caret>) {
+        "start"
+        "end"
+    }
+
+    val c = B()
+    val d = A()
+}

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

@@ -0,0 +1,9 @@
+fun foo() {
+    <selection>class A {
+        fun test() {}
+    }
+    val d: A = A()</selection>
+
+    d.test()
+    A()
+}

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

@@ -0,0 +1,12 @@
+fun foo() {
+    class A {
+        fun test() {}
+    }
+    val d: A
+    if (<caret>) {
+        d = A()
+    }
+
+    d.test()
+    A()
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,9 @@
+package test
+
+class A {}
+
+fun foo() {
+    <caret>val a = test.A()
+
+    a.hashCode()
+}

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

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

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

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

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

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

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWoInitializer.kt

@@ -0,0 +1,11 @@
+fun foo() {
+    <selection>val a: String
+    a = "a"
+    a.capitalize()
+    val b: String
+    b = "b"
+    b.capitalize()</selection>
+
+    a.charAt(1)
+    b.charAt(1)
+}

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

@@ -0,0 +1,13 @@
+fun foo() {
+    val a: String
+    val b: String
+    if () {
+        a = "a"
+        a.capitalize()
+        b = "b"
+        b.capitalize()
+    }
+
+    a.charAt(1)
+    b.charAt(1)
+}

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

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

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

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

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

@@ -0,0 +1,4 @@
+fun foo() {
+    <caret>var a: Boolean = true
+    a = true
+}

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

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

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

@@ -0,0 +1,4 @@
+fun foo() {
+    <caret>var a: String? = "aaa"
+    a = "bbb"
+}

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

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

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

@@ -0,0 +1,16 @@
+fun foo() {
+    <selection>var a: Int = 1
+    var b: Char = 1
+    var c: Byte = 1
+    var d: Long = 1
+    var e: Short = 1
+    var f: Double = 1
+    var g: Float = 1</selection>
+    a = 2
+    b = 2
+    c = 2
+    d = 2
+    e = 2
+    f = 2
+    g = 2
+}

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

@@ -0,0 +1,25 @@
+fun foo() {
+    var a: Int = 0
+    var b: Char = 0
+    var c: Byte = 0
+    var d: Long = 0
+    var e: Short = 0
+    var f: Double = 0
+    var g: Float = 0
+    if (<caret>) {
+        a = 1
+        b = 1
+        c = 1
+        d = 1
+        e = 1
+        f = 1
+        g = 1
+    }
+    a = 2
+    b = 2
+    c = 2
+    d = 2
+    e = 2
+    f = 2
+    g = 2
+}

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

@@ -0,0 +1,5 @@
+fun foo() {
+   <caret>var a: String = "aaa"
+
+   a.charAt(1)
+}

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

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

idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithTypeWoInitializer.kt

@@ -0,0 +1,6 @@
+fun foo() {
+    <selection>var a: String
+    a.capitalize()</selection>
+
+    a.charAt(1)
+}

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

@@ -0,0 +1,8 @@
+fun foo() {
+    var a: String
+    if () {
+        a.capitalize()
+    }
+
+    a.charAt(1)
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,4 @@
+fun foo() {
+    <caret>var a: String? = "aaa"
+    a = "bbb"
+}

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

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

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

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

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

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