diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.java b/j2k/src/org/jetbrains/jet/j2k/Converter.java index 98ae433ccef..881488bf855 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.java +++ b/j2k/src/org/jetbrains/jet/j2k/Converter.java @@ -751,7 +751,7 @@ public class Converter { boolean containsQuestDot = expressionToExpression(expression).toKotlin().contains("?."); if (isPrimitiveTypeOrNull && isRef && containsQuestDot) { - conversion += ".sure()"; + conversion += "!!"; } if (actualType != null) { diff --git a/j2k/tests/testData/ast/issues/file/kt-809.kt b/j2k/tests/testData/ast/issues/file/kt-809.kt index 78932463e03..d31d733c260 100644 --- a/j2k/tests/testData/ast/issues/file/kt-809.kt +++ b/j2k/tests/testData/ast/issues/file/kt-809.kt @@ -13,7 +13,7 @@ open class Test() { open fun putInt(i : Int) : Unit { } open fun test() : Unit { -putInt((One.myContainer?.myInt).sure()) -IntContainer((One.myContainer?.myInt).sure()) +putInt((One.myContainer?.myInt)!!) +IntContainer((One.myContainer?.myInt)!!) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/file/kt-820-field.kt b/j2k/tests/testData/ast/issues/file/kt-820-field.kt index 9ea09ce6370..5f9141abcc7 100644 --- a/j2k/tests/testData/ast/issues/file/kt-820-field.kt +++ b/j2k/tests/testData/ast/issues/file/kt-820-field.kt @@ -8,5 +8,5 @@ var myContainer : Container? = Container() } } open class Test() { -var b : Byte = One.myContainer?.myInt.sure().toByte() +var b : Byte = One.myContainer?.myInt!!.toByte() } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/file/kt-820-string.kt b/j2k/tests/testData/ast/issues/file/kt-820-string.kt index 4e57eeda5ec..762e1aa8f90 100644 --- a/j2k/tests/testData/ast/issues/file/kt-820-string.kt +++ b/j2k/tests/testData/ast/issues/file/kt-820-string.kt @@ -1,7 +1,7 @@ open class Test() { class object { public open fun toFileSystemSafeName(name : String?) : String? { -var size : Int = name?.length().sure() +var size : Int = name?.length()!! return name } } diff --git a/j2k/tests/testData/ast/issues/file/kt-820.kt b/j2k/tests/testData/ast/issues/file/kt-820.kt index b9940817b8b..77fbee788f3 100644 --- a/j2k/tests/testData/ast/issues/file/kt-820.kt +++ b/j2k/tests/testData/ast/issues/file/kt-820.kt @@ -9,6 +9,6 @@ var myContainer : Container? = Container() } open class Test() { open fun test() : Unit { -var b : Byte = One.myContainer?.myInt.sure().toByte() +var b : Byte = One.myContainer?.myInt!!.toByte() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt b/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt index 3ed40c7ecc3..488b6b79db6 100644 --- a/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt +++ b/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt @@ -8,7 +8,7 @@ if (parent == null || !parent?.exists()) return false } var result : Boolean = true -if (parent?.isDirectory().sure()) +if (parent?.isDirectory()!!) { return true } diff --git a/j2k/tests/testData/ast/issues/file/kt-824.kt b/j2k/tests/testData/ast/issues/file/kt-824.kt index 5059669b42a..065f372cb69 100644 --- a/j2k/tests/testData/ast/issues/file/kt-824.kt +++ b/j2k/tests/testData/ast/issues/file/kt-824.kt @@ -9,18 +9,18 @@ var myContainer : Container? = Container() } open class Test() { open fun test() : Unit { -if (One.myContainer?.myBoolean.sure()) +if (One.myContainer?.myBoolean!!) System.out?.println("Ok") -var s : String? = (if (One.myContainer?.myBoolean.sure()) +var s : String? = (if (One.myContainer?.myBoolean!!) "YES" else "NO") -while (One.myContainer?.myBoolean.sure()) +while (One.myContainer?.myBoolean!!) System.out?.println("Ok") do { System.out?.println("Ok") } -while (One.myContainer?.myBoolean.sure()) +while (One.myContainer?.myBoolean!!) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/file/kt-837.kt b/j2k/tests/testData/ast/issues/file/kt-837.kt index 07834c5c81e..a04124924ea 100644 --- a/j2k/tests/testData/ast/issues/file/kt-837.kt +++ b/j2k/tests/testData/ast/issues/file/kt-837.kt @@ -3,7 +3,7 @@ import java.io.Serializable public open class Language(code : String?) : Serializable { protected var code : String? = null public open fun equals(other : Language?) : Boolean { -return other?.toString()?.equals(this.toString()).sure() +return other?.toString()?.equals(this.toString())!! } { this.code = code diff --git a/j2k/tests/testData/ast/issues/file/kt-852.kt b/j2k/tests/testData/ast/issues/file/kt-852.kt index 4e642d623ac..e6a3cb181f0 100644 --- a/j2k/tests/testData/ast/issues/file/kt-852.kt +++ b/j2k/tests/testData/ast/issues/file/kt-852.kt @@ -4,9 +4,9 @@ open fun test() : String? { var s1 : String? = "" var s2 : String? = "" var s3 : String? = "" -if ((s1?.isEmpty()).sure() && (s2?.isEmpty()).sure()) +if ((s1?.isEmpty())!! && (s2?.isEmpty())!!) return "OK" -if ((s1?.isEmpty()).sure() && (s2?.isEmpty()).sure() && (s3?.isEmpty()).sure()) +if ((s1?.isEmpty())!! && (s2?.isEmpty())!! && (s3?.isEmpty())!!) return "OOOK" return "" }