avoid indeterminate tests, where two same-named quick fixes "Add !!" were applied to a and a[0] at random

GitOrigin-RevId: 5eb1b634799c201c4abeab912fe0bad1865f0b9d

plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties

@@ -12,7 +12,7 @@ group.names.redundant.constructs=Redundant constructs
 group.names.style.issues=Style issues
 group.names.code.migration=Code migration
 fix.insert.delegation.call=Insert ''{0}()'' call
-fix.introduce.non.null.assertion=Add non-null asserted (!!) call
+fix.introduce.non.null.assertion=Add non-null asserted ({0}!!) call
 fix.remove.non.null.assertion=Remove unnecessary non-null assertion (!!)
 fix.add.annotation.target=Add annotation target
 progress.looking.up.add.annotation.usage=Looking up annotation usage\u2026

plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddExclExclCallFix.kt

@@ -13,7 +13,10 @@ import org.jetbrains.kotlin.psi.*
 class AddExclExclCallFix(psiElement: PsiElement, private val fixImplicitReceiver: Boolean = false) : ExclExclCallFix(psiElement),
                                                                                                      LowPriorityAction {
 
-    override fun getText() = KotlinBundle.message("fix.introduce.non.null.assertion")
+    override fun getText(): String {
+        val name = element?.text ?: ""
+        return KotlinBundle.message("fix.introduce.non.null.assertion", name)
+    }
 
     override fun invoke(project: Project, editor: Editor?, file: KtFile) {
         val modifiedExpression = element ?: return

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 
 fun foo(a: Array<String>?): String {
     return <caret>a[0]

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 
 fun foo(a: Array<String>?): String {
     return a!![0]

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array2.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a[0]!!) call" "true"
 
 fun foo(a: Array<String?>): String {
     return <caret>a[0]

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array2.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a[0]!!) call" "true"
 
 fun foo(a: Array<String?>): String {
     return a[0]!!

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array3.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a[0]!!) call" "true"
 
 fun foo(a: Array<String?>) {
     a[0]<caret>.length

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array3.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a[0]!!) call" "true"
 
 fun foo(a: Array<String?>) {
     a[0]!!.length

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array4.kt

@@ -1,7 +1,5 @@
-// "Add non-null asserted (!!) call" "true"
-// SHOULD_BE_AVAILABLE_AFTER_EXECUTION
-// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Array<String?>?
-
+// "Add non-null asserted (a!!) call" "true"
+// ERROR: Type mismatch: inferred type is String? but String was expected
 fun foo(a: Array<String?>?): String {
     return <caret>a[0]
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array4.kt.after

@@ -1,9 +1,7 @@
-// "Add non-null asserted (!!) call" "true"
-// SHOULD_BE_AVAILABLE_AFTER_EXECUTION
-// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Array<String?>?
-
+// "Add non-null asserted (a!!) call" "true"
+// ERROR: Type mismatch: inferred type is String? but String was expected
 fun foo(a: Array<String?>?): String {
-    return a[0]!!
+    return a!![0]
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
 // FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignment.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 // WITH_STDLIB
 var i = 0
 

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignment.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 // WITH_STDLIB
 var i = 0
 

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignmentToUnsafeCallExpression.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 class A(var s: String)
 
 fun foo(a: A?) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignmentToUnsafeCallExpression.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 class A(var s: String)
 
 fun foo(a: A?) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (foo!!) call" "true"
 class Foo {
     fun f() = 1
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (foo!!) call" "true"
 class Foo {
     fun f() = 1
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (foo?.bar!!) call" "true"
 class Foo {
     val bar = Bar()
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (foo?.bar!!) call" "true"
 class Foo {
     val bar = Bar()
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (::f!!) call" "true"
 class Foo {
     fun f() = 1
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (::f!!) call" "true"
 class Foo {
     fun f() = 1
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (length!!) call" "true"
 
 fun String?.foo() {
     <caret>length

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (length!!) call" "true"
 
 fun String?.foo() {
     this!!.length

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit2.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (length!!) call" "true"
 // WITH_STDLIB
 fun test(s: String?) {
     s.run {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit2.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (length!!) call" "true"
 // WITH_STDLIB
 fun test(s: String?) {
     s.run {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit3.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (project!!) call" "true"
 class Foo {
     val project: Project? = null
 

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit3.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (project!!) call" "true"
 class Foo {
     val project: Project? = null
 

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicitFunctionCall.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (toLowerCase()!!) call" "true"
 // WITH_STDLIB
 fun String?.foo() {
     <caret>toLowerCase()

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicitFunctionCall.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (toLowerCase()!!) call" "true"
 // WITH_STDLIB
 fun String?.foo() {
     this!!.toLowerCase()

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/infixCall.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (p!!) call" "true"
 
 class SafeType {
     infix fun op(arg: Int) {}

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/infixCall.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (p!!) call" "true"
 
 class SafeType {
     infix fun op(arg: Int) {}

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterable.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (test!!) call" "true"
 fun foo() {
     val test : Collection<Int>? = null!!
     for (i in <caret>test) { }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterable.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (test!!) call" "true"
 fun foo() {
     val test : Collection<Int>? = null!!
     for (i in <caret>test!!) { }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableDoesNotInheritIterableInterface.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (test!!) call" "true"
 class Some {
     operator fun iterator(): Iterator<Int> = null!!
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableDoesNotInheritIterableInterface.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (test!!) call" "true"
 class Some {
     operator fun iterator(): Iterator<Int> = null!!
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableGeneric.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (c!!) call" "true"
 fun <T: Collection<Int>?> foo(c: T) {
     for (i in <caret>c) { }
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableGeneric.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (c!!) call" "true"
 fun <T: Collection<Int>?> foo(c: T) {
     for (i in c!!) { }
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableInExtension.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (list!!) call" "true"
 // WITH_STDLIB
 
 class C {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableInExtension.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (list!!) call" "true"
 // WITH_STDLIB
 
 class C {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (test!!) call" "true"
 
 class Some {
     fun iterator(): Iterator<Int> = null!!

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (test!!) call" "true"
 
 class Some {
     fun iterator(): Iterator<Int> = null!!

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "false"
+// "Add non-null asserted (test!!) call" "false"
 // ACTION: Surround with null check
 // ERROR: Not nullable value required to call an 'iterator()' method on for-loop range
 

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaNullabilityMismatchWithImplicitReceiver.test

@@ -1,5 +1,5 @@
 // FILE: test.before.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (this!!) call" "true"
 // WITH_STDLIB
 package p;
 
@@ -39,7 +39,7 @@ public class Foo {
 }
 
 // FILE: test.after.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (this!!) call" "true"
 // WITH_STDLIB
 package p;
 

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullability1.test

@@ -1,5 +1,5 @@
 // FILE: test.before.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (x.foo()!!) call" "true"
 package p;
 
 fun test(x: Foo) {
@@ -29,7 +29,7 @@ public class Foo {
 }
 
 // FILE: test.after.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (x.foo()!!) call" "true"
 package p;
 
 fun test(x: Foo) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullability2.test

@@ -1,5 +1,5 @@
 // FILE: test.before.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (y!!) call" "true"
 package p;
 
 fun test(x: Foo) {
@@ -37,7 +37,7 @@ public class Foo {
 }
 
 // FILE: test.after.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (y!!) call" "true"
 package p;
 
 fun test(x: Foo) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityInvoke.test

@@ -1,5 +1,5 @@
 // FILE: test.before.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (y!!) call" "true"
 package p;
 
 fun test(x: Foo) {
@@ -37,7 +37,7 @@ public class Foo {
 }
 
 // FILE: test.after.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (y!!) call" "true"
 package p;
 
 fun test(x: Foo) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityProperty.test

@@ -1,5 +1,5 @@
 // FILE: test.before.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (x.value!!) call" "true"
 package p;
 
 fun test(x: Foo) {
@@ -41,7 +41,7 @@ public class Foo {
 }
 
 // FILE: test.after.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (x.value!!) call" "true"
 package p;
 
 fun test(x: Foo) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityWithThisReceiver.test

@@ -1,5 +1,5 @@
 // FILE: test.before.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (bar()!!) call" "true"
 // WITH_STDLIB
 package p;
 
@@ -39,7 +39,7 @@ public class Foo {
 }
 
 // FILE: test.after.kt
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (bar()!!) call" "true"
 // WITH_STDLIB
 package p;
 

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 
 fun foo(a: String?) {
     a<caret>.length

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 
 fun foo(a: String?) {
     a!!.length

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal2.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 // WITH_STDLIB
 
 fun foo(a: String?) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal2.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 // WITH_STDLIB
 
 fun foo(a: String?) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/null.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "false"
+// "Add non-null asserted (null!!) call" "false"
 // ACTION: Convert to lazy property
 // ACTION: Add 'toString()' call
 // ACTION: Change type of 'x' to 'String?'

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializer.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "false"
+// "Add non-null asserted (arg!!) call" "false"
 // ACTION: Add 'toString()' call
 // ACTION: Change type of 'x' to 'String?'
 // ERROR: Type mismatch: inferred type is String? but String was expected

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializerWithUnstableSmartcast.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 
 open class MyClass {
     open val s: String? = null

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializerWithUnstableSmartcast.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 
 open class MyClass {
     open val s: String? = null

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.fir.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "false"
+// "Add non-null asserted (arg!!) call" "false"
 
 fun foo(arg: String?) {
     if (arg == null) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (arg!!) call" "true"
 // DISABLE-ERRORS
 
 fun foo(arg: String?) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (arg!!) call" "true"
 // DISABLE-ERRORS
 
 fun foo(arg: String?) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiverWithUnstableSmartcast.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 
 interface Foo {
     fun bar()

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiverWithUnstableSmartcast.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 
 interface Foo {
     fun bar()

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationBinary.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (p!!) call" "true"
 
 class SafeType {
     operator fun plus(arg: Int) {}

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationBinary.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (p!!) call" "true"
 
 class SafeType {
     operator fun plus(arg: Int) {}

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDecrement.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i--<caret>

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDecrement.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i = i!! - 1

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i /=<caret> 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i = i!! / 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIn.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 // WITH_STDLIB
 
 fun foo(a: List<String>?) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIn.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a!!) call" "true"
 // WITH_STDLIB
 
 fun foo(a: List<String>?) {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIncrement.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i++<caret>

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIncrement.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i = i!! + 1

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i -=<caret> 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i = i!! - 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i +=<caret> 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i = i!! + 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (map[3]!!) call" "true"
 // WITH_STDLIB
 fun test(map: MutableMap<Int, Int>) {
     map[3] +=<caret> 5

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (map[3]!!) call" "true"
 // WITH_STDLIB
 fun test(map: MutableMap<Int, Int>) {
     map[3] = map[3]!! + 5

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i %=<caret> 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i = i!! % 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i *=<caret> 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (i!!) call" "true"
 fun test() {
     var i: Int? = 0
     i = i!! * 2

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationUnary.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (p!!) call" "true"
 
 class SafeType {
     operator fun unaryMinus() {}

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationUnary.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (p!!) call" "true"
 
 class SafeType {
     operator fun unaryMinus() {}

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/argumentAfterNullCheck.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "false"
+// "Add non-null asserted (i!!) call" "false"
 // ACTION: Add 'i =' to argument
 // ACTION: Change parameter 'i' type of function 'other' to 'Int?'
 // ACTION: Create function 'other'

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/assignmentRValue.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 fun test(s: String?) {
     var z: String = ""
     z = <caret>s

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/assignmentRValue.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 fun test(s: String?) {
     var z: String = ""
     z = s!!

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/initializer.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 fun test(s: String?) {
     val z: String = <caret>s
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/initializer.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 fun test(s: String?) {
     val z: String = s!!
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtension.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 
 class C {
     val s: String? = null

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtension.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 
 class C {
     val s: String? = null

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsAssignmentRValue.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 class C {
     val s: String? = null
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsAssignmentRValue.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 class C {
     val s: String? = null
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsInitializer.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 class C {
     val s: String? = null
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsInitializer.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 class C {
     val s: String? = null
 }

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/nullArgument.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "false"
+// "Add non-null asserted (null!!) call" "false"
 // ACTION: Add 'i =' to argument
 // ACTION: Change parameter 'i' type of function 'other' to 'Int?'
 // ACTION: Do not show hints for current method

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/qualifiedArgument.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a.foo().single()!!) call" "true"
 // WITH_STDLIB
 
 class A {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/qualifiedArgument.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (a.foo().single()!!) call" "true"
 // WITH_STDLIB
 
 class A {

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullability.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 fun test() {
     val s: String? = null
     other(<caret>s)

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullability.kt.after

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (s!!) call" "true"
 fun test() {
     val s: String? = null
     other(<caret>s!!)

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityDisabledWhenItCannotHelp.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "false"
+// "Add non-null asserted (s!!) call" "false"
 // ACTION: Change parameter 's' type of function 'other' to 'String?'
 // ACTION: Create function 'other'
 // ACTION: Convert to also

plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForGeneric.kt

@@ -1,4 +1,4 @@
-// "Add non-null asserted (!!) call" "true"
+// "Add non-null asserted (t!!) call" "true"
 interface Some
 
 fun <T: Some?> test(t: T) {