[Spec tests] Review fix tests for try-expression and if-expression

compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/neg/1.1.kt

@@ -1,5 +1,5 @@
 // !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// !DIAGNOSTICS:  -IMPLICIT_CAST_TO_ANY -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
 /*

compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/neg/1.2.kt

@@ -0,0 +1,32 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS:  -IMPLICIT_CAST_TO_ANY -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// SKIP_TXT
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-213
+ * PLACE: control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 1 -> sentence 1
+ * NUMBER: 2
+ * DESCRIPTION: check if-expressions must have both branches.
+ */
+
+// TESTCASE NUMBER: 1
+
+fun case1() {
+    val b = true
+    val c = true
+    val a = if (b) {
+        "first true"
+    } else <!INVALID_IF_AS_EXPRESSION!>if<!> (c) {
+        "else if true"
+    }
+}
+
+// TESTCASE NUMBER: 2
+
+fun case2() {
+    var b = true
+    val c = true
+    val a = if (b) 1 else <!INVALID_IF_AS_EXPRESSION!>if<!> (c) 2 else ;
+}

compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/neg/1.3.kt

@@ -0,0 +1,83 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -UNREACHABLE_CODE -IMPLICIT_CAST_TO_ANY -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// SKIP_TXT
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-213
+ * PLACE: control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 1 -> sentence 1
+ * NUMBER: 3
+ * DESCRIPTION: check if-expressions must have both branches. (attempt to pass Nothing to if-condition without 'else' key word)
+ */
+
+fun throwExc(b: Boolean): Boolean {
+    if (b) throw Exception()
+    else return false
+}
+
+// TESTCASE NUMBER: 1
+fun case1() {
+    val x1 = <!INVALID_IF_AS_EXPRESSION!>if<!> (throwExc(false)) true
+}
+
+
+// TESTCASE NUMBER: 3
+fun case3() {
+    val x1 = <!INVALID_IF_AS_EXPRESSION!>if<!> (throwExc(true)) true
+}
+
+/*
+ * TESTCASE NUMBER: 4
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-35510
+ */
+fun case4() {
+    val x1 = if (throw Exception()) true
+
+    val x2 = if (TODO()) true
+
+    val x0 = if (false) true else if (throw Exception()) ;
+
+}
+
+// TESTCASE NUMBER: 5
+fun case5() {
+    var flag: Boolean? = null
+    val x1 = <!INVALID_IF_AS_EXPRESSION!>if<!> (flag ?: throw Exception()) true
+}
+
+/*
+ * TESTCASE NUMBER: 6
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-35510
+ */
+fun case6() {
+    val k1 = if(throw Exception());
+}
+
+/*
+ * TESTCASE NUMBER: 7
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-35510
+ */
+fun case7(nothing: Nothing) {
+    val k1 = if(throw Exception())
+<!SYNTAX!><!>}
+
+/*
+ * TESTCASE NUMBER: 8
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-35510
+ */
+fun case8(nothing: Nothing) {
+    val x1 = if (nothing) true
+}
+
+/*
+ * TESTCASE NUMBER: 9
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-35510
+ */fun case9() {
+    val k1 = if(throw Exception())
+<!SYNTAX!><!>}

compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/neg/1.4.kt

@@ -0,0 +1,48 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -UNREACHABLE_CODE -IMPLICIT_CAST_TO_ANY -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// SKIP_TXT
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-213
+ * PLACE: control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 1 -> sentence 1
+ * NUMBER: 4
+ * DESCRIPTION: check if-expressions must have both branches. (attempt to pass Nothing to if-condition with 'else' key word)
+ */
+
+// TESTCASE NUMBER: 1
+
+fun case1() {
+    val y0else = <!INVALID_IF_AS_EXPRESSION!>if<!> (false) true else ;
+}
+
+/*
+ * TESTCASE NUMBER: 2
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-35510
+ */
+fun case2(nothing: Nothing) {
+    val n1else = if (nothing) true else;
+}
+
+/*
+ * TESTCASE NUMBER: 3
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-35510
+ */
+fun case3(nothing: Nothing) {
+    val n1else = if (nothing) true else
+<!SYNTAX!><!>}
+
+// TESTCASE NUMBER: 4
+
+fun case4(nothing: Nothing) {
+    val x = <!INVALID_IF_AS_EXPRESSION!>if<!> (false) else if (nothing) { "foo"} else
+<!SYNTAX!><!>}
+
+// TESTCASE NUMBER: 5
+
+fun case5(nothing: Nothing) {
+    val x = <!INVALID_IF_AS_EXPRESSION!>if<!> (false) else if (nothing) { "foo"} else ;
+}

compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/pos/1.2.kt

@@ -0,0 +1,34 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -IMPLICIT_CAST_TO_ANY -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -DEBUG_INFO_SMARTCAST
+// SKIP_TXT
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-213
+ * PLACE: control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 1 -> sentence 1
+ * NUMBER: 2
+ * DESCRIPTION: check if-expressions must have both branches.
+ * HELPERS: checkType
+ */
+
+
+// TESTCASE NUMBER: 1
+
+fun case1() {
+    val b = true
+    val c = true
+    val a = if (b) {
+        "first true"
+    } else if (c) {
+        "else if true"
+    } else {}
+}
+
+// TESTCASE NUMBER: 2
+
+fun case2() {
+    var b = true
+    val c = true
+    val a = if (b) 1 else if (c) 2 else Unit;
+}

compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/testsMap.json

@@ -10,6 +10,24 @@
         }
       ],
       "1": [
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 2,
+          "description": "check if-expressions must have both branches.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 8,
+          "description": "check if-expressions must have both branches. (attempt to pass Nothing to if-condition without \u0027else\u0027 key word)",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 5,
+          "description": "check if-expressions must have both branches. (attempt to pass Nothing to if-condition with \u0027else\u0027 key word)",
+          "unexpectedBehaviour": true
+        },
         {
           "specVersion": "0.1-213",
           "casesNumber": 2,
@@ -28,6 +46,12 @@
         }
       ],
       "1": [
+        {
+          "specVersion": "0.1-213",
+          "casesNumber": 2,
+          "description": "check if-expressions must have both branches.",
+          "unexpectedBehaviour": false
+        },
         {
           "specVersion": "0.1-213",
           "casesNumber": 3,