diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt index 7a6d02b8e4e..8fbd86f72db 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt @@ -60,7 +60,7 @@ public class ConvertIfWithThrowToAssertIntention : SelfTargetingOffsetIndependen val arg = thrownExpr.getValueArguments().singleOrNull()?.getArgumentExpression() val assertExpr = if (arg != null && !arg.isNullExpression()) - psiFactory.createExpressionByPattern("kotlin.assert($0, $1)", newCondition, arg) + psiFactory.createExpressionByPattern("kotlin.assert($0) {$1}", newCondition, arg) else psiFactory.createExpressionByPattern("kotlin.assert($0)", newCondition) diff --git a/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt.after index c1072aac021..1bc45cdd6e9 100644 --- a/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt.after +++ b/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt.after @@ -1,6 +1,6 @@ // WITH_RUNTIME fun foo() { - kotlin.assert(!true, "text") + kotlin.assert(!true) { "text" } } fun assert(x: Boolean, y: Any) {} \ No newline at end of file diff --git a/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt.after index 07789087d6f..c07313361e0 100644 --- a/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt.after +++ b/idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt.after @@ -2,7 +2,7 @@ package foo.kotlin fun foo() { - kotlin.assert(!true, "text") + kotlin.assert(!true) { "text" } } fun assert(x: Boolean, y: Any) {} \ No newline at end of file diff --git a/idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt.after index 274cebfc4c5..83d417230ac 100644 --- a/idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt.after +++ b/idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt.after @@ -1,5 +1,5 @@ // WITH_RUNTIME fun foo() { val x = true - assert(!(x && false), "text") + assert(!(x && false)) { "text" } } \ No newline at end of file diff --git a/idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt.after index 03ec5eb47c9..14c16339aca 100644 --- a/idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt.after +++ b/idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt.after @@ -1,4 +1,4 @@ // WITH_RUNTIME fun foo() { - assert(!true, "text") + assert(!true) { "text" } } \ No newline at end of file diff --git a/idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt.after index 03ec5eb47c9..14c16339aca 100644 --- a/idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt.after +++ b/idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt.after @@ -1,4 +1,4 @@ // WITH_RUNTIME fun foo() { - assert(!true, "text") + assert(!true) { "text" } } \ No newline at end of file diff --git a/idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt.after b/idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt.after index ad7f9b3e65c..8dc94444b77 100644 --- a/idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt.after +++ b/idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt.after @@ -1,4 +1,4 @@ // WITH_RUNTIME fun foo() { - assert(1 != 0, "text") + assert(1 != 0) { "text" } } \ No newline at end of file