From 1874714d84cc871e335895ececb2f86d3f95ea05 Mon Sep 17 00:00:00 2001 From: Santeri Hiltunen Date: Mon, 4 Feb 2013 13:59:15 +0200 Subject: [PATCH] NonNull annotation on fields makes type non-null --- src/org/jetbrains/jet/j2k/Converter.kt | 2 +- tests/testData/ast/annotations/file/jetbrainsNotNull.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/Converter.kt b/src/org/jetbrains/jet/j2k/Converter.kt index 030bf5c970b..3139bf4e731 100644 --- a/src/org/jetbrains/jet/j2k/Converter.kt +++ b/src/org/jetbrains/jet/j2k/Converter.kt @@ -256,7 +256,7 @@ public open class Converter() { elementToElement(field.getArgumentList())) } - var kType = typeToType(field.getType()) + var kType = typeToType(field.getType(), isAnnotatedAsNotNull(field.getModifierList())) if (field.hasModifierProperty(PsiModifier.FINAL) && isDefinitelyNotNull(field.getInitializer())) { kType = kType.convertedToNotNull(); } diff --git a/tests/testData/ast/annotations/file/jetbrainsNotNull.kt b/tests/testData/ast/annotations/file/jetbrainsNotNull.kt index 376befca75c..1639842a602 100644 --- a/tests/testData/ast/annotations/file/jetbrainsNotNull.kt +++ b/tests/testData/ast/annotations/file/jetbrainsNotNull.kt @@ -1,6 +1,6 @@ package test public open class Test(str : String) { -var myStr : String? = "String2" +var myStr : String = "String2" public open fun sout(str : String) : Unit { System.out?.println(str) }