Generalize movable element constraint

#KT-4468 Fixed
 #KT-4376 Fixed

idea/testData/codeInsight/moveUpDown/expressions/binaryExpr1.kt

@@ -0,0 +1,11 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    <caret>1 + 2
+    if (x) {
+
+    }
+    else {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/binaryExpr1.kt.after

@@ -0,0 +1,11 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    if (x) {
+        <caret>1 + 2
+
+    }
+    else {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/binaryExpr2.kt

@@ -0,0 +1,11 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+    }
+    else {
+
+    }
+    <caret>2 + 3
+}

idea/testData/codeInsight/moveUpDown/expressions/binaryExpr2.kt.after

@@ -0,0 +1,11 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+    }
+    else {
+
+        <caret>2 + 3
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock1.kt

@@ -0,0 +1,13 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+    }
+    val p = <caret>if (x) {
+        0
+    }
+    else {
+        1
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock1.kt.after

@@ -0,0 +1,13 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+        val p = <caret>if (x) {
+            0
+        }
+        else {
+            1
+        }
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock2.kt

@@ -0,0 +1,13 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    val p = <caret>if (x) {
+        0
+    }
+    else {
+        1
+    }
+    if (x) {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock2.kt.after

@@ -0,0 +1,13 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    if (x) {
+        val p = <caret>if (x) {
+            0
+        }
+        else {
+            1
+        }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/ifToBlock1.kt

@@ -0,0 +1,10 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    <caret>if (x) {
+
+    }
+    if (x) {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/ifToBlock1.kt.after

@@ -0,0 +1,10 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    if (x) {
+        <caret>if (x) {
+
+        }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/ifToBlock2.kt

@@ -0,0 +1,10 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+    }
+    <caret>if (x) {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/ifToBlock2.kt.after

@@ -0,0 +1,10 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+        <caret>if (x) {
+
+        }
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall1.kt

@@ -0,0 +1,11 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    <caret>x.let { printn(x) }
+    if (x) {
+
+    }
+    else {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall1.kt.after

@@ -0,0 +1,11 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    if (x) {
+        <caret>x.let { printn(x) }
+
+    }
+    else {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall2.kt

@@ -0,0 +1,11 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+    }
+    else {
+
+    }
+    <caret>x.let { printn(x) }
+}

idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall2.kt.after

@@ -0,0 +1,11 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+    }
+    else {
+
+        <caret>x.let { printn(x) }
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/whileToBlock1.kt

@@ -0,0 +1,10 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    <caret>while (x) {
+
+    }
+    if (x) {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/whileToBlock1.kt.after

@@ -0,0 +1,10 @@
+// MOVE: down
+
+fun foo(x: Boolean) {
+    if (x) {
+        <caret>while (x) {
+
+        }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/whileToBlock2.kt

@@ -0,0 +1,10 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+    }
+    <caret>while (x) {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/expressions/whileToBlock2.kt.after

@@ -0,0 +1,10 @@
+// MOVE: up
+
+fun foo(x: Boolean) {
+    if (x) {
+
+        <caret>while (x) {
+
+        }
+    }
+}