From f9586581a9e766a993d7304c7b54ec031762007b Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Tue, 19 Nov 2013 14:33:15 +0400
Subject: [PATCH] Converter: Fix assert statement

---
 j2k/src/org/jetbrains/jet/j2k/ast/AssertStatement.kt   | 10 +++++-----
 .../testData/ast/assertStatement/onlyCondition.ide.kt  |  2 +-
 .../testData/ast/assertStatement/onlyCondition.kt      |  2 +-
 .../ast/assertStatement/onlyConditionWithBraces.ide.kt |  2 +-
 .../ast/assertStatement/onlyConditionWithBraces.kt     |  2 +-
 .../ast/assertStatement/withStringDetail.ide.kt        |  2 +-
 .../testData/ast/assertStatement/withStringDetail.kt   |  2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/AssertStatement.kt b/j2k/src/org/jetbrains/jet/j2k/ast/AssertStatement.kt
index 570360eef00..d2b361fb7f2 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/AssertStatement.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/AssertStatement.kt
@@ -17,12 +17,12 @@
 package org.jetbrains.jet.j2k.ast
 
 
-public open class AssertStatement(val condition: Expression, val detail: Expression) : Statement() {
+public class AssertStatement(val condition: Expression, val detail: Expression) : Statement() {
     public override fun toKotlin(): String {
-        var detail: String? = (if (detail != Expression.EMPTY_EXPRESSION)
-            "(" + detail.toKotlin() + ")"
+        val lazyStringMessage = if (detail != Expression.EMPTY_EXPRESSION)
+            " {" + detail.toKotlin() + "}"
         else
-            "")
-        return "assert" + detail + " {" + condition.toKotlin() + "}"
+            ""
+        return "assert(${condition.toKotlin()})$lazyStringMessage"
     }
 }
diff --git a/j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt b/j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt
index e148b562e0c..8d54af49a99 100644
--- a/j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt
+++ b/j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt
@@ -1 +1 @@
-assert {boolMethod()}
\ No newline at end of file
+assert(boolMethod())
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/onlyCondition.kt b/j2k/tests/testData/ast/assertStatement/onlyCondition.kt
index e148b562e0c..8d54af49a99 100644
--- a/j2k/tests/testData/ast/assertStatement/onlyCondition.kt
+++ b/j2k/tests/testData/ast/assertStatement/onlyCondition.kt
@@ -1 +1 @@
-assert {boolMethod()}
\ No newline at end of file
+assert(boolMethod())
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt
index dda5f1e1170..9c9d8fecb83 100644
--- a/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt
+++ b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt
@@ -1 +1 @@
-assert {(boolMethod())}
\ No newline at end of file
+assert((boolMethod()))
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.kt b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.kt
index dda5f1e1170..9c9d8fecb83 100644
--- a/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.kt
+++ b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.kt
@@ -1 +1 @@
-assert {(boolMethod())}
\ No newline at end of file
+assert((boolMethod()))
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt b/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt
index 9fa45aa19e7..ef76c6cd22d 100644
--- a/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt
+++ b/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt
@@ -1 +1 @@
-assert("string details") {true}
\ No newline at end of file
+assert(true) {"string details"}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail.kt b/j2k/tests/testData/ast/assertStatement/withStringDetail.kt
index 9fa45aa19e7..ef76c6cd22d 100644
--- a/j2k/tests/testData/ast/assertStatement/withStringDetail.kt
+++ b/j2k/tests/testData/ast/assertStatement/withStringDetail.kt
@@ -1 +1 @@
-assert("string details") {true}
\ No newline at end of file
+assert(true) {"string details"}
\ No newline at end of file