From 9962fc88ca6065e4fb0e7d086c8c3f9983f1120a Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 10 Aug 2017 14:36:02 +0700 Subject: [PATCH] Minor. Move type qualifiers computation to their first usage --- .../kotlin/load/java/typeEnhancement/signatureEnhancement.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt index b89d1021bb4..043cf0dbc2a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt @@ -81,7 +81,6 @@ class SignatureEnhancement(private val annotationTypeQualifierResolver: Annotati } private fun D.enhanceSignature(c: LazyJavaResolverContext): D { - val outerScopeQualifiers = c.computeNewDefaultTypeQualifiers(annotations) // TODO type parameters // TODO use new type parameters while enhancing other types // TODO Propagation into generic type arguments @@ -91,6 +90,7 @@ class SignatureEnhancement(private val annotationTypeQualifierResolver: Annotati // Fake overrides with one overridden has been enhanced before if (kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE && original.overriddenDescriptors.size == 1) return this + val outerScopeQualifiers = c.computeNewDefaultTypeQualifiers(annotations) val receiverTypeEnhancement = if (extensionReceiverParameter != null) parts(