diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt index 53f944a6a14..02aa36f9cf4 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt @@ -32,9 +32,8 @@ class ImplicitInitializerConversion(private val context: NewJ2kConverterContext) return recurse(element) } - val fieldType = element.type.type - val newInitializer = when (fieldType) { - is JKClassType -> JKNullLiteral() + val newInitializer = when (val fieldType = element.type.type) { + is JKClassType, is JKTypeParameterType -> JKNullLiteral() is JKJavaPrimitiveType -> createPrimitiveTypeInitializer(fieldType) else -> null } diff --git a/nj2k/testData/newJ2k/issues/kt-32436.java b/nj2k/testData/newJ2k/issues/kt-32436.java new file mode 100644 index 00000000000..8b8391cb267 --- /dev/null +++ b/nj2k/testData/newJ2k/issues/kt-32436.java @@ -0,0 +1,6 @@ +public class JClass { + private T name; + public T getName() { + return name; + } +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-32436.kt b/nj2k/testData/newJ2k/issues/kt-32436.kt new file mode 100644 index 00000000000..d8069261a6c --- /dev/null +++ b/nj2k/testData/newJ2k/issues/kt-32436.kt @@ -0,0 +1,3 @@ +class JClass { + val name: T? = null +} diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java index 7381d4b6e32..ce8d3392393 100644 --- a/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java +++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java @@ -2871,6 +2871,11 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew runTest("nj2k/testData/newJ2k/issues/kt-31818.java"); } + @TestMetadata("kt-32436.java") + public void testKt_32436() throws Exception { + runTest("nj2k/testData/newJ2k/issues/kt-32436.java"); + } + @TestMetadata("kt-5294.java") public void testKt_5294() throws Exception { runTest("nj2k/testData/newJ2k/issues/kt-5294.java");