From 3f3030ff26c3f4ebba5865902f248b02535d36fd Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 30 Oct 2013 15:36:01 +0400 Subject: [PATCH] Account for fields annotated @NotNull --- .../lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt | 2 +- .../jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index ff210235253..84800b41bf9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -252,7 +252,7 @@ public abstract class LazyJavaMemberScope( private fun getPropertyType(field: JavaField): JetType { // Fields do not have their own generic parameters - val propertyType = c.typeResolver.transformJavaType(field.getType(), TypeUsage.MEMBER_SIGNATURE_INVARIANT.toAttributes()) + val propertyType = c.typeResolver.transformJavaType(field.getType(), LazyJavaTypeAttributes(c, field, TypeUsage.MEMBER_SIGNATURE_INVARIANT)) if (JavaPropertyResolver.isStaticFinalField(field)) { return TypeUtils.makeNotNullable(propertyType) } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt index 85cfa5378f1..8cd58538178 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt @@ -265,7 +265,7 @@ class LazyJavaTypeAttributes( c: LazyJavaResolverContext, val annotationOwner: JavaAnnotationOwner, override val howThisTypeIsUsed: TypeUsage, - computeHowThisTypeIsUsedAccrodingToAnnotations: () -> TypeUsage + computeHowThisTypeIsUsedAccrodingToAnnotations: () -> TypeUsage = {howThisTypeIsUsed} ): JavaTypeAttributes { override val howThisTypeIsUsedAccordingToAnnotations: TypeUsage by c.storageManager.createLazyValue(