From bd166cf0708cb4cbeb058b010237e40f4448808b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 12 Apr 2024 18:25:48 +0200 Subject: [PATCH] avoid indeterminate tests, where two same-named quick fixes "Add !!" were applied to a and a[0] at random GitOrigin-RevId: 5eb1b634799c201c4abeab912fe0bad1865f0b9d --- .../resources-en/messages/KotlinBundle.properties | 2 +- .../jetbrains/kotlin/idea/quickfix/AddExclExclCallFix.kt | 5 ++++- .../idea/tests/testData/quickfix/addExclExclCall/array.kt | 2 +- .../testData/quickfix/addExclExclCall/array.kt.after | 2 +- .../tests/testData/quickfix/addExclExclCall/array2.kt | 2 +- .../testData/quickfix/addExclExclCall/array2.kt.after | 2 +- .../tests/testData/quickfix/addExclExclCall/array3.kt | 2 +- .../testData/quickfix/addExclExclCall/array3.kt.after | 2 +- .../tests/testData/quickfix/addExclExclCall/array4.kt | 6 ++---- .../testData/quickfix/addExclExclCall/array4.kt.after | 8 +++----- .../tests/testData/quickfix/addExclExclCall/assignment.kt | 2 +- .../testData/quickfix/addExclExclCall/assignment.kt.after | 2 +- .../addExclExclCall/assignmentToUnsafeCallExpression.kt | 2 +- .../assignmentToUnsafeCallExpression.kt.after | 2 +- .../quickfix/addExclExclCall/functionReference.kt | 2 +- .../quickfix/addExclExclCall/functionReference.kt.after | 2 +- .../quickfix/addExclExclCall/functionReference2.kt | 2 +- .../quickfix/addExclExclCall/functionReference2.kt.after | 2 +- .../quickfix/addExclExclCall/functionReference3.kt | 2 +- .../quickfix/addExclExclCall/functionReference3.kt.after | 2 +- .../tests/testData/quickfix/addExclExclCall/implicit.kt | 2 +- .../testData/quickfix/addExclExclCall/implicit.kt.after | 2 +- .../tests/testData/quickfix/addExclExclCall/implicit2.kt | 2 +- .../testData/quickfix/addExclExclCall/implicit2.kt.after | 2 +- .../tests/testData/quickfix/addExclExclCall/implicit3.kt | 2 +- .../testData/quickfix/addExclExclCall/implicit3.kt.after | 2 +- .../quickfix/addExclExclCall/implicitFunctionCall.kt | 2 +- .../addExclExclCall/implicitFunctionCall.kt.after | 2 +- .../tests/testData/quickfix/addExclExclCall/infixCall.kt | 2 +- .../testData/quickfix/addExclExclCall/infixCall.kt.after | 2 +- .../tests/testData/quickfix/addExclExclCall/iterable.kt | 2 +- .../testData/quickfix/addExclExclCall/iterable.kt.after | 2 +- .../iterableDoesNotInheritIterableInterface.kt | 2 +- .../iterableDoesNotInheritIterableInterface.kt.after | 2 +- .../testData/quickfix/addExclExclCall/iterableGeneric.kt | 2 +- .../quickfix/addExclExclCall/iterableGeneric.kt.after | 2 +- .../quickfix/addExclExclCall/iterableInExtension.kt | 2 +- .../quickfix/addExclExclCall/iterableInExtension.kt.after | 2 +- .../addExclExclCall/iterableWithBadIterator.fir.kt | 2 +- .../addExclExclCall/iterableWithBadIterator.fir.kt.after | 2 +- .../quickfix/addExclExclCall/iterableWithBadIterator.kt | 2 +- .../javaNullabilityMismatchWithImplicitReceiver.test | 4 ++-- .../addExclExclCall/javaReceiverNullability1.test | 4 ++-- .../addExclExclCall/javaReceiverNullability2.test | 4 ++-- .../addExclExclCall/javaReceiverNullabilityInvoke.test | 4 ++-- .../addExclExclCall/javaReceiverNullabilityProperty.test | 4 ++-- .../javaReceiverNullabilityWithThisReceiver.test | 4 ++-- .../tests/testData/quickfix/addExclExclCall/normal.kt | 2 +- .../testData/quickfix/addExclExclCall/normal.kt.after | 2 +- .../tests/testData/quickfix/addExclExclCall/normal2.kt | 2 +- .../testData/quickfix/addExclExclCall/normal2.kt.after | 2 +- .../idea/tests/testData/quickfix/addExclExclCall/null.kt | 2 +- .../testData/quickfix/addExclExclCall/nullInitializer.kt | 2 +- .../nullInitializerWithUnstableSmartcast.kt | 2 +- .../nullInitializerWithUnstableSmartcast.kt.after | 2 +- .../testData/quickfix/addExclExclCall/nullReceiver.fir.kt | 2 +- .../testData/quickfix/addExclExclCall/nullReceiver.kt | 2 +- .../quickfix/addExclExclCall/nullReceiver.kt.after | 2 +- .../addExclExclCall/nullReceiverWithUnstableSmartcast.kt | 2 +- .../nullReceiverWithUnstableSmartcast.kt.after | 2 +- .../testData/quickfix/addExclExclCall/operationBinary.kt | 2 +- .../quickfix/addExclExclCall/operationBinary.kt.after | 2 +- .../quickfix/addExclExclCall/operationDecrement.kt | 2 +- .../quickfix/addExclExclCall/operationDecrement.kt.after | 2 +- .../quickfix/addExclExclCall/operationDivAssign.kt | 2 +- .../quickfix/addExclExclCall/operationDivAssign.kt.after | 2 +- .../testData/quickfix/addExclExclCall/operationIn.kt | 2 +- .../quickfix/addExclExclCall/operationIn.kt.after | 2 +- .../quickfix/addExclExclCall/operationIncrement.kt | 2 +- .../quickfix/addExclExclCall/operationIncrement.kt.after | 2 +- .../quickfix/addExclExclCall/operationMinusAssign.kt | 2 +- .../addExclExclCall/operationMinusAssign.kt.after | 2 +- .../quickfix/addExclExclCall/operationPlusAssign.kt | 2 +- .../quickfix/addExclExclCall/operationPlusAssign.kt.after | 2 +- .../addExclExclCall/operationPlusAssignOnMutableMap.kt | 2 +- .../operationPlusAssignOnMutableMap.kt.after | 2 +- .../quickfix/addExclExclCall/operationRemAssign.kt | 2 +- .../quickfix/addExclExclCall/operationRemAssign.kt.after | 2 +- .../quickfix/addExclExclCall/operationTimesAssign.kt | 2 +- .../addExclExclCall/operationTimesAssign.kt.after | 2 +- .../testData/quickfix/addExclExclCall/operationUnary.kt | 2 +- .../quickfix/addExclExclCall/operationUnary.kt.after | 2 +- .../typeMismatch/argumentAfterNullCheck.kt | 2 +- .../addExclExclCall/typeMismatch/assignmentRValue.kt | 2 +- .../typeMismatch/assignmentRValue.kt.after | 2 +- .../quickfix/addExclExclCall/typeMismatch/initializer.kt | 2 +- .../addExclExclCall/typeMismatch/initializer.kt.after | 2 +- .../typeMismatch/memberAccessInExtension.kt | 2 +- .../typeMismatch/memberAccessInExtension.kt.after | 2 +- .../memberAccessInExtensionAsAssignmentRValue.kt | 2 +- .../memberAccessInExtensionAsAssignmentRValue.kt.after | 2 +- .../typeMismatch/memberAccessInExtensionAsInitializer.kt | 2 +- .../memberAccessInExtensionAsInitializer.kt.after | 2 +- .../quickfix/addExclExclCall/typeMismatch/nullArgument.kt | 2 +- .../addExclExclCall/typeMismatch/qualifiedArgument.kt | 2 +- .../typeMismatch/qualifiedArgument.kt.after | 2 +- .../addExclExclCall/typeMismatch/removeNullability.kt | 2 +- .../typeMismatch/removeNullability.kt.after | 2 +- .../removeNullabilityDisabledWhenItCannotHelp.kt | 2 +- .../typeMismatch/removeNullabilityForGeneric.kt | 2 +- .../typeMismatch/removeNullabilityForGeneric.kt.after | 2 +- .../typeMismatch/removeNullabilityForSubclass.kt | 2 +- .../typeMismatch/removeNullabilityForSubclass.kt.after | 2 +- .../typeMismatch/smartcastImpossibleForArgument.kt | 2 +- .../typeMismatch/smartcastImpossibleForArgument.kt.after | 2 +- .../typeMismatch/smartcastImpossibleForReceiver.kt | 4 ++-- .../typeMismatch/smartcastImpossibleForReceiver.kt.after | 4 ++-- .../idea/tests/testData/quickfix/expressions/kt11594.kt | 2 +- .../tests/testData/quickfix/expressions/kt11594.kt.after | 2 +- .../tests/testData/quickfix/expressions/unsafeCall2.kt | 2 +- .../testData/quickfix/expressions/unsafeCall2.kt.after | 2 +- .../tests/testData/quickfix/expressions/unsafeCall3.kt | 2 +- .../testData/quickfix/expressions/unsafeCall3.kt.after | 2 +- .../tests/testData/quickfix/expressions/unsafeCall4.kt | 2 +- .../testData/quickfix/expressions/unsafeCall4.kt.after | 2 +- .../tests/testData/quickfix/expressions/unsafeCall5.kt | 2 +- .../quickfix/nullables/unsafeInfixCall/noComparison.kt | 2 +- .../unsafeInfixCall/unsafeComparisonInCondition.kt | 2 +- .../nullables/unsafeInfixCall/unsafeComparisonInLogic.kt | 2 +- .../nullables/unsafeInfixCall/unsafeComparisonInWhen.kt | 2 +- .../nullables/unsafeInfixCall/unsafeComparisonInWhile.kt | 2 +- .../platformTypesInspection/nullableAssertRuntime.kt | 2 +- .../nullableAssertRuntime.kt.after | 2 +- .../replaceInfixOrOperatorCall/divAssignOnMutableMap.kt | 2 +- .../replaceInfixOrOperatorCall/minusAssignOnMutableMap.kt | 2 +- .../replaceInfixOrOperatorCall/plusAssignOnMutableMap.kt | 2 +- .../replaceInfixOrOperatorCall/remAssignOnMutableMap.kt | 2 +- .../replaceInfixOrOperatorCall/timesAssignOnMutableMap.kt | 2 +- .../noReplaceWithSafeCallForImplicitReceiver.kt | 2 +- .../replaceWithSafeCallForScopeFunction/applyWithFake.kt | 2 +- .../applyWithThisLabeledFake.kt | 2 +- .../letWithWrongImplicitThis.kt | 2 +- .../letWithWrongParam.kt | 2 +- .../replaceWithSafeCallForScopeFunction/notInsideScope.kt | 2 +- .../ifThenElseMultiStatement.kt | 2 +- .../smartCastImpossibleInIfThen/ifThenMultiStatement.kt | 2 +- .../quickfix/surroundWithNullCheck/chainedUnsafeCall.kt | 2 +- .../surroundWithNullCheck/expressionUnsafeCall.kt | 2 +- .../testData/quickfix/surroundWithNullCheck/inLambda2.kt | 2 +- .../surroundWithNullCheck/unsafeCallInDeclaration.kt | 2 +- .../quickfix/surroundWithNullCheck/unsafeCallInGetter.kt | 2 +- .../quickfix/surroundWithNullCheck/unstableValue.kt | 2 +- .../quickfix/typeMismatch/casts/preferExclExcl.kt | 2 +- .../changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test | 2 +- .../idea/tests/testData/quickfix/typeMismatch/kt25928.kt | 2 +- .../quickfix/wrapWithSafeLetCall/chainedUnsafeCall.kt | 2 +- .../quickfix/wrapWithSafeLetCall/expressionUnsafeCall.kt | 2 +- .../quickfix/wrapWithSafeLetCall/extensionMethod.kt | 2 +- .../quickfix/wrapWithSafeLetCall/inOperator.fir.kt | 2 +- .../quickfix/wrapWithSafeLetCall/inOperator.fir.kt.after | 2 +- .../testData/quickfix/wrapWithSafeLetCall/inOperator.kt | 2 +- .../quickfix/wrapWithSafeLetCall/nullableReceiver.kt | 2 +- .../wrapWithSafeLetCall/unsafeForNullableParameter.kt | 2 +- .../unsafeForNullableParameter.kt.after | 2 +- .../quickfix/wrapWithSafeLetCall/unstableValue.kt | 2 +- .../wrapAllNonNullablePositions6.fir.kt | 2 +- .../wrapAllNonNullablePositions6.fir.kt.after | 2 +- .../wrapWithSafeLetCall/wrapAllNonNullablePositions6.kt | 2 +- 158 files changed, 172 insertions(+), 173 deletions(-) diff --git a/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties b/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties index 8875d5a629af..ced50a178bae 100644 --- a/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties +++ b/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 diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddExclExclCallFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddExclExclCallFix.kt index d6e0cc9a6d48..8ef4b09f1d15 100644 --- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddExclExclCallFix.kt +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array.kt index 250c4a1b38aa..aba74db4f67d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array.kt +++ b/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 { return a[0] diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array.kt.after index ac488c5c55c2..df3fce5b0244 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array.kt.after +++ b/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 { return a!![0] diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array2.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array2.kt index ac1eee657068..10322d5491d4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array2.kt +++ b/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 { return a[0] diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array2.kt.after index c8c8af2faf91..71d820dde3c7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array2.kt.after +++ b/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 { return a[0]!! diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array3.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array3.kt index a994a38c7e06..15858696cc3b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array3.kt +++ b/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) { a[0].length diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array3.kt.after index 792ca1d8f01b..6e085673ddee 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array3.kt.after +++ b/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) { a[0]!!.length diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array4.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array4.kt index 09c897afe733..52823033889d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array4.kt +++ b/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? - +// "Add non-null asserted (a!!) call" "true" +// ERROR: Type mismatch: inferred type is String? but String was expected fun foo(a: Array?): String { return a[0] } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array4.kt.after index 74adda6e6599..4bcebd8e86c4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/array4.kt.after +++ b/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? - +// "Add non-null asserted (a!!) call" "true" +// ERROR: Type mismatch: inferred type is String? but String was expected fun foo(a: Array?): 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 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignment.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignment.kt index 554f45c8099a..b04389702f66 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignment.kt +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignment.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignment.kt.after index 43b87a04e6e3..72a4acf8417e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignment.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignmentToUnsafeCallExpression.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignmentToUnsafeCallExpression.kt index 8980acdf0400..748494b92dfe 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignmentToUnsafeCallExpression.kt +++ b/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?) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignmentToUnsafeCallExpression.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignmentToUnsafeCallExpression.kt.after index 7cdcce4cbed2..b4195fb3871e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/assignmentToUnsafeCallExpression.kt.after +++ b/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?) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt index 6e83cf0377d3..47174c4f3fb4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt +++ b/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 } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt.after index c959a1606e7f..4a59e7a36625 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt.after +++ b/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 } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt index 03f2504ba158..1d5637ac7f17 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt +++ b/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() } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt.after index 968410c493b1..0fb0f753b2f8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt.after +++ b/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() } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt index 86c30e863f40..700960df128a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt +++ b/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 } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt.after index 3aa7c50e4582..e15b9d6b4cea 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt.after +++ b/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 } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit.kt index 52f228847ec0..4319bafcedec 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit.kt +++ b/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() { length diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit.kt.after index 07240f4cc792..333099bf79f1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit2.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit2.kt index 5029b4430dda..11f6253adfa0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit2.kt +++ b/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 { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit2.kt.after index 734d76bfb44a..895e8275e4ac 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit2.kt.after +++ b/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 { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit3.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit3.kt index 478d0ace8a55..cc059b9145e0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit3.kt +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit3.kt.after index 4ef6530d92bb..d6fe4278ac49 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicit3.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicitFunctionCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicitFunctionCall.kt index c1b026150475..87a9e45efd47 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicitFunctionCall.kt +++ b/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() { toLowerCase() diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicitFunctionCall.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicitFunctionCall.kt.after index 4d8eb35fde93..268db51f64e9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/implicitFunctionCall.kt.after +++ b/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() diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/infixCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/infixCall.kt index 66b9b6e00cd5..a73acee53494 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/infixCall.kt +++ b/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) {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/infixCall.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/infixCall.kt.after index 38bd13aba53a..eb5187d2613a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/infixCall.kt.after +++ b/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) {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterable.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterable.kt index 87c884d771d8..d569cf14b64a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterable.kt +++ b/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? = null!! for (i in test) { } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterable.kt.after index fd68e00d3bfd..922910070bb2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterable.kt.after +++ b/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? = null!! for (i in test!!) { } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableDoesNotInheritIterableInterface.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableDoesNotInheritIterableInterface.kt index 76d67f41d6ef..b2465aba73d2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableDoesNotInheritIterableInterface.kt +++ b/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 = null!! } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableDoesNotInheritIterableInterface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableDoesNotInheritIterableInterface.kt.after index 8b327e295af0..b801455f8c31 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableDoesNotInheritIterableInterface.kt.after +++ b/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 = null!! } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableGeneric.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableGeneric.kt index f1a1fe4c288c..91793d6159a1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableGeneric.kt +++ b/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 ?> foo(c: T) { for (i in c) { } } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableGeneric.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableGeneric.kt.after index ae2a8080d436..ee7ea22c6151 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableGeneric.kt.after +++ b/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 ?> foo(c: T) { for (i in c!!) { } } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableInExtension.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableInExtension.kt index 0b43ed301947..7240c911377d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableInExtension.kt +++ b/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 { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableInExtension.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableInExtension.kt.after index 6cc7bcd7b38a..73e7e85c2479 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableInExtension.kt.after +++ b/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 { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt index 89ebcfe37002..9bccbc63732e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt +++ b/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 = null!! diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt.after index 09f5c0d0d96b..277a75b896c7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt.after +++ b/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 = null!! diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.kt index c3b8ee2157f9..a8bca1209218 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.kt +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaNullabilityMismatchWithImplicitReceiver.test b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaNullabilityMismatchWithImplicitReceiver.test index 4f1fdd47a60e..49a45d85e674 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaNullabilityMismatchWithImplicitReceiver.test +++ b/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; diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullability1.test b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullability1.test index 0770f5e86162..439cfe30e670 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullability1.test +++ b/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) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullability2.test b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullability2.test index 4e011924d4f0..66222fdc1dc4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullability2.test +++ b/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) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityInvoke.test b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityInvoke.test index f336c84439e0..1769eb748c1d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityInvoke.test +++ b/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) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityProperty.test b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityProperty.test index a4673e64d9b9..ba6cbcfab57a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityProperty.test +++ b/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) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityWithThisReceiver.test b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityWithThisReceiver.test index c5f5aed59479..d251b36d5632 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/javaReceiverNullabilityWithThisReceiver.test +++ b/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; diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal.kt index ac6cadbd42d3..012d458b6c7d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal.kt +++ b/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.length diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal.kt.after index 406a2a17f5ca..1742c9a6cfd7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal2.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal2.kt index cd9c3fef6e03..c7a9733b2142 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal2.kt +++ b/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?) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal2.kt.after index ee662cf84226..2c4fede9028d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/normal2.kt.after +++ b/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?) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/null.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/null.kt index a71832efb1ff..704ebacae305 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/null.kt +++ b/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?' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializer.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializer.kt index 31c0a91b35c1..c0eef7aad7e0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializer.kt +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializerWithUnstableSmartcast.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializerWithUnstableSmartcast.kt index d9135b0a7af6..ac4f8d79fb71 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializerWithUnstableSmartcast.kt +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializerWithUnstableSmartcast.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializerWithUnstableSmartcast.kt.after index 7c646616a387..e18818223e42 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullInitializerWithUnstableSmartcast.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.fir.kt index 906797853c10..ccb0dfb520fb 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.fir.kt +++ b/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) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.kt index d42ba4a8ca60..e60bd9229385 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.kt +++ b/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?) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.kt.after index d4c4acf33c87..8595d5b8fd92 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.kt.after +++ b/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?) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiverWithUnstableSmartcast.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiverWithUnstableSmartcast.kt index fbc5cf0034d7..029ae4fc18d8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiverWithUnstableSmartcast.kt +++ b/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() diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiverWithUnstableSmartcast.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiverWithUnstableSmartcast.kt.after index ed1ee3086c70..a38ab40aac9d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiverWithUnstableSmartcast.kt.after +++ b/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() diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationBinary.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationBinary.kt index cf079dc70e28..b51a0e19efd9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationBinary.kt +++ b/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) {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationBinary.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationBinary.kt.after index 3ebbe7406b50..57e848ccad38 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationBinary.kt.after +++ b/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) {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDecrement.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDecrement.kt index 6847c5fde745..62c75e978b98 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDecrement.kt +++ b/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-- diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDecrement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDecrement.kt.after index 4549cf0522f8..3b7d87431ad3 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDecrement.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt index 50c3c66c13fa..ab50389557b6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt +++ b/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 /= 2 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt.after index 6bf4d3866bda..b1c920985fc9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIn.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIn.kt index 92ed2b0abb76..551b317354c9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIn.kt +++ b/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?) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIn.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIn.kt.after index ac8e27b68b19..ffbb64cce26b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIn.kt.after +++ b/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?) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIncrement.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIncrement.kt index 299ea5a7e2ce..5b5e96357883 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIncrement.kt +++ b/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++ diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIncrement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIncrement.kt.after index 1eb94bcaee54..ff83bed5d5cc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationIncrement.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt index 3b4701d345a4..7b1953b0be67 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt +++ b/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 -= 2 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt.after index 9d8047891904..5ce37484d5c4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt index 42bbd081fd85..591651f479d6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt +++ b/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 += 2 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt.after index 2c2b6b6c308f..846ff03bbd4d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt index b890b124a515..1bff827e794a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt +++ b/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) { map[3] += 5 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt.after index 27f46fd9bbb8..aac1eb0e235e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt.after +++ b/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) { map[3] = map[3]!! + 5 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt index 47624b84e86c..a491d8c389b8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt +++ b/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 %= 2 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt.after index 7e150f0ce994..9e13fa1e19f6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt index 232f990576e2..255d21eae613 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt +++ b/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 *= 2 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt.after index adaf66b9345a..3479471e1f18 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationUnary.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationUnary.kt index eb4b8d582037..7d819d1dba93 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationUnary.kt +++ b/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() {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationUnary.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationUnary.kt.after index 1ea97fd43e99..e41437e87b59 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationUnary.kt.after +++ b/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() {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/argumentAfterNullCheck.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/argumentAfterNullCheck.kt index 2d6f7dea978c..211a25d80ca8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/argumentAfterNullCheck.kt +++ b/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' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/assignmentRValue.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/assignmentRValue.kt index 352b1c2c19c7..e680c2164927 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/assignmentRValue.kt +++ b/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 = s diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/assignmentRValue.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/assignmentRValue.kt.after index 2c686a957309..bebb7ccd4a71 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/assignmentRValue.kt.after +++ b/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!! diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/initializer.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/initializer.kt index d88714cac41d..09477bd8194e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/initializer.kt +++ b/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 = s } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/initializer.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/initializer.kt.after index 9ece1a508011..05c3fb108947 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/initializer.kt.after +++ b/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!! } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtension.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtension.kt index 2d9690a312a1..8774bde02b88 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtension.kt +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtension.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtension.kt.after index 1f363d7a770c..0784beb7889a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtension.kt.after +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsAssignmentRValue.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsAssignmentRValue.kt index 350841342e2d..0da305afc85c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsAssignmentRValue.kt +++ b/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 } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsAssignmentRValue.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsAssignmentRValue.kt.after index 4a633af00a5a..865fbef327e0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsAssignmentRValue.kt.after +++ b/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 } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsInitializer.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsInitializer.kt index 089de93f2d82..40fcf2810694 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsInitializer.kt +++ b/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 } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsInitializer.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsInitializer.kt.after index 7cd4f2695444..8a2a727707b7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/memberAccessInExtensionAsInitializer.kt.after +++ b/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 } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/nullArgument.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/nullArgument.kt index e8372f9d8b7a..dc81a25c5203 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/nullArgument.kt +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/qualifiedArgument.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/qualifiedArgument.kt index 3cdede31c7b6..cbd4e9f4bd8e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/qualifiedArgument.kt +++ b/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 { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/qualifiedArgument.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/qualifiedArgument.kt.after index 1cef60893d36..205ce44306a6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/qualifiedArgument.kt.after +++ b/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 { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullability.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullability.kt index 916d40b556e7..da3348b10304 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullability.kt +++ b/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(s) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullability.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullability.kt.after index 01b464d9d474..938ef64546a2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullability.kt.after +++ b/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(s!!) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityDisabledWhenItCannotHelp.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityDisabledWhenItCannotHelp.kt index be9258f526c9..ccf369c71a61 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityDisabledWhenItCannotHelp.kt +++ b/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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForGeneric.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForGeneric.kt index 169053482fd5..de256601311e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForGeneric.kt +++ b/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 test(t: T) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForGeneric.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForGeneric.kt.after index 1abe49b5ef39..9517eef36dab 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForGeneric.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForGeneric.kt.after @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (t!!) call" "true" interface Some fun test(t: T) { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForSubclass.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForSubclass.kt index 3a468fa9664f..1da03b8a96b4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForSubclass.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForSubclass.kt @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (s!!) call" "true" interface A class B: A diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForSubclass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForSubclass.kt.after index 2f6d584d35e7..1551c9ccca4d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForSubclass.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/removeNullabilityForSubclass.kt.after @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (s!!) call" "true" interface A class B: A diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForArgument.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForArgument.kt index 81c2360a8577..799919f1c9f2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForArgument.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForArgument.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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForArgument.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForArgument.kt.after index 038796d7a7c6..6d7a53173267 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForArgument.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForArgument.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 diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForReceiver.kt index 3f4d750e18a2..6524a3c7c50d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForReceiver.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForReceiver.kt @@ -1,5 +1,5 @@ -// "Add non-null asserted (!!) call" "true" -// ACTION: Add non-null asserted (!!) call +// "Add non-null asserted (a!!) call" "true" +// ACTION: Add non-null asserted (a!!) call // ACTION: Convert to run // ACTION: Convert to with // ACTION: Remove braces from 'if' statement diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForReceiver.kt.after index e083233d53f1..78df834d6878 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForReceiver.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/typeMismatch/smartcastImpossibleForReceiver.kt.after @@ -1,5 +1,5 @@ -// "Add non-null asserted (!!) call" "true" -// ACTION: Add non-null asserted (!!) call +// "Add non-null asserted (a!!) call" "true" +// ACTION: Add non-null asserted (a!!) call // ACTION: Convert to run // ACTION: Convert to with // ACTION: Remove braces from 'if' statement diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/kt11594.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/kt11594.kt index d31f39bfd76a..363ea8a74301 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/kt11594.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/kt11594.kt @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (p as String?!!) call" "true" fun callMe(p: String) {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/kt11594.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/expressions/kt11594.kt.after index 2731d1442000..0feaa6144c9c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/kt11594.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/kt11594.kt.after @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (p as String?!!) call" "true" fun callMe(p: String) {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall2.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall2.kt index 64aa58ae1c7c..b4307aa4bf05 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall2.kt @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (a!!) call" "true" fun foo(a: Int?) { a.plus(1) } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall2.kt.after index 02ee73c7f3df..9ea184fe20e8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall2.kt.after @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (a!!) call" "true" fun foo(a: Int?) { a!!.plus(1) } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall3.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall3.kt index 48b8c253b8f2..386c549c719f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall3.kt @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (a!!) call" "true" fun foo(a: Int?) { a.plus(1) } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall3.kt.after index 02ee73c7f3df..9ea184fe20e8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall3.kt.after @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (a!!) call" "true" fun foo(a: Int?) { a!!.plus(1) } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall4.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall4.kt index 830efcf189b7..af9c95f5f0a6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall4.kt @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (arg!!) call" "true" operator fun Int.get(row: Int, column: Int) = this fun foo(arg: Int?) = arg[42, 13] diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall4.kt.after index e6b6d0e69d5e..4c0de7566032 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall4.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall4.kt.after @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (arg!!) call" "true" operator fun Int.get(row: Int, column: Int) = this fun foo(arg: Int?) = arg!![42, 13] diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall5.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall5.kt index aa985ec3dcb2..40182717c98b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall5.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall5.kt @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "false" +// "Add non-null asserted (arg[42, 13]!!) call" "false" // ACTION: Convert to block body // ACTION: Enable option 'Function return types' for 'Types' inlay hints // ACTION: Introduce local variable diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/noComparison.kt b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/noComparison.kt index 8ae98856e834..ecffb7bfecc0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/noComparison.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/noComparison.kt @@ -1,6 +1,6 @@ // "Replace with safe (?.) call" "false" // ERROR: Operator call corresponds to a dot-qualified call 'p1.compareTo(p2)' which is not allowed on a nullable receiver 'p1'. -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (p1!!) call // ACTION: Enable option 'Local variable types' for 'Types' inlay hints // ACTION: Expand boolean expression to 'if else' // ACTION: Flip '>' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInCondition.kt b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInCondition.kt index 0f94823be698..81296f7ed82e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInCondition.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInCondition.kt @@ -1,5 +1,5 @@ // "Replace with safe (?.) call" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (w?.x!!) call // ACTION: Expand boolean expression to 'if else' // ACTION: Flip '<' // ACTION: Replace overloaded operator with function call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInLogic.kt b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInLogic.kt index d00883cb1f6c..5b429b16af9b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInLogic.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInLogic.kt @@ -1,5 +1,5 @@ // "Replace with safe (?.) call" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (w?.x!!) call // ACTION: Enable option 'Local variable types' for 'Types' inlay hints // ACTION: Expand boolean expression to 'if else' // ACTION: Flip '>' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhen.kt b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhen.kt index 629eea0aa552..2cce71ed424f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhen.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhen.kt @@ -1,5 +1,5 @@ // "Replace with safe (?.) call" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (w?.x!!) call // ACTION: Enable a trailing comma by default in the formatter // ACTION: Expand boolean expression to 'if else' // ACTION: Flip '<=' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhile.kt b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhile.kt index 9129ceaa87a0..e94e0b361298 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhile.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhile.kt @@ -1,5 +1,5 @@ // "Replace with safe (?.) call" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (w?.x!!) call // ACTION: Expand boolean expression to 'if else' // ACTION: Flip '>=' // ACTION: Replace overloaded operator with function call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/platformTypesInspection/nullableAssertRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/platformTypesInspection/nullableAssertRuntime.kt index 98833683a710..32c728908952 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/platformTypesInspection/nullableAssertRuntime.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/platformTypesInspection/nullableAssertRuntime.kt @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (java.lang.String.valueOf(1)!!) call" "true" fun bar() = java.lang.String.valueOf(1) // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/platformTypesInspection/nullableAssertRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/platformTypesInspection/nullableAssertRuntime.kt.after index d2992cee08b2..12a8847a346b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/platformTypesInspection/nullableAssertRuntime.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/platformTypesInspection/nullableAssertRuntime.kt.after @@ -1,4 +1,4 @@ -// "Add non-null asserted (!!) call" "true" +// "Add non-null asserted (java.lang.String.valueOf(1)!!) call" "true" fun bar() = java.lang.String.valueOf(1)!! // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/divAssignOnMutableMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/divAssignOnMutableMap.kt index b8520bd0534c..f382726417ca 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/divAssignOnMutableMap.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/divAssignOnMutableMap.kt @@ -1,6 +1,6 @@ // "Replace with safe (?.) call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (map[3]!!) call // ACTION: Replace overloaded operator with function call // ACTION: Replace with ordinary assignment // ERROR: Operator call corresponds to a dot-qualified call 'map[3].divAssign(5)' which is not allowed on a nullable receiver 'map[3]'. diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/minusAssignOnMutableMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/minusAssignOnMutableMap.kt index 90c630ac5aa0..7a165004bf0b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/minusAssignOnMutableMap.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/minusAssignOnMutableMap.kt @@ -1,6 +1,6 @@ // "Replace with safe (?.) call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (map[3]!!) call // ACTION: Replace overloaded operator with function call // ACTION: Replace with ordinary assignment // ERROR: Operator call corresponds to a dot-qualified call 'map[3].minusAssign(5)' which is not allowed on a nullable receiver 'map[3]'. diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMap.kt index f2077f770b9a..7b62a323c29c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMap.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMap.kt @@ -1,6 +1,6 @@ // "Replace with safe (?.) call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (map[3]!!) call // ACTION: Replace overloaded operator with function call // ACTION: Replace with ordinary assignment // ERROR: Operator call corresponds to a dot-qualified call 'map[3].plusAssign(5)' which is not allowed on a nullable receiver 'map[3]'. diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/remAssignOnMutableMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/remAssignOnMutableMap.kt index e5b0496593d3..3e1ad8b5ac32 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/remAssignOnMutableMap.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/remAssignOnMutableMap.kt @@ -1,6 +1,6 @@ // "Replace with safe (?.) call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (map[3]!!) call // ACTION: Replace overloaded operator with function call // ACTION: Replace with ordinary assignment // ERROR: Operator call corresponds to a dot-qualified call 'map[3].remAssign(5)' which is not allowed on a nullable receiver 'map[3]'. diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/timesAssignOnMutableMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/timesAssignOnMutableMap.kt index 4a1325a09679..fcc58bb35802 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/timesAssignOnMutableMap.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/timesAssignOnMutableMap.kt @@ -1,6 +1,6 @@ // "Replace with safe (?.) call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (map[3]!!) call // ACTION: Replace overloaded operator with function call // ACTION: Replace with ordinary assignment // ERROR: Operator call corresponds to a dot-qualified call 'map[3].timesAssign(5)' which is not allowed on a nullable receiver 'map[3]'. diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/noReplaceWithSafeCallForImplicitReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/noReplaceWithSafeCallForImplicitReceiver.kt index 1710a8512438..f279714b90ab 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/noReplaceWithSafeCallForImplicitReceiver.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/noReplaceWithSafeCallForImplicitReceiver.kt @@ -1,5 +1,5 @@ // "Replace with safe (?.) call" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (foo()!!) call // ACTION: Replace with safe (this?.) call // ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type A? diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/applyWithFake.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/applyWithFake.kt index 29606c3db412..72b878b26b0e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/applyWithFake.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/applyWithFake.kt @@ -1,6 +1,6 @@ // "Replace scope function with safe (?.) call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (b!!) call // ACTION: Enable option 'Implicit receivers and parameters' for 'Lambdas' inlay hints // ACTION: Introduce local variable // ACTION: Replace with safe (?.) call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/applyWithThisLabeledFake.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/applyWithThisLabeledFake.kt index 5cfe52d37abb..2652a6c2799e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/applyWithThisLabeledFake.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/applyWithThisLabeledFake.kt @@ -1,6 +1,6 @@ // "Replace scope function with safe (?.) call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (this@foo!!) call // ACTION: Enable option 'Implicit receivers and parameters' for 'Lambdas' inlay hints // ACTION: Introduce local variable // ACTION: Replace with safe (?.) call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongImplicitThis.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongImplicitThis.kt index 9bbeb8f5b3ef..25d3eaa76bad 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongImplicitThis.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongImplicitThis.kt @@ -1,7 +1,7 @@ // "Replace scope function with safe (?.) call" "false" // WITH_STDLIB // ACTION: Add 'return@let' -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (length!!) call // ACTION: Convert to single-line lambda // ACTION: Enable a trailing comma by default in the formatter // ACTION: Introduce local variable diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongParam.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongParam.kt index b8b29bfd7e7f..2dce921691fa 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongParam.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongParam.kt @@ -1,7 +1,7 @@ // "Replace scope function with safe (?.) call" "false" // WITH_STDLIB // ACTION: Add 'return@let' -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (b!!) call // ACTION: Introduce local variable // ACTION: Replace with safe (?.) call // ACTION: Surround with null check diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/notInsideScope.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/notInsideScope.kt index 0d8f30c87fa7..ec1f98e38f32 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/notInsideScope.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCallForScopeFunction/notInsideScope.kt @@ -1,5 +1,5 @@ // "Replace scope function with safe (?.) call" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (a!!) call // ACTION: Introduce local variable // ACTION: Replace with safe (?.) call // ACTION: Surround with null check diff --git a/plugins/kotlin/idea/tests/testData/quickfix/smartCastImpossibleInIfThen/ifThenElseMultiStatement.kt b/plugins/kotlin/idea/tests/testData/quickfix/smartCastImpossibleInIfThen/ifThenElseMultiStatement.kt index bbef31efa597..6c30327bc009 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/smartCastImpossibleInIfThen/ifThenElseMultiStatement.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/smartCastImpossibleInIfThen/ifThenElseMultiStatement.kt @@ -1,5 +1,5 @@ // "Replace 'if' expression with elvis expression" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (x!!) call // ACTION: Enable option 'Local variable types' for 'Types' inlay hints // ACTION: Introduce local variable // DISABLE-ERRORS diff --git a/plugins/kotlin/idea/tests/testData/quickfix/smartCastImpossibleInIfThen/ifThenMultiStatement.kt b/plugins/kotlin/idea/tests/testData/quickfix/smartCastImpossibleInIfThen/ifThenMultiStatement.kt index 5d1ab56d3cec..09abe580210a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/smartCastImpossibleInIfThen/ifThenMultiStatement.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/smartCastImpossibleInIfThen/ifThenMultiStatement.kt @@ -1,5 +1,5 @@ // "Replace 'if' expression with safe access expression" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (x!!) call // ACTION: Introduce local variable // DISABLE-ERRORS class Test { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/chainedUnsafeCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/chainedUnsafeCall.kt index 2c3769a9e6dd..1d37e73820f3 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/chainedUnsafeCall.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/chainedUnsafeCall.kt @@ -1,5 +1,5 @@ // "Surround with null check" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (arg?.hashCode()!!) call // ACTION: Introduce local variable // ACTION: Put calls on separate lines // ACTION: Replace with safe (?.) call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/expressionUnsafeCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/expressionUnsafeCall.kt index 38900b646336..3042c6608a75 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/expressionUnsafeCall.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/expressionUnsafeCall.kt @@ -1,5 +1,5 @@ // "Surround with null check" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (arg!!) call // ACTION: Convert to block body // ACTION: Enable option 'Function return types' for 'Types' inlay hints // ACTION: Introduce local variable diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/inLambda2.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/inLambda2.kt index 566dbfcf26db..a98c10ffadce 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/inLambda2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/inLambda2.kt @@ -1,6 +1,6 @@ // "Surround with null check" "false" // ACTION: Add 'return@bar' -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (it!!) call // ACTION: Enable option 'Implicit receivers and parameters' for 'Lambdas' inlay hints // ACTION: Introduce local variable // ACTION: Replace 'it' with explicit parameter diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInDeclaration.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInDeclaration.kt index fbf2eee76070..13d8cfa7b554 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInDeclaration.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInDeclaration.kt @@ -1,5 +1,5 @@ // "Surround with null check" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (s!!) call // ACTION: Enable option 'Local variable types' for 'Types' inlay hints // ACTION: Replace with safe (?.) call // ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInGetter.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInGetter.kt index f3704618a4d0..714ff505f93f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInGetter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInGetter.kt @@ -1,5 +1,5 @@ // "Surround with null check" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (x!!) call // ACTION: Convert property getter to initializer // ACTION: Convert to block body // ACTION: Introduce local variable diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unstableValue.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unstableValue.kt index 23b13a4b591a..a56d7225c69c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unstableValue.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unstableValue.kt @@ -1,5 +1,5 @@ // "Surround with null check" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (x!!) call // ACTION: Convert to run // ACTION: Convert to with // ACTION: Introduce local variable diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/casts/preferExclExcl.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/casts/preferExclExcl.kt index 643951c8ff83..5772f329c3cc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/casts/preferExclExcl.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/casts/preferExclExcl.kt @@ -1,7 +1,7 @@ // "Cast expression 's' to 'String'" "false" // ACTION: Add 's =' to argument // ACTION: Add 'toString()' call -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (s!!) call // ACTION: Change parameter 's' type of function 'bar' to 'String?' // ACTION: Create function 'bar' // ACTION: Surround with null check diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/definitelyNonNullableTypes/changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/definitelyNonNullableTypes/changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test index a268152d7094..fd397b27128a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/definitelyNonNullableTypes/changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/definitelyNonNullableTypes/changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test @@ -5,7 +5,7 @@ // ERROR: Type mismatch: inferred type is T but T & Any was expected // ACTION: Add 'Any' as upper bound for T to make it non-nullable // ACTION: Add names in comment to call arguments -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (value!!) call // ACTION: Cast expression 'value' to 'T & Any' class Derived(value: T) : Base(value) {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/kt25928.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/kt25928.kt index 044711b11f65..fc0d3dcce621 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/kt25928.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/kt25928.kt @@ -1,5 +1,5 @@ // "Let 'Foo?' extend interface 'Foo'" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (foo!!) call // ACTION: Change type of 'x' to 'Foo?' // ERROR: Type mismatch: inferred type is Foo? but Foo was expected interface Foo diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedUnsafeCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedUnsafeCall.kt index 1e5daf919b10..d404e18b3043 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedUnsafeCall.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedUnsafeCall.kt @@ -1,6 +1,6 @@ // "Wrap with '?.let { ... }' call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (arg?.hashCode()!!) call // ACTION: Introduce local variable // ACTION: Put calls on separate lines // ACTION: Replace with safe (?.) call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/expressionUnsafeCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/expressionUnsafeCall.kt index f8f514cf2a0a..02f58b465ccd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/expressionUnsafeCall.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/expressionUnsafeCall.kt @@ -1,6 +1,6 @@ // "Wrap with '?.let { ... }' call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (arg!!) call // ACTION: Convert to block body // ACTION: Enable option 'Function return types' for 'Types' inlay hints // ACTION: Introduce local variable diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/extensionMethod.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/extensionMethod.kt index f69e548225d4..c39fd70318b9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/extensionMethod.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/extensionMethod.kt @@ -1,6 +1,6 @@ // "Wrap with '?.let { ... }' call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (toLowerCase()!!) call // ACTION: Introduce import alias // ACTION: Introduce local variable // ACTION: Replace with safe (this?.) call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt index e9a0d29d45f5..a18f06d10a29 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt @@ -1,5 +1,5 @@ // "Wrap with '?.let { ... }' call" "true" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (l!!) call // ACTION: Replace overloaded operator with function call // ACTION: Replace with safe (?.) call // ACTION: Surround with null check diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt.after index 74bf7264ddde..af6f3853974e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt.after @@ -1,5 +1,5 @@ // "Wrap with '?.let { ... }' call" "true" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (l!!) call // ACTION: Replace overloaded operator with function call // ACTION: Replace with safe (?.) call // ACTION: Surround with null check diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.kt index ed5b823ae212..637e4c829d5e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.kt @@ -1,5 +1,5 @@ // "Wrap with '?.let { ... }' call" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (l!!) call // ACTION: Replace overloaded operator with function call // ACTION: Replace with safe (?.) call // ACTION: Surround with null check diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableReceiver.kt index 657591b31bd3..c9536c78c1c0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableReceiver.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableReceiver.kt @@ -1,5 +1,5 @@ // "Wrap with '?.let { ... }' call" "false" -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (b!!) call // ACTION: Convert to run // ACTION: Convert to with // ACTION: Put calls on separate lines diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unsafeForNullableParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unsafeForNullableParameter.kt index 57fe7ca6ff0c..1dc774d55208 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unsafeForNullableParameter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unsafeForNullableParameter.kt @@ -1,6 +1,6 @@ // "Wrap with '?.let { ... }' call" "false" // ACTION: Add 's =' to argument -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (s!!) call // ACTION: Convert to run // ACTION: Convert to with // ACTION: Replace with safe (?.) call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unsafeForNullableParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unsafeForNullableParameter.kt.after index 8792241311fa..9f37c5bfcd36 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unsafeForNullableParameter.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unsafeForNullableParameter.kt.after @@ -1,6 +1,6 @@ // "Wrap with '?.let { ... }' call" "false" // ACTION: Add 's =' to argument -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (s!!) call // ACTION: Replace with safe (?.) call // ACTION: Surround with null check // DISABLE-ERRORS diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unstableValue.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unstableValue.kt index b6ce10b2d4cf..e33ae274dbb9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unstableValue.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/unstableValue.kt @@ -1,6 +1,6 @@ // "Wrap with '?.let { ... }' call" "false" // WITH_STDLIB -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (x!!) call // ACTION: Convert to run // ACTION: Convert to with // ACTION: Replace with safe (?.) call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt index 291a127b8ec6..43f1356d1cab 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt @@ -1,6 +1,6 @@ // "Wrap with '?.let { ... }' call" "true" // ACTION: Add 'a =' to argument -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (a1!!) call // ACTION: Flip '+' // ACTION: Introduce local variable // ACTION: Replace overloaded operator with function call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt.after index afdfe6ff1d78..2f6c9da756dd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt.after @@ -1,6 +1,6 @@ // "Wrap with '?.let { ... }' call" "true" // ACTION: Add 'a =' to argument -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (a1!!) call // ACTION: Flip '+' // ACTION: Introduce local variable // ACTION: Replace overloaded operator with function call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.kt index b173c8cd0f46..969233c12606 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.kt @@ -1,7 +1,7 @@ // "Wrap with '?.let { ... }' call" "false" // SHOULD_BE_AVAILABLE_AFTER_EXECUTION // ACTION: Add 'a =' to argument -// ACTION: Add non-null asserted (!!) call +// ACTION: Add non-null asserted (a1!!) call // ACTION: Flip '+' // ACTION: Introduce local variable // ACTION: Replace overloaded operator with function call