Fixed tests after adding error checking for intention tests.

idea/testData/intentions/branched/elvisToIfThen/callExpression.kt

@@ -1,10 +1,8 @@
 fun foo(): String? {
-    print("foo")
     return "foo"
 }
 
 fun bar() {
-    print("bar")
 }
 
 fun main(args: Array<String>) {

idea/testData/intentions/branched/elvisToIfThen/callExpression.kt.after

@@ -1,10 +1,8 @@
 fun foo(): String? {
-    print("foo")
     return "foo"
 }
 
 fun bar() {
-    print("bar")
 }
 
 fun main(args: Array<String>) {

idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt

@@ -1,10 +1,8 @@
 fun foo(): String? {
-    print("foo")
     return "foo"
 }
 
 fun bar() {
-    print("bar")
 }
 
 fun main(args: Array<String>) {

idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt.after

@@ -1,10 +1,8 @@
 fun foo(): String? {
-    print("foo")
     return "foo"
 }
 
 fun bar() {
-    print("bar")
 }
 
 fun main(args: Array<String>) {

idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt

@@ -1,21 +1,23 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     if (n == 1) {
         <caret>if (3 > 2) {
-            println("***")
+            doSomething("***")
             res = "one"
         } else {
-            println("***")
+            doSomething("***")
             res = "???"
         }
     } else if (n == 2) {
-        println("***")
+        doSomething("***")
         res = "two"
     } else {
-        println("***")
+        doSomething("***")
         res = "too many"
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after

@@ -1,21 +1,23 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     if (n == 1) {
         <caret>res = if (3 > 2) {
-            println("***")
+            doSomething("***")
             "one"
         } else {
-            println("***")
+            doSomething("***")
             "???"
         }
     } else if (n == 2) {
-        println("***")
+        doSomething("***")
         res = "two"
     } else {
-        println("***")
+        doSomething("***")
         res = "too many"
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt

@@ -1,13 +1,15 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     <caret>if (n == 1) {
-        println("***")
+        doSomething("***")
         res = "one"
     } else {
-        println("***")
+        doSomething("***")
         res = "two"
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after

@@ -1,13 +1,15 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     <caret>res = if (n == 1) {
-        println("***")
+        doSomething("***")
         "one"
     } else {
-        println("***")
+        doSomething("***")
         "two"
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt

@@ -1,16 +1,18 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String = ""
 
     <caret>if (n == 1) {
-        println("***")
+        doSomething("***")
         res = "one"
     } else {
         var res: String
 
-        println("***")
+        doSomething("***")
         res = "two"
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt

@@ -1,11 +1,13 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String = ""
 
     <caret>if (n == 1) {
-        println("***")
+        doSomething("***")
         res = "one"
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt

@@ -1,14 +1,16 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     <caret>if (n == 1) {
         res = "one"
-        println("***")
+        doSomething("***")
     } else {
-        println("***")
+        doSomething("***")
         res = "two"
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt

@@ -1,17 +1,19 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     if (n == 1) {
         <caret>if (3 > 2) {
-            println("***")
+            doSomething("***")
             return "one"
         } else {
-            println("***")
+            doSomething("***")
             return "???"
         }
     } else if (n == 2) {
-        println("***")
+        doSomething("***")
         return "two"
     } else {
-        println("***")
+        doSomething("***")
         return "too many"
     }
-}
+}

idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after

@@ -1,17 +1,19 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     if (n == 1) {
         <caret>return if (3 > 2) {
-            println("***")
+            doSomething("***")
             "one"
         } else {
-            println("***")
+            doSomething("***")
             "???"
         }
     } else if (n == 2) {
-        println("***")
+        doSomething("***")
         return "two"
     } else {
-        println("***")
+        doSomething("***")
         return "too many"
     }
-}
+}

idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt

@@ -1,9 +1,11 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     <caret>if (n == 1) {
-        println("***")
+        doSomething("***")
         return "one"
     } else {
-        println("***")
+        doSomething("***")
         return "two"
     }
-}
+}

idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after

@@ -1,9 +1,11 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     <caret>return if (n == 1) {
-        println("***")
+        doSomething("***")
         "one"
     } else {
-        println("***")
+        doSomething("***")
         "two"
     }
-}
+}

idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt

@@ -1,7 +1,9 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     <caret>if (n == 1) {
-        println("***")
+        doSomething("***")
         return "one"
     }
     return "two"
-}
+}

idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after

@@ -1,6 +1,8 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     <caret>return if (n == 1) {
-        println("***")
+        doSomething("***")
         "one"
     } else "two"
-}
+}

idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt

@@ -1,21 +1,23 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     if (3 > 2) {
         <caret>when(n) {
             1 -> {
-                println("***")
+                doSomething("***")
                 res = "one"
             }
             else -> {
-                println("***")
+                doSomething("***")
                 res = "two"
             }
         }
     } else {
-        println("***")
+        doSomething("***")
         res = "???"
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after

@@ -1,21 +1,23 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     if (3 > 2) {
         <caret>res = when(n) {
             1 -> {
-                println("***")
+                doSomething("***")
                 "one"
             }
             else -> {
-                println("***")
+                doSomething("***")
                 "two"
             }
         }
     } else {
-        println("***")
+        doSomething("***")
         res = "???"
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt

@@ -1,16 +1,18 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     <caret>when (n) {
         1 -> {
-            println("***")
+            doSomething("***")
             res = "one"
         }
         else -> {
-            println("***")
+            doSomething("***")
             res = "two"
         }
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after

@@ -1,16 +1,18 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     <caret>res = when (n) {
         1 -> {
-            println("***")
+            doSomething("***")
             "one"
         }
         else -> {
-            println("***")
+            doSomething("***")
             "two"
         }
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt

@@ -1,19 +1,21 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String = ""
 
     <caret>when (n) {
         1 -> {
-            println("***")
+            doSomething("***")
             res = "one"
         }
         else -> {
             var res: String
 
             res = "two"
-            println("***")
+            doSomething("***")
         }
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt

@@ -1,18 +1,20 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String = ""
     var res2: String = ""
 
     <caret>when (n) {
         1 -> {
-            println("***")
+            doSomething("***")
             res = "one"
         }
         else -> {
-            println("***")
+            doSomething("***")
             res2 = "two"
         }
     }
 
     return res + res2
-}
+}

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt

@@ -1,17 +1,19 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     var res: String
 
     <caret>when (n) {
             1 -> {
-                println("***")
+                doSomething("***")
                 res = "one"
             }
             else -> {
                 res = "two"
-                println("***")
+                doSomething("***")
             }
     }
 
     return res
-}
+}

idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt

@@ -1,3 +1,5 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     if (3 > 2) {
         <caret>when (n) {
@@ -5,7 +7,7 @@ fun test(n: Int): String {
             else -> return "two"
         }
     } else {
-        println("***")
+        doSomething("***")
         return "???"
     }
-}
+}

idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after

@@ -1,3 +1,5 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     if (3 > 2) {
         <caret>return when (n) {
@@ -5,7 +7,7 @@ fun test(n: Int): String {
             else -> "two"
         }
     } else {
-        println("***")
+        doSomething("***")
         return "???"
     }
-}
+}

idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt

@@ -1,12 +1,14 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     <caret>when(n) {
         1 -> {
-            println("***")
+            doSomething("***")
             return "one"
         }
         else -> {
-            println("***")
+            doSomething("***")
             return "two"
         }
     }
-}
+}

idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after

@@ -1,12 +1,14 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int): String {
     <caret>return when(n) {
         1 -> {
-            println("***")
+            doSomething("***")
             "one"
         }
         else -> {
-            println("***")
+            doSomething("***")
             "two"
         }
     }
-}
+}

idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt

