[FE 1.0] Fix some diagnostic spec tests

compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json

@@ -22,7 +22,7 @@
         },
         {
           "specVersion": "0.1-435",
-          "casesNumber": 3,
+          "casesNumber": 4,
           "description": "Non-exhaustive when using nullable boolean values.",
           "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/11.1.kt",
           "unexpectedBehaviour": false,
@@ -90,7 +90,7 @@
       "3": [
         {
           "specVersion": "0.1-100",
-          "casesNumber": 5,
+          "casesNumber": 6,
           "description": "Non-exhaustive when using boolean values.",
           "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/3.1.kt",
           "unexpectedBehaviour": false,

compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json

@@ -426,7 +426,7 @@
       "1": [
         {
           "specVersion": "0.1-313",
-          "casesNumber": 4,
+          "casesNumber": 5,
           "description": " it is possible to  replace the else condition with an always-true condition",
           "path": "compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-4/neg/1.1.kt",
           "unexpectedBehaviour": false,

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.10.fir.kt

@@ -0,0 +1,120 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// SKIP_TXT
+
+
+// FILE: TestCase1.kt
+// TESTCASE NUMBER: 1
+package testPackCase1
+
+fun case1(a: A, c: C) {
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += c<!>
+    a?.b .<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
+
+    val x = {
+        <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += c<!>
+        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
+    }()
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += { c }()<!>
+
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign({ c }())<!>
+}
+
+class A(val b: B)
+
+class B {
+    operator fun plusAssign(c: C) {
+        print("1")
+    }
+
+    operator fun plus(c: C): C {
+        print("2")
+        return c
+    }
+}
+
+class C
+
+// FILE: TestCase2.kt
+// TESTCASE NUMBER: 2
+package testPackCase2
+
+fun case2(a: A?, c: C) {
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b += c<!>
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+
+    val x = {
+        <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b += c<!>
+        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+    }()
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b += { c }()<!>
+
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
+
+}
+
+class A(val b: B)
+
+class B {
+    operator fun plusAssign(c: C) {
+        print("1")
+    }
+
+    operator fun plus(c: C): C {
+        print("2")
+        return c
+    }
+}
+
+operator fun B?.plusAssign(c: C) {
+    print("3")
+}
+
+class C
+// FILE: TestCase3.kt
+// TESTCASE NUMBER: 3
+package testPackCase3
+
+fun case3(a: A?, c: C) {
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b += c<!>
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+
+    val x = {
+        <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b += c<!>
+        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+    }()
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b += { c }()<!>
+
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
+
+}
+
+class A(val b: B)
+
+class B {
+    operator fun plusAssign(c: C) {
+        print("1")
+    }
+
+    operator fun plus(c: C): C {
+        print("2")
+        return c
+    }
+}
+
+operator fun B?.plusAssign(c: C) {
+    print("3")
+}
+
+operator fun B?.plusAssign(c: Any) {
+    print("4")
+}
+
+
+class C

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.10.kt

@@ -0,0 +1,49 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// SKIP_TXT
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-448
+ * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 1 -> sentence 2
+ * SECONDARY LINKS: statements, assignments, operator-assignments -> paragraph 2 -> sentence 1
+ * statements, assignments, operator-assignments -> paragraph 2 -> sentence 2
+ * statements, assignments, operator-assignments -> paragraph 2 -> sentence 3
+ * NUMBER: 10
+ * DESCRIPTION: Non-extension member callables
+ */
+
+// FILE: TestCase1.kt
+// TESTCASE NUMBER: 1
+package testPackCase1
+
+fun case1(a: A, c: C) {
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b <!UNSAFE_OPERATOR_CALL!>+=<!> c<!>
+    a?.b <!UNSAFE_CALL!>.<!><!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
+
+    val x = {
+        <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b <!UNSAFE_OPERATOR_CALL!>+=<!> c<!>
+        a?.b<!UNSAFE_CALL!>.<!><!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
+    }()
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b <!UNSAFE_OPERATOR_CALL!>+=<!> { c }()<!>
+
+    a?.b<!UNSAFE_CALL!>.<!><!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign({ c }())<!>
+}
+
+class A(val b: B)
+
+class B {
+    operator fun plusAssign(c: C) {
+        print("1")
+    }
+
+    operator fun plus(c: C): C {
+        print("2")
+        return c
+    }
+}
+
+class C

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.fir.kt

@@ -1,120 +1,36 @@
 // !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
 
-// FILE: TestCase1.kt
+// FILE: LibCase1b.kt
 // TESTCASE NUMBER: 1
+package LibPackCase1.b
+
+import testPackCase1.B
+import LibPackCase1.a.*
+
+inline operator fun B?.plusAssign( c: ()->C) { //(2)
+    val x = {1}
+    <!DEBUG_INFO_CALL("fqName: LibPackCase1.a.plusAssign; typeCall: inline operator extension function")!>this += x<!> //to (1)
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>this += x<!>
+}
+
+class C
+
+// FILE: TestCase1.kt
 package testPackCase1
 
-fun case1(a: A, c: C) {
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += c<!>
-    a?.b .<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
-
-    val x = {
-        <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += c<!>
-        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
-    }()
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += { c }()<!>
-
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign({ c }())<!>
-}
-
-class A(val b: B)
+import LibPackCase1.a.*
+import LibPackCase1.b.*
 
 class B {
-    operator fun plusAssign(c: C) {
-        print("1")
-    }
-
-    operator fun plus(c: C): C {
-        print("2")
-        return c
-    }
+    private inline operator fun plusAssign(crossinline c: ()->C) {}
+    private inline operator fun plus(crossinline c: ()->C): C =C()
 }
 
-class C
+// FILE: LibCase1a.kt
+package LibPackCase1.a
+import testPackCase1.B
 
-// FILE: TestCase2.kt
-// TESTCASE NUMBER: 2
-package testPackCase2
-
-fun case2(a: A?, c: C) {
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b += c<!>
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
-
-    val x = {
-        <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b += c<!>
-        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
-    }()
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b += { c }()<!>
-
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
-
-}
-
-class A(val b: B)
-
-class B {
-    operator fun plusAssign(c: C) {
-        print("1")
-    }
-
-    operator fun plus(c: C): C {
-        print("2")
-        return c
-    }
-}
-
-operator fun B?.plusAssign(c: C) {
-    print("3")
-}
-
-class C
-// FILE: TestCase3.kt
-// TESTCASE NUMBER: 3
-package testPackCase3
-
-fun case3(a: A?, c: C) {
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b += c<!>
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
-
-    val x = {
-        <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b += c<!>
-        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
-    }()
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b += { c }()<!>
-
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
-
-}
-
-class A(val b: B)
-
-class B {
-    operator fun plusAssign(c: C) {
-        print("1")
-    }
-
-    operator fun plus(c: C): C {
-        print("2")
-        return c
-    }
-}
-
-operator fun B?.plusAssign(c: C) {
-    print("3")
-}
-
-operator fun B?.plusAssign(c: Any) {
-    print("4")
-}
-
-
-class C
+inline operator fun B?.plusAssign( c: ()->Int) { } //(1)

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.kt

@@ -1,5 +1,5 @@
 // !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
 /*
@@ -7,125 +7,40 @@
  *
  * SPEC VERSION: 0.1-448
  * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 1 -> sentence 2
- * SECONDARY LINKS: statements, assignments, operator-assignments -> paragraph 2 -> sentence 1
- * statements, assignments, operator-assignments -> paragraph 2 -> sentence 2
- * statements, assignments, operator-assignments -> paragraph 2 -> sentence 3
+ * PRIMARY LINKS: overload-resolution, choosing-the-most-specific-candidate-from-the-overload-candidate-set, algorithm-of-msc-selection -> paragraph 3 -> sentence 1
  * NUMBER: 1
- * DESCRIPTION: Non-extension member callables
+ * DESCRIPTION: plusAssign as inline function
  */
 
-// FILE: TestCase1.kt
+// FILE: LibCase1b.kt
 // TESTCASE NUMBER: 1
+package LibPackCase1.b
+
+import testPackCase1.B
+import LibPackCase1.a.*
+
+inline operator fun B?.plusAssign( c: ()->C) { //(2)
+    val x = {1}
+    <!DEBUG_INFO_CALL("fqName: LibPackCase1.a.plusAssign; typeCall: inline operator extension function")!>this += x<!> //to (1)
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>this += x<!>
+}
+
+class C
+
+// FILE: TestCase1.kt
 package testPackCase1
 
-fun case1(a: A, c: C) {
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += c<!>
-    a?.b .<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
-
-    val x = {
-        <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += c<!>
-        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign(c)<!>
-    }()
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>a?.b += { c }()<!>
-
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase1.B.plusAssign; typeCall: operator function")!>plusAssign({ c }())<!>
-}
-
-class A(val b: B)
+import LibPackCase1.a.*
+import LibPackCase1.b.*
 
 class B {
-    operator fun plusAssign(c: C) {
-        print("1")
-    }
-
-    operator fun plus(c: C): C {
-        print("2")
-        return c
-    }
+    private inline operator fun plusAssign(crossinline c: ()->C) {}
+    private inline operator fun plus(crossinline c: ()->C): C =C()
 }
 
-class C
+// FILE: LibCase1a.kt
+package LibPackCase1.a
+import testPackCase1.B
 
-// FILE: TestCase2.kt
-// TESTCASE NUMBER: 2
-package testPackCase2
+inline operator fun B?.plusAssign( c: ()->Int) { } //(1)
 
-fun case2(a: A?, c: C) {
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
-
-    val x = {
-        <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
-        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
-    }()
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> { c }()<!>
-
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
-
-}
-
-class A(val b: B)
-
-class B {
-    operator fun plusAssign(c: C) {
-        print("1")
-    }
-
-    operator fun plus(c: C): C {
-        print("2")
-        return c
-    }
-}
-
-operator fun B?.plusAssign(c: C) {
-    print("3")
-}
-
-class C
-// FILE: TestCase3.kt
-// TESTCASE NUMBER: 3
-package testPackCase3
-
-fun case3(a: A?, c: C) {
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
-
-    val x = {
-        <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
-        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
-    }()
-
-    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> { c }()<!>
-
-    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
-
-}
-
-class A(val b: B)
-
-class B {
-    operator fun plusAssign(c: C) {
-        print("1")
-    }
-
-    operator fun plus(c: C): C {
-        print("2")
-        return c
-    }
-}
-
-operator fun B?.plusAssign(c: C) {
-    print("3")
-}
-
-operator fun B?.plusAssign(c: Any) {
-    print("4")
-}
-
-
-class C

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.2.fir.kt

@@ -1,36 +1,99 @@
 // !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-448
+ * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 1 -> sentence 2
+ * SECONDARY LINKS: statements, assignments, operator-assignments -> paragraph 2 -> sentence 1
+ * statements, assignments, operator-assignments -> paragraph 2 -> sentence 2
+ * statements, assignments, operator-assignments -> paragraph 2 -> sentence 3
+ * NUMBER: 2
+ * DESCRIPTION: Non-extension member callables
+ */
 
-// FILE: LibCase1b.kt
+
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
-package LibPackCase1.b
+package testPackCase2
 
-import testPackCase1.B
-import LibPackCase1.a.*
+fun case2(a: A?, c: C) {
 
-inline operator fun B?.plusAssign( c: ()->C) { //(2)
-    val x = {1}
-    <!DEBUG_INFO_CALL("fqName: LibPackCase1.a.plusAssign; typeCall: inline operator extension function")!>this += x<!> //to (1)
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>this += x<!>
+    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+
+    val x = {
+        <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
+        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+    }()
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> { c }()<!>
+
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
+
+}
+
+class A(val b: B)
+
+class B {
+    operator fun plusAssign(c: C) {
+        print("1")
+    }
+
+    operator fun plus(c: C): C {
+        print("2")
+        return c
+    }
+}
+
+operator fun B?.plusAssign(c: C) {
+    print("3")
 }
 
 class C
 
-// FILE: TestCase1.kt
-package testPackCase1
+// FILE: TestCase2.kt
+// TESTCASE NUMBER: 2
+package testPackCase3
 
-import LibPackCase1.a.*
-import LibPackCase1.b.*
+fun case3(a: A?, c: C) {
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+
+    val x = {
+        <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
+        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+    }()
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> { c }()<!>
+
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
 
-class B {
-    private inline operator fun plusAssign(crossinline c: ()->C) {}
-    private inline operator fun plus(crossinline c: ()->C): C =C()
 }
 
-// FILE: LibCase1a.kt
-package LibPackCase1.a
-import testPackCase1.B
+class A(val b: B)
 
-inline operator fun B?.plusAssign( c: ()->Int) { } //(1)
+class B {
+    operator fun plusAssign(c: C) {
+        print("1")
+    }
+
+    operator fun plus(c: C): C {
+        print("2")
+        return c
+    }
+}
+
+operator fun B?.plusAssign(c: C) {
+    print("3")
+}
+
+operator fun B?.plusAssign(c: Any) {
+    print("4")
+}
+
+
+class C

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.2.kt

@@ -1,6 +1,5 @@
-
 // !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
 /*
@@ -8,40 +7,93 @@
  *
  * SPEC VERSION: 0.1-448
  * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 1 -> sentence 2
- * PRIMARY LINKS: overload-resolution, choosing-the-most-specific-candidate-from-the-overload-candidate-set, algorithm-of-msc-selection -> paragraph 3 -> sentence 1
+ * SECONDARY LINKS: statements, assignments, operator-assignments -> paragraph 2 -> sentence 1
+ * statements, assignments, operator-assignments -> paragraph 2 -> sentence 2
+ * statements, assignments, operator-assignments -> paragraph 2 -> sentence 3
  * NUMBER: 2
- * DESCRIPTION: plusAssign as inline function
+ * DESCRIPTION: Non-extension member callables
  */
 
-// FILE: LibCase1b.kt
+
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
-package LibPackCase1.b
+package testPackCase2
 
-import testPackCase1.B
-import LibPackCase1.a.*
+fun case2(a: A?, c: C) {
 
-inline operator fun B?.plusAssign( c: ()->C) { //(2)
-    val x = {1}
-    <!DEBUG_INFO_CALL("fqName: LibPackCase1.a.plusAssign; typeCall: inline operator extension function")!>this += x<!> //to (1)
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>this += x<!>
+    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+
+    val x = {
+        <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
+        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+    }()
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> { c }()<!>
+
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase2.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
+
+}
+
+class A(val b: B)
+
+class B {
+    operator fun plusAssign(c: C) {
+        print("1")
+    }
+
+    operator fun plus(c: C): C {
+        print("2")
+        return c
+    }
+}
+
+operator fun B?.plusAssign(c: C) {
+    print("3")
 }
 
 class C
 
-// FILE: TestCase1.kt
-package testPackCase1
+// FILE: TestCase2.kt
+// TESTCASE NUMBER: 2
+package testPackCase3
 
-import LibPackCase1.a.*
-import LibPackCase1.b.*
+fun case3(a: A?, c: C) {
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+
+    val x = {
+        <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> c<!>
+        a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign(c)<!>
+    }()
+
+    <!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>a?.b <!NULLABLE_EXTENSION_OPERATOR_WITH_SAFE_CALL_RECEIVER!>+=<!> { c }()<!>
+
+    a?.b.<!DEBUG_INFO_CALL("fqName: testPackCase3.plusAssign; typeCall: operator extension function")!>plusAssign({ c }())<!>
 
-class B {
-    private inline operator fun plusAssign(crossinline c: ()->C) {}
-    private inline operator fun plus(crossinline c: ()->C): C =C()
 }
 
-// FILE: LibCase1a.kt
-package LibPackCase1.a
-import testPackCase1.B
+class A(val b: B)
 
-inline operator fun B?.plusAssign( c: ()->Int) { } //(1)
+class B {
+    operator fun plusAssign(c: C) {
+        print("1")
+    }
 
+    operator fun plus(c: C): C {
+        print("2")
+        return c
+    }
+}
+
+operator fun B?.plusAssign(c: C) {
+    print("3")
+}
+
+operator fun B?.plusAssign(c: Any) {
+    print("4")
+}
+
+
+class C

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/testsMap.json

@@ -150,6 +150,14 @@
   "1": {
     "neg": {
       "2": [
+        {
+          "specVersion": "0.1-448",
+          "casesNumber": 1,
+          "description": "Non-extension member callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.10.kt",
+          "unexpectedBehaviour": false,
+          "linkType": "main"
+        },
         {
           "specVersion": "0.1-448",
           "casesNumber": 2,
@@ -220,16 +228,16 @@
       "2": [
         {
           "specVersion": "0.1-448",
-          "casesNumber": 3,
-          "description": "Non-extension member callables",
+          "casesNumber": 1,
+          "description": "plusAssign as inline function",
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.kt",
           "unexpectedBehaviour": false,
           "linkType": "main"
         },
         {
           "specVersion": "0.1-448",
-          "casesNumber": 1,
-          "description": "plusAssign as inline function",
+          "casesNumber": 2,
+          "description": "Non-extension member callables",
           "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.2.kt",
           "unexpectedBehaviour": false,
           "linkType": "main"

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/testsMap.json

@@ -648,7 +648,7 @@
           "specVersion": "0.1-448",
           "casesNumber": 1,
           "description": "plusAssign as inline function",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.2.kt",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.kt",
           "unexpectedBehaviour": false,
           "linkType": "primary"
         },

compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/testsMap.json

@@ -9,6 +9,14 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/p-2/neg/1.1.kt",
           "unexpectedBehaviour": false,
           "linkType": "main"
+        },
+        {
+          "specVersion": "0.1-448",
+          "casesNumber": 1,
+          "description": "Non-extension member callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.10.kt",
+          "unexpectedBehaviour": false,
+          "linkType": "secondary"
         }
       ],
       "2": [
@@ -19,6 +27,14 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/p-2/neg/1.1.kt",
           "unexpectedBehaviour": false,
           "linkType": "primary"
+        },
+        {
+          "specVersion": "0.1-448",
+          "casesNumber": 1,
+          "description": "Non-extension member callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.10.kt",
+          "unexpectedBehaviour": false,
+          "linkType": "secondary"
         }
       ],
       "3": [
@@ -29,6 +45,14 @@
           "path": "compiler/tests-spec/testData/diagnostics/linked/statements/assignments/operator-assignments/p-2/neg/1.1.kt",
           "unexpectedBehaviour": false,
           "linkType": "primary"
+        },
+        {
+          "specVersion": "0.1-448",
+          "casesNumber": 1,
+          "description": "Non-extension member callables",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.10.kt",
+          "unexpectedBehaviour": false,
+          "linkType": "secondary"
         }
       ]
     },
@@ -44,9 +68,9 @@
         },
         {
           "specVersion": "0.1-448",
-          "casesNumber": 3,
+          "casesNumber": 2,
           "description": "Non-extension member callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.kt",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.2.kt",
           "unexpectedBehaviour": false,
           "linkType": "secondary"
         }
@@ -62,9 +86,9 @@
         },
         {
           "specVersion": "0.1-448",
-          "casesNumber": 3,
+          "casesNumber": 2,
           "description": "Non-extension member callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.kt",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.2.kt",
           "unexpectedBehaviour": false,
           "linkType": "secondary"
         }
@@ -80,9 +104,9 @@
         },
         {
           "specVersion": "0.1-448",
-          "casesNumber": 3,
+          "casesNumber": 2,
           "description": "Non-extension member callables",
-          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.kt",
+          "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.2.kt",
           "unexpectedBehaviour": false,
           "linkType": "secondary"
         }

compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.kt

@@ -15,22 +15,22 @@
 annotation class Ann(val x: Int)
 
 // TESTCASE NUMBER: 1
-abstract class Foo : @<!DEBUG_INFO_MISSING_UNRESOLVED!>Ann<!>(10) Any()
+abstract class Foo : <!WRONG_ANNOTATION_TARGET!>@Ann(10)<!> Any()
 
 // TESTCASE NUMBER: 2
-abstract class Bar<T : @Ann(10) Any>
+abstract class Bar<T : <!WRONG_ANNOTATION_TARGET!>@Ann(10)<!> Any>
 
 // TESTCASE NUMBER: 3
 fun case_3(a: Any) {
-    if (a is @Ann(10) String) return
+    if (a is <!WRONG_ANNOTATION_TARGET!>@Ann(10)<!> String) return
 }
 
 // TESTCASE NUMBER: 4
 open class TypeToken<T>
 
-val case_4 = object : TypeToken<@<!DEBUG_INFO_MISSING_UNRESOLVED!>Ann<!>(10) String>() {}
+val case_4 = object : TypeToken<<!WRONG_ANNOTATION_TARGET!>@Ann(10)<!> String>() {}
 
 // TESTCASE NUMBER: 5
 fun case_5(a: Any) {
-    a as @<!DEBUG_INFO_MISSING_UNRESOLVED!>Ann<!>(10) Int
+    a as <!WRONG_ANNOTATION_TARGET!>@Ann(10)<!> Int
 }

compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.kt

@@ -18,7 +18,7 @@ annotation class Ann(val x: Int)
  * UNEXPECTED BEHAVIOUR
  */
 fun case_1(a: Any) {
-    if (a is @Ann(<!DEBUG_INFO_MISSING_UNRESOLVED!>unresolved_reference<!>) String) return
+    if (a is @Ann(<!UNRESOLVED_REFERENCE!>unresolved_reference<!>) String) return
 }
 
 /*
@@ -26,7 +26,7 @@ fun case_1(a: Any) {
  * UNEXPECTED BEHAVIOUR
  */
 fun case_2(a: Any) {
-    a as @<!DEBUG_INFO_MISSING_UNRESOLVED!>Ann<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>unresolved_reference<!>) String // OK, no error in IDE and in the compiler
+    a as @Ann(<!UNRESOLVED_REFERENCE!>unresolved_reference<!>) String // OK, no error in IDE and in the compiler
 }
 
 /*
@@ -36,7 +36,7 @@ fun case_2(a: Any) {
 fun case_3_1(a: Any) {}
 
 fun case_3_2(a: Any) {
-    case_3_1(a as @Ann(<!DEBUG_INFO_MISSING_UNRESOLVED!>unresolved_reference<!>) String) // OK, no error in IDE and in the compiler
+    case_3_1(a as @Ann(<!UNRESOLVED_REFERENCE!>unresolved_reference<!>) String) // OK, no error in IDE and in the compiler
 }
 
 // TESTCASE NUMBER: 4

compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java

@@ -4361,6 +4361,11 @@ public class DiagnosticsTestSpecGenerated extends AbstractDiagnosticsTestSpec {
                                 runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.1.kt");
                             }
 
+                            @TestMetadata("2.10.kt")
+                            public void test2_10() throws Exception {
+                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.10.kt");
+                            }
+
                             @TestMetadata("2.2.kt")
                             public void test2_2() throws Exception {
                                 runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.2.kt");

idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostic/compiler/based/FirIdeSpecTest.java

@@ -3997,6 +3997,12 @@ public class FirIdeSpecTest extends AbstractDiagnosisCompilerTestDataSpecTest {
                                 runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.1.kt");
                             }
 
+                            @Test
+                            @TestMetadata("2.10.kt")
+                            public void test2_10() throws Exception {
+                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.10.kt");
+                            }
+
                             @Test
                             @TestMetadata("2.2.kt")
                             public void test2_2() throws Exception {
@@ -4055,12 +4061,6 @@ public class FirIdeSpecTest extends AbstractDiagnosisCompilerTestDataSpecTest {
                                 runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.1.kt");
                             }
 
-                            @Test
-                            @TestMetadata("2.2.kt")
-                            public void test2_2() throws Exception {
-                                runTest("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.2.kt");
-                            }
-
                             @Test
                             public void testAllFilesPresentInPos() throws Exception {
                                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);