Resolve compileTimeInitializer for variable in lazy resolve

2014-02-21 13:54:57 +04:00
parent 89d99d2848
commit 4a8bcc614a
13 changed files with 133 additions and 32 deletions
@@ -266,7 +266,7 @@ public abstract class LazyJavaMemberScope(

        propertyDescriptor.setType(effectiveSignature.getReturnType(), Collections.emptyList(), DescriptorUtils.getExpectedThisObjectIfNeeded(getContainingDeclaration()), null : JetType?)

-        if (!propertyDescriptor.isVar()) {
+        if (DescriptorUtils.shouldRecordInitializerForProperty(propertyDescriptor, propertyDescriptor.getType())) {
            propertyDescriptor.setCompileTimeInitializer(
                    c.storageManager.createNullableLazyValue {
                        JavaPropertyInitializerEvaluator.getInstance().getInitializerConstant(field, propertyDescriptor)