From 514c7b553fe22b408b9814d579a56e3933527386 Mon Sep 17 00:00:00 2001 From: Andrey Ponomarev Date: Thu, 21 Feb 2013 00:46:53 +0100 Subject: [PATCH] J2K: Detect @NotNull fields --- j2k/src/org/jetbrains/jet/j2k/Converter.java | 2 +- j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.java b/j2k/src/org/jetbrains/jet/j2k/Converter.java index dd31c97b8f4..8208cde69c4 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.java +++ b/j2k/src/org/jetbrains/jet/j2k/Converter.java @@ -361,7 +361,7 @@ public class Converter { return new Field( new IdentifierImpl(field.getName()), // TODO modifiers, - typeToType(field.getType()), + typeToType(field.getType(), ConverterUtil.isAnnotatedAsNotNull(field.getModifierList())), createSureCallOnlyForChain(field.getInitializer(), field.getType()), // TODO: add modifiers countWritingAccesses(field, psiClass) ); diff --git a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt b/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt index 376befca75c..1639842a602 100644 --- a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt +++ b/j2k/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) }