From 10e53a2e73b3d6b5f1eaa10a027bbd2224753ede Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 14 Mar 2019 19:26:22 +0300 Subject: [PATCH] Kapt: Move out the 'final' fallback for initial field values --- .../kapt3/stubs/ClassFileToSourceStubConverter.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt index 1d8c6b65395..e190349e1f9 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt @@ -640,7 +640,10 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati lineMappings.registerField(containingClass, field) - val initializer = explicitInitializer ?: convertPropertyInitializer(field) + val initializer = explicitInitializer + ?: convertPropertyInitializer(field) + ?: if (isFinal(field.access)) convertLiteralExpression(getDefaultValue(type)) else null + return treeMaker.VarDef(modifiers, treeMaker.name(name), typeExpression, initializer).keepKdocComments(field) } @@ -669,11 +672,6 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati } } - if (isFinal(field.access)) { - val type = Type.getType(field.desc) - return convertLiteralExpression(getDefaultValue(type)) - } - return null }