Kapt: Move out the 'final' fallback for initial field values

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
     }