diff --git a/src/org/jetbrains/jet/j2k/ast/Expressions.kt b/src/org/jetbrains/jet/j2k/ast/Expressions.kt index 6af4dd2eb97..a0c6ddf3e12 100644 --- a/src/org/jetbrains/jet/j2k/ast/Expressions.kt +++ b/src/org/jetbrains/jet/j2k/ast/Expressions.kt @@ -3,8 +3,9 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type public open class ArrayAccessExpression(val expression : Expression, val index : Expression) : Expression() { - override fun toKotlin() = expression.toKotlin() + "[" + index.toKotlin() + "]" - override fun isNullable() = expression.isNullable() + override fun toKotlin() = expression.toKotlin() + + (if (expression.isNullable()) "!!" else "") + + "[" + index.toKotlin() + "]" } public open class AssignmentExpression(val left : Expression, val right : Expression, val op : String) : Expression() { diff --git a/tests/testData/ast/for/statement/forRangeWithLE.kt b/tests/testData/ast/for/statement/forRangeWithLE.kt index 5bd70a50082..8f655bde2de 100644 --- a/tests/testData/ast/for/statement/forRangeWithLE.kt +++ b/tests/testData/ast/for/statement/forRangeWithLE.kt @@ -1,4 +1,4 @@ var array : IntArray? = IntArray(10) for (i in 0..10) { -array[i] = i +array!![i] = i } \ No newline at end of file diff --git a/tests/testData/ast/for/statement/forRangeWithLT.kt b/tests/testData/ast/for/statement/forRangeWithLT.kt index 9026bd5ce21..8ad4df1b36a 100644 --- a/tests/testData/ast/for/statement/forRangeWithLT.kt +++ b/tests/testData/ast/for/statement/forRangeWithLT.kt @@ -1,4 +1,4 @@ var array : IntArray? = IntArray(10) for (i in 0..10 - 1) { -array[i] = i +array!![i] = i } \ No newline at end of file diff --git a/tests/testData/ast/for/statement/forWithBlock.kt b/tests/testData/ast/for/statement/forWithBlock.kt index 9026bd5ce21..8ad4df1b36a 100644 --- a/tests/testData/ast/for/statement/forWithBlock.kt +++ b/tests/testData/ast/for/statement/forWithBlock.kt @@ -1,4 +1,4 @@ var array : IntArray? = IntArray(10) for (i in 0..10 - 1) { -array[i] = i +array!![i] = i } \ No newline at end of file