From 9aa6a10aff819c7548ebe7dca5a5801566c74c73 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 22 Mar 2019 03:58:41 +0300 Subject: [PATCH] Revert "Kapt: Move out the 'final' fallback for initial field values" This reverts commit 10e53a2e --- .../kapt3/stubs/ClassFileToSourceStubConverter.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 e190349e1f9..1d8c6b65395 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,10 +640,7 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati lineMappings.registerField(containingClass, field) - val initializer = explicitInitializer - ?: convertPropertyInitializer(field) - ?: if (isFinal(field.access)) convertLiteralExpression(getDefaultValue(type)) else null - + val initializer = explicitInitializer ?: convertPropertyInitializer(field) return treeMaker.VarDef(modifiers, treeMaker.name(name), typeExpression, initializer).keepKdocComments(field) } @@ -672,6 +669,11 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati } } + if (isFinal(field.access)) { + val type = Type.getType(field.desc) + return convertLiteralExpression(getDefaultValue(type)) + } + return null }