From fbffbc541a0fde1dee5944b1a075942abe5ee08e Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 4 Apr 2012 14:21:26 +0400 Subject: [PATCH] Added primary constructor parameters (that are properties) visibility check --- .../org/jetbrains/jet/lang/resolve/OverrideResolver.java | 6 ++++++ libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index a0b1f7a5cdf..65fdd5ebc51 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -432,6 +432,12 @@ public class OverrideResolver { checkVisibilityForMember(propertyDescriptor.getVisibility(), property, propertyDescriptor.getOverriddenDescriptors()); } + for (PropertyDescriptor propertyDescriptor : context.getPrimaryConstructorParameterProperties()) { + PsiElement parameter = trace.get(BindingContext.DESCRIPTOR_TO_DECLARATION, propertyDescriptor); + if (parameter instanceof JetParameter) { + checkVisibilityForMember(propertyDescriptor.getVisibility(), (JetParameter)parameter, propertyDescriptor.getOverriddenDescriptors()); + } + } } private void checkVisibilityForMember(@NotNull Visibility visibility, diff --git a/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt b/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt index 949346d9e98..0634ef3369b 100644 --- a/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt +++ b/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt @@ -47,7 +47,7 @@ abstract class FunctionalList(public val size: Int) { get() = throw java.util.NoSuchElementException() } - class Standard(override val head: T, override val tail: FunctionalList) : FunctionalList(tail.size+1) + class Standard(public override val head: T, public override val tail: FunctionalList) : FunctionalList(tail.size+1) public fun emptyList() : FunctionalList = Empty()