diff --git a/src/org/jetbrains/jet/j2k/Converter.kt b/src/org/jetbrains/jet/j2k/Converter.kt index 4a41f02cf2c..234a1e76247 100644 --- a/src/org/jetbrains/jet/j2k/Converter.kt +++ b/src/org/jetbrains/jet/j2k/Converter.kt @@ -418,10 +418,10 @@ public open class Converter() { return parameters.map { parameterToParameter(it!!) } } - public open fun parameterToParameter(parameter: PsiParameter): Parameter { + public open fun parameterToParameter(parameter: PsiParameter, forceNotNull: Boolean = false): Parameter { return Parameter(Identifier(parameter.getName()!!), typeToType(parameter.getType(), - isAnnotatedAsNotNull(parameter.getModifierList())), true) + forceNotNull || isAnnotatedAsNotNull(parameter.getModifierList())), true) } public open fun argumentsToExpressionList(expression: PsiCallExpression): List { diff --git a/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt index afc4bd9aaed..a8ab7803d01 100644 --- a/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt @@ -188,7 +188,7 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert val catchBlocks = statement?.getCatchBlocks()!! val catchBlockParameters = statement?.getCatchBlockParameters()!! for (i in 0..catchBlocks.size - 1) { - catches.add(CatchStatement(getConverter().parameterToParameter(catchBlockParameters[i]!!), + catches.add(CatchStatement(getConverter().parameterToParameter(catchBlockParameters[i]!!, true), getConverter().blockToBlock(catchBlocks[i], true))) } myResult = TryStatement(getConverter().blockToBlock(statement?.getTryBlock(), true), diff --git a/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt b/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt index f76a797ebda..97e0efb08e3 100644 --- a/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt +++ b/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt @@ -2,10 +2,10 @@ try { callMethod(params) } -catch (e : Exception?) { +catch (e : Exception) { println(1) } -catch (e : IOException?) { +catch (e : IOException) { println(0) } finally diff --git a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt index 5415a28f50f..da8e67915a0 100644 --- a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt +++ b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt @@ -1,10 +1,10 @@ try { } -catch (e : Exception?) { +catch (e : Exception) { println(1) } -catch (e : IOException?) { +catch (e : IOException) { println(0) } finally diff --git a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt index 4da4b18ca9a..bf23b61c5d5 100644 --- a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt +++ b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt @@ -1,10 +1,10 @@ try { } -catch (e : Exception?) { +catch (e : Exception) { println(1) } -catch (e : IOException?) { +catch (e : IOException) { println(0) } finally diff --git a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt index 04545c66873..9d98b8278e1 100644 --- a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt +++ b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt @@ -1,9 +1,9 @@ try { } -catch (e : Exception?) { +catch (e : Exception) { println(1) } -catch (e : IOException?) { +catch (e : IOException) { println(0) } \ No newline at end of file