@@ -1,10 +1,12 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     val foo: String? = null
     val bar = "bar"
 
     if (foo != null<caret>) {
-        print ("Hello")
+        doSomething ("Hello")
         foo
     }
     else {

idea/testData/intentions/branched/ifThenToElvis/conditionInvalidBinaryExp.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun <T> T.compareTo(a: T): Int = 0
+
 fun main(args: Array<String>) {
     val foo = null
     val bar = "bar"

idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt

@@ -1,4 +1,8 @@
 // IS_APPLICABLE: false
+// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Boolean</td></tr><tr><td>Found:</td><td>kotlin.Int</td></tr></table></html>
+// ERROR: Condition must be of type kotlin.Boolean, but is of type kotlin.Int
+// ERROR: Infix call corresponds to a dot-qualified call 'foo.times(10)' which is not allowed on a nullable receiver 'foo'. Use ?.-qualified call instead
+
 fun main(args: Array<String>) {
     val foo: Int? = 4
     val bar = 3

idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt

@@ -1,10 +1,12 @@
+fun doSomething<T>(a: T) {}
+
 fun maybeFoo(): String? {
     return "foo"
 }
 
 fun main(args: Array<String>) {
     val foo = maybeFoo()
-    print(foo)
+    doSomething(foo)
     val bar = "bar"
     if (foo != null<caret>) {
         foo

idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after

@@ -1,10 +1,12 @@
+fun doSomething<T>(a: T) {}
+
 fun maybeFoo(): String? {
     return "foo"
 }
 
 fun main(args: Array<String>) {
     val foo = maybeFoo()
-    print(foo)
+    doSomething(foo)
     val bar = "bar"
     foo ?: bar
 }

idea/testData/intentions/branched/ifThenToElvis/noCondition.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Boolean</td></tr><tr><td>Found:</td><td>() &rarr; kotlin.String?</td></tr></table></html>
+// ERROR: Condition must be of type kotlin.Boolean, but is of type () -> kotlin.String?
 fun main(args: Array<String>) {
     val foo: String? = "foo"
     val bar = "bar"

idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     val foo: String? = null
     val bar = "bar"
@@ -7,7 +9,7 @@ fun main(args: Array<String>) {
         foo
     }
     else {
-        print ("Hello")
+        doSomething("Hello")
         bar
     }
 }

idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt

@@ -1,8 +1,10 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     val foo: String? = "abc"
     if (foo != null<caret>) {
-        print ("Hello")
+        doSomething ("Hello")
         foo.length
     }
     else null

idea/testData/intentions/branched/ifThenToSafeAccess/blockUsesDifferentVar.kt

@@ -3,7 +3,7 @@ fun main(args: Array<String>) {
     var foo: String? = "foo"
     var bar: String? = "bar"
     if (foo != null<caret>) {
-        bar.length
+        bar?.length
     }
     else null
 }

idea/testData/intentions/branched/ifThenToSafeAccess/conditionInvalidBinaryExp.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun <T> T.compareTo(a: T): Int = 0
+
 fun main(args: Array<String>) {
     val foo = "foo"
     if (foo > null<caret>) {

idea/testData/intentions/branched/ifThenToSafeAccess/conditionNotBinaryExpr.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun String?.times(a: Int): Boolean = a == 0
+
 fun main(args: Array<String>) {
     val foo: String = "foo"
     if (foo * 10<caret>) {

idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt

@@ -2,11 +2,13 @@ fun maybeFoo(): String? {
     return "foo"
 }
 
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     val foo = maybeFoo()
-    print(foo)
+    doSomething(foo)
     if (foo != null<caret>) {
-        foo.length()
+        foo.length
     }
     else {
         null

idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after

@@ -2,8 +2,10 @@ fun maybeFoo(): String? {
     return "foo"
 }
 
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     val foo = maybeFoo()
-    print(foo)
-    foo?.length()
+    doSomething(foo)
+    foo?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueOutsideOfScope.kt

@@ -6,7 +6,7 @@ val x = maybeFoo()
 
 fun main(args: Array<String>) {
     if (x !=<caret> null) {
-        x.length()
+        x.length
     } else {
         null
     }

idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueOutsideOfScope.kt.after

@@ -5,5 +5,5 @@ fun maybeFoo(): String? {
 val x = maybeFoo()
 
 fun main(args: Array<String>) {
-    x?.length()
+    x?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/emptyThenBlock.kt

@@ -7,6 +7,6 @@ fun main(args: Array<String>) {
     if (foo == null<caret>) {
     }
     else {
-        foo.length()
+        foo.length
     }
 }

idea/testData/intentions/branched/ifThenToSafeAccess/emptyThenBlock.kt.after

@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
 }
 
 fun main(args: Array<String>) {
-    maybeFoo()?.length()
+    maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseBothInBlocks.kt

@@ -5,7 +5,7 @@ fun maybeFoo(): String? {
 fun main(args: Array<String>) {
     val foo = maybeFoo()
     if (foo != null<caret>) {
-        foo.length()
+        foo.length
     }
     else {
         null

idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseBothInBlocks.kt.after

@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
 }
 
 fun main(args: Array<String>) {
-    maybeFoo()?.length()
+    maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseNotInBlocks.kt

@@ -5,7 +5,7 @@ fun maybeFoo(): String? {
 fun main(args: Array<String>) {
     val foo = maybeFoo()
     if (foo != null<caret>)
-        foo.length()
+        foo.length
     else
         null
 }

idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseNotInBlocks.kt.after

@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
 }
 
 fun main(args: Array<String>) {
-    maybeFoo()?.length()
+    maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/lhsEqualsNull.kt

@@ -7,5 +7,5 @@ fun main(args: Array<String>) {
     if (foo == null<caret>)
         null
     else
-        foo.length()
+        foo.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/lhsEqualsNull.kt.after

@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
 }
 
 fun main(args: Array<String>) {
-    maybeFoo()?.length()
+    maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/lhsNotEqualsNull.kt

@@ -5,7 +5,7 @@ fun maybeFoo(): String? {
 fun main(args: Array<String>) {
     val foo = maybeFoo()
     if (foo != null<caret>)
-        foo.length()
+        foo.length
     else
         null
 }

idea/testData/intentions/branched/ifThenToSafeAccess/lhsNotEqualsNull.kt.after

@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
 }
 
 fun main(args: Array<String>) {
-    maybeFoo()?.length()
+    maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt

@@ -1,7 +1,10 @@
 // IS_APPLICABLE: false
+// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Boolean</td></tr><tr><td>Found:</td><td>() &rarr; kotlin.Int</td></tr></table></html>
+// ERROR: Condition must be of type kotlin.Boolean, but is of type () -> kotlin.Int
+// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
 fun main(args: Array<String>) {
     val foo: String? = "foo"
     if<caret> {
-        foo.length()
+        foo.length
     } else null
 }

idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt

@@ -5,6 +5,6 @@ fun maybeFoo(): String? {
 fun main(args: Array<String>) {
     val foo = maybeFoo()
     if (foo != null<caret>) {
-        foo.length()
+        foo.length
     }
 }

idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt.after

@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
 }
 
 fun main(args: Array<String>) {
-    maybeFoo()?.length()
+    maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition.kt

@@ -3,7 +3,7 @@ fun main(args: Array<String>) {
     val foo: String? = "foo"
     val bar: String? = null
     if (foo == bar<caret>) {
-        foo.length()
+        foo?.length
     }
     else null
 }

idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition2.kt

@@ -3,7 +3,7 @@ fun main(args: Array<String>) {
     val foo: String? = "foo"
     val bar: String? = null
     if (foo == bar<caret>) {
-        bar.length()
+        bar?.length
     }
     else null
 }

idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt

@@ -5,6 +5,6 @@ fun maybeFoo(): String? {
 fun main(args: Array<String>) {
     val foo = maybeFoo()
     if (foo == null<caret>) else {
-        foo.length()
+        foo.length
     }
 }

idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt.after

@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
 }
 
 fun main(args: Array<String>) {
-    maybeFoo()?.length()
+    maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForFunction.kt

@@ -7,5 +7,5 @@ fun main(args: Array<String>) {
     if (maybeFoo() == null<caret>)
         null
     else
-        maybeFoo().length()
+        maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForLocalVar.kt

@@ -8,5 +8,5 @@ fun main(args: Array<String>) {
     if (foo == null<caret>)
         null
     else
-        foo.length()
+        foo?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt

@@ -1,11 +1,13 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     val foo: String? = "abc"
     if (foo != null<caret>) {
         foo.length
     }
     else {
-        print("Hi")
+        doSomething("Hi")
         null
     }
 }

idea/testData/intentions/branched/ifThenToSafeAccess/rhsEqualsNull.kt

@@ -7,5 +7,5 @@ fun main(args: Array<String>) {
     if (null == foo<caret>)
         null
     else
-        foo.length()
+        foo.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/rhsEqualsNull.kt.after

@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
 }
 
 fun main(args: Array<String>) {
-    maybeFoo()?.length()
+    maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/rhsNotEqualsNull.kt

@@ -5,7 +5,7 @@ fun maybeFoo(): String? {
 fun main(args: Array<String>) {
     val foo = maybeFoo()
     if (null != foo<caret>)
-        foo.length()
+        foo.length
     else
         null
 }

idea/testData/intentions/branched/ifThenToSafeAccess/rhsNotEqualsNull.kt.after

@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
 }
 
 fun main(args: Array<String>) {
-    maybeFoo()?.length()
+    maybeFoo()?.length
 }

idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt

@@ -1,10 +1,11 @@
 // IS_APPLICABLE: false
+// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
 fun main(args: Array<String>) {
     val foo: String? = "foo"
     if (foo == null<caret>) {
-        foo.length()
+        foo.length
     }
     else {
-        foo.length()
+        foo.length
     }
 }

idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt

@@ -1,9 +1,11 @@
+class Klass<T>
+
 fun test(obj: Any): String {
     return <caret>if (obj is String)
         "string"
     else if (obj is Int)
         "int"
-    else if (obj is Class<*>)
+    else if (obj is Klass<*>)
         "class"
     else "unknown"
-}
+}

idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt.after

@@ -1,8 +1,10 @@
+class Klass<T>
+
 fun test(obj: Any): String {
-    return <caret>when (obj) {
+    return when (obj) {
         is String -> "string"
         is Int -> "int"
-        is Class<*> -> "class"
+        is Klass<*> -> "class"
         else -> "unknown"
     }
-}
+}

idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithoutElse.kt

@@ -1,5 +1,5 @@
-fun test(n: Int) {
-    val s = "test"
+fun test(n: Int): String {
+    var s = "test"
     <caret>if (n == 0)
         s = "zero"
     else if (n == 1)
@@ -7,4 +7,4 @@ fun test(n: Int) {
     else if (n == 2)
         s = "two"
     return s
-}
+}

idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithoutElse.kt.after

@@ -1,9 +1,9 @@
-fun test(n: Int) {
-    val s = "test"
+fun test(n: Int): String {
+    var s = "test"
     when (n) {
         0 -> s = "zero"
         1 -> s = "one"
         2 -> s = "two"
     }
     return s
-}
+}

idea/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt

@@ -1,4 +1,4 @@
-class G {
+object G {
     fun cat(x: Int, y: Int): Int {
         return x + y
     }
@@ -10,4 +10,4 @@ fun test(x: Int, y: Int): String {
         2 -> return "two"
         else -> return "big"
     }
-}
+}

idea/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt.after

@@ -1,4 +1,4 @@
-class G {
+object G {
     fun cat(x: Int, y: Int): Int {
         return x + y
     }
@@ -8,4 +8,4 @@ fun test(x: Int, y: Int): String {
     if (G.cat(x, y) == 1) return "one"
     else if (G.cat(x, y) == 2) return "two"
     else return "big"
-}
+}

idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt

@@ -1,8 +1,10 @@
+class Klass<T>
+
 fun test(obj: Any): String {
     return <caret>when (obj) {
         is String -> "string"
         is Int -> "int"
-        is Class<*> -> "class"
+        is Klass<*> -> "class"
         else -> "unknown"
     }
-}
+}

idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt.after

@@ -1,6 +1,8 @@
+class Klass<T>
+
 fun test(obj: Any): String {
     return <caret>if (obj is String) "string"
     else if (obj is Int) "int"
-    else if (obj is Class<*>) "class"
+    else if (obj is Klass<*>) "class"
     else "unknown"
-}
+}

idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutElse.kt

@@ -1,9 +1,9 @@
-fun test(n: Int) {
-    val s = "test"
+fun test(n: Int): String {
+    var s = "test"
     <caret>when (n) {
         0 -> s = "zero"
         1 -> s = "one"
         2 -> s = "two"
     }
     return s
-}
+}

idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutElse.kt.after

@@ -1,7 +1,7 @@
-fun test(n: Int) {
-    val s = "test"
+fun test(n: Int): String {
+    var s = "test"
     if (n == 0) s = "zero"
     else if (n == 1) s = "one"
     else if (n == 2) s = "two"
     return s
-}
+}

idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt

@@ -1,3 +1,5 @@
+fun String.length() = length
+
 fun foo(): String? = "foo"
 fun main(args: Array<String>) {
     foo()?.<caret>length()

idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt.after

@@ -1,3 +1,5 @@
+fun String.length() = length
+
 fun foo(): String? = "foo"
 fun main(args: Array<String>) {
     val s = foo()

idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt

@@ -1,4 +1,4 @@
 fun foo(): String? = "foo"
 fun main(args: Array<String>) {
-    (foo())?.<caret>length()
+    (foo())?.<caret>length
 }

idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt.after

@@ -1,5 +1,5 @@
 fun foo(): String? = "foo"
 fun main(args: Array<String>) {
     val s = foo()
-    if (s != null) s.length()
+    if (s != null) s.length
 }

idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt

@@ -1,11 +1,13 @@
+fun doSomething<T>(a: T) {}
+
 class Foo {
     val b: String?
         get() {
-            print("I have side effects")
             return "Foo"
         }
 }
+
 fun main(args: Array<String>) {
     val a = Foo()
-    println(a.b?.<caret>length)
+    doSomething(a.b?.<caret>length)
 }

idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after

@@ -1,12 +1,14 @@
+fun doSomething<T>(a: T) {}
+
 class Foo {
     val b: String?
         get() {
-            print("I have side effects")
             return "Foo"
         }
 }
+
 fun main(args: Array<String>) {
     val a = Foo()
     val s = a.b
-    println(if (s != null) s.length else null)
+    doSomething(if (s != null) s.length else null)
 }

idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt

@@ -1,4 +1,6 @@
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     val a: String? = "A"
-    println(a?.<caret>length)
+    doSomething(a?.<caret>length)
 }

idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt.after

@@ -1,4 +1,6 @@
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     val a: String? = "A"
-    println(if (a != null) a.length else null)
+    doSomething(if (a != null) a.length else null)
 }

idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt

@@ -1,5 +1,7 @@
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     var a: String? = "A"
-    println(a?.<caret>length)
+    doSomething(a?.<caret>length)
 }
 

idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after

@@ -1,6 +1,8 @@
+fun doSomething<T>(a: T) {}
+
 fun main(args: Array<String>) {
     var a: String? = "A"
     val s = a
-    println(if (s != null) s.length else null)
+    doSomething(if (s != null) s.length else null)
 }
 

idea/testData/intentions/branched/safeAccessToIfThen/safeAccessAsFunctionArgument.kt

@@ -1,5 +1,4 @@
 fun f(s: Int?) {
-    println(s)
 }
 
 fun main(args: Array<String>) {

idea/testData/intentions/branched/safeAccessToIfThen/safeAccessAsFunctionArgument.kt.after

@@ -1,5 +1,4 @@
 fun f(s: Int?) {
-    println(s)
 }
 
 fun main(args: Array<String>) {

idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpression.kt

@@ -1,4 +1,4 @@
 fun main(args: Array<String>) {
     val foo: String? = "foo"
-    foo?.<caret>length()
+    foo?.<caret>length
 }

idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpression.kt.after

@@ -1,4 +1,4 @@
 fun main(args: Array<String>) {
     val foo: String? = "foo"
-    if (foo != null) foo.length()
+    if (foo != null) foo.length
 }

idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpressionInParens.kt

@@ -1,4 +1,4 @@
 fun main(args: Array<String>) {
     val foo: String? = "foo"
-    (foo)?.<caret>length()
+    (foo)?.<caret>length
 }

idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpressionInParens.kt.after

@@ -1,4 +1,4 @@
 fun main(args: Array<String>) {
     val foo: String? = "foo"
-    if (foo != null) foo.length()
+    if (foo != null) foo.length
 }

idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt

@@ -1,4 +1,6 @@
+fun doSomething<T>(a: T) {}
+
 val a: String? = "A"
 fun main(args: Array<String>) {
-    println(a?.<caret>length)
+    doSomething(a?.<caret>length)
 }

idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt.after

@@ -1,4 +1,6 @@
+fun doSomething<T>(a: T) {}
+
 val a: String? = "A"
 fun main(args: Array<String>) {
-    println(if (a != null) a.length else null)
+    doSomething(if (a != null) a.length else null)
 }

idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt

@@ -1,6 +1,8 @@
+fun doSomething<T>(a: T) {}
+
 val a: String?
     get() = ""
 
 fun main(args: Array<String>) {
-    println(a?.<caret>length)
+    doSomething(a?.<caret>length)
 }

idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after

@@ -1,7 +1,9 @@
+fun doSomething<T>(a: T) {}
+
 val a: String?
     get() = ""
 
 fun main(args: Array<String>) {
     val s = a
-    println(if (s != null) s.length else null)
+    doSomething(if (s != null) s.length else null)
 }

idea/testData/intentions/branched/safeAccessToIfThen/usedAsResultOfCheckedIf.kt

@@ -1,4 +1,4 @@
 fun main(args: Array<String>) {
     val foo: String? = "foo"
-    val y = if (true) foo?.<caret>length() else null
+    val y = if (true) foo?.<caret>length else null
 }

idea/testData/intentions/branched/safeAccessToIfThen/usedAsResultOfCheckedIf.kt.after

@@ -1,4 +1,4 @@
 fun main(args: Array<String>) {
     val foo: String? = "foo"
-    val y = if (true) if (foo != null) foo.length() else null else null
+    val y = if (true) if (foo != null) foo.length else null else null
 }