azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added primary constructor parameters (that are properties) visibility check

Browse Source
This commit is contained in:
Svetlana Isakova
2012-04-04 14:21:26 +04:00
parent b8e1e1dd75
commit fbffbc541a
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+6
View File
@@ -432,6 +432,12 @@ public class OverrideResolver {
checkVisibilityForMember(propertyDescriptor.getVisibility(), property, propertyDescriptor.getOverriddenDescriptors()); 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, private void checkVisibilityForMember(@NotNull Visibility visibility,
libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt
+1 -1
View File
@@ -47,7 +47,7 @@ abstract class FunctionalList<T>(public val size: Int) {
get() = throw java.util.NoSuchElementException() get() = throw java.util.NoSuchElementException()
} }
class Standard<T>(override val head: T, override val tail: FunctionalList<T>) : FunctionalList<T>(tail.size+1) class Standard<T>(public override val head: T, public override val tail: FunctionalList<T>) : FunctionalList<T>(tail.size+1)
public fun <T> emptyList() : FunctionalList<T> = Empty<T>() public fun <T> emptyList() : FunctionalList<T> = Empty<T>()