Fix more test for var smartcasts

Author: mglukhikh

compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNotNullAnd.kt

@@ -0,0 +1,13 @@
+// See KT-5737
+fun get(): String? {
+    return "abc"
+}
+
+fun foo(): Int {
+    var ss:String? = get()
+
+    return if (ss != null && <!DEBUG_INFO_SMARTCAST!>ss<!>.length() > 0)
+        1
+    else
+        0
+}

compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNotNullAnd.txt

@@ -0,0 +1,4 @@
+package
+
+internal fun foo(): kotlin.Int
+internal fun get(): kotlin.String?

compiler/testData/diagnostics/tests/smartCasts/varnotnull/inference.kt

@@ -0,0 +1,21 @@
+// See KT-969
+fun f() {
+  var s: String?
+  s = "a"
+  var s1 = "" // String – ?
+  if (<!SENSELESS_COMPARISON!>s != null<!>) {    // Redundant
+    s1.length()
+    // We can do smartcast here and below
+    s1 = <!DEBUG_INFO_SMARTCAST!>s<!>.toString() // return String?
+    s1.length()
+    s1 = <!DEBUG_INFO_SMARTCAST!>s<!>
+    s1.length()
+    // It's just an assignment without smartcast
+    val s2 = s
+    // But smartcast can be done here
+    <!DEBUG_INFO_SMARTCAST!>s2<!>.length()
+    // And also here
+    val s3 = <!DEBUG_INFO_SMARTCAST!>s<!>.toString()
+    s3.length()
+  }
+}

compiler/testData/diagnostics/tests/smartCasts/varnotnull/inference.txt

@@ -0,0 +1,3 @@
+package
+
+internal fun f(): kotlin.Unit

compiler/testData/diagnostics/tests/smartCasts/varnotnull/infix.kt

@@ -0,0 +1,11 @@
+// See KT-774
+fun box() : Int {
+    var a : Int? = 1
+    var d = 1
+
+    if (a == null) {
+        return 2
+    } else {
+        return <!DEBUG_INFO_SMARTCAST!>a<!> + d
+    }
+} 

compiler/testData/diagnostics/tests/smartCasts/varnotnull/infix.txt

@@ -0,0 +1,3 @@
+package
+
+internal fun box(): kotlin.Int

compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.kt

@@ -0,0 +1,13 @@
+data class SomeObject(val n: SomeObject?) {
+    fun doSomething() {}
+    fun next(): SomeObject? = n    
+}
+
+
+fun list(start: SomeObject) {
+    var e: SomeObject? = start
+    while (e != null) {
+        <!DEBUG_INFO_SMARTCAST!>e<!>.doSomething()
+        e = <!DEBUG_INFO_SMARTCAST!>e<!>.next()
+    }
+}

compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.txt

@@ -0,0 +1,15 @@
+package
+
+internal fun list(/*0*/ start: SomeObject): kotlin.Unit
+
+kotlin.data() internal final class SomeObject {
+    public constructor SomeObject(/*0*/ n: SomeObject?)
+    internal final val n: SomeObject?
+    internal final /*synthesized*/ fun component1(): SomeObject?
+    public final /*synthesized*/ fun copy(/*0*/ n: SomeObject? = ...): SomeObject
+    internal final fun doSomething(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    internal final fun next(): SomeObject?
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCheck.kt

@@ -0,0 +1,9 @@
+fun get(): String? {
+    return ""
+}
+
+fun foo(): Int {
+    var c: String? = get()
+    c!!.length()
+    return <!DEBUG_INFO_SMARTCAST!>c<!>.length() // Previous line should make !! unnecessary here.
+}

compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCheck.txt

@@ -0,0 +1,4 @@
+package
+
+internal fun foo(): kotlin.Int
+internal fun get(): kotlin.String?

compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java

@@ -11465,6 +11465,12 @@ public void testIfVarNotNull() throws Exception {
                     doTest(fileName);
                 }
 
+                @TestMetadata("ifVarNotNullAnd.kt")
+                public void testIfVarNotNullAnd() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNotNullAnd.kt");
+                    doTest(fileName);
+                }
+
                 @TestMetadata("ifVarNullElse.kt")
                 public void testIfVarNullElse() throws Exception {
                     String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNullElse.kt");
@@ -11477,12 +11483,30 @@ public void testIfVarNullReturn() throws Exception {
                     doTest(fileName);
                 }
 
+                @TestMetadata("inference.kt")
+                public void testInference() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/inference.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("infix.kt")
+                public void testInfix() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/infix.kt");
+                    doTest(fileName);
+                }
+
                 @TestMetadata("initialization.kt")
                 public void testInitialization() throws Exception {
                     String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt");
                     doTest(fileName);
                 }
 
+                @TestMetadata("iterations.kt")
+                public void testIterations() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.kt");
+                    doTest(fileName);
+                }
+
                 @TestMetadata("kt2865.kt")
                 public void testKt2865() throws Exception {
                     String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/kt2865.kt");
@@ -11590,6 +11614,12 @@ public void testVarChangedInLoop() throws Exception {
                     String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varChangedInLoop.kt");
                     doTest(fileName);
                 }
+
+                @TestMetadata("varCheck.kt")
+                public void testVarCheck() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCheck.kt");
+                    doTest(fileName);
+                }
             }
         }