From a2d3607b5b104ab01cc90f005dd8116fa08fb56f Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 24 Sep 2015 19:32:43 +0300 Subject: [PATCH] J2K: Generate assert with lambda #KT-9191 Fixed --- .../org/jetbrains/kotlin/j2k/StatementConverter.kt | 11 +++-------- .../fileOrElement/assertStatement/withStringDetail.kt | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/j2k/src/org/jetbrains/kotlin/j2k/StatementConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/StatementConverter.kt index ab4d0b54478..98c4620f601 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/StatementConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/StatementConverter.kt @@ -58,14 +58,9 @@ class DefaultStatementConverter : JavaElementVisitor(), StatementConverter { } else { val description = codeConverter.convertExpression(descriptionExpr) - if (descriptionExpr is PsiLiteralExpression) { - result = MethodCallExpression.buildNotNull(null, "assert", listOf(condition, description)) - } - else { - val block = Block(listOf(description), LBrace().assignNoPrototype(), RBrace().assignNoPrototype()) - val lambda = LambdaExpression(null, block.assignNoPrototype()) - result = MethodCallExpression.build(null, "assert", listOf(condition, lambda), listOf(), false) - } + val block = Block(listOf(description), LBrace().assignNoPrototype(), RBrace().assignNoPrototype()) + val lambda = LambdaExpression(null, block.assignNoPrototype()) + result = MethodCallExpression.build(null, "assert", listOf(condition, lambda), listOf(), false) } } diff --git a/j2k/testData/fileOrElement/assertStatement/withStringDetail.kt b/j2k/testData/fileOrElement/assertStatement/withStringDetail.kt index 720ccd99f52..dbf44bd5eb8 100644 --- a/j2k/testData/fileOrElement/assertStatement/withStringDetail.kt +++ b/j2k/testData/fileOrElement/assertStatement/withStringDetail.kt @@ -1 +1 @@ -assert(true, "string details") \ No newline at end of file +assert(true) { "string details" } \ No newline at end of file