KT-1717 Don't make member visibility inherit when it is not declared explicitly
#KT-1717 Fixed
This commit is contained in:
@@ -18,12 +18,12 @@ class Z : Y() {
|
||||
|
||||
class MyIterable<T> : Iterable<T>
|
||||
{
|
||||
override fun iterator(): Iterator<T> = MyIterator()
|
||||
public override fun iterator(): Iterator<T> = MyIterator()
|
||||
|
||||
class MyIterator : Iterator<T>
|
||||
{
|
||||
override val hasNext: Boolean = false
|
||||
override fun next(): T {
|
||||
public override val hasNext: Boolean = false
|
||||
public override fun next(): T {
|
||||
throw UnsupportedOperationException()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import java.util.Enumeration
|
||||
|
||||
inline fun <T> java.util.Enumeration<T>.iterator() = object: Iterator<T> {
|
||||
override val hasNext: Boolean
|
||||
public override val hasNext: Boolean
|
||||
get() = hasMoreElements()
|
||||
|
||||
override fun next() = nextElement()
|
||||
public override fun next() = nextElement()
|
||||
}
|
||||
|
||||
fun a(e : java.util.Enumeration<Int>) {
|
||||
|
||||
@@ -6,7 +6,7 @@ class Test() : Thread("Test") {
|
||||
|
||||
}
|
||||
}
|
||||
override fun run() {
|
||||
public override fun run() {
|
||||
init2() // unresolved
|
||||
Test.init2() // ok
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ class Q {
|
||||
}
|
||||
}
|
||||
|
||||
//check that 'toString' can be invoked without specifying 'public' and ': String'
|
||||
//check that 'toString' can be invoked without specifying return type
|
||||
class NewClass : java.util.ArrayList<Integer>() {
|
||||
override fun toString() = "a"
|
||||
public override fun toString() = "a"
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ open class D {
|
||||
}
|
||||
|
||||
class E : D() {
|
||||
internal override fun self() = this
|
||||
internal <!NOTHING_TO_OVERRIDE!>override<!> fun self() = this
|
||||
|
||||
fun test() {
|
||||
val <!UNUSED_VARIABLE!>s<!> : E = self()
|
||||
@@ -31,11 +31,7 @@ open class F {
|
||||
}
|
||||
|
||||
class G : F() {
|
||||
override fun protected_fun() {}
|
||||
}
|
||||
|
||||
fun test_fun_stays_protected(g: G) {
|
||||
g.<!UNRESOLVED_REFERENCE!>protected_fun<!>()
|
||||
<!CANNOT_CHANGE_ACCESS_PRIVILEGE!>override<!> fun protected_fun() {}
|
||||
}
|
||||
|
||||
//------------
|
||||
@@ -61,11 +57,11 @@ trait T {
|
||||
}
|
||||
|
||||
open class L : T {
|
||||
override fun foo() {}
|
||||
<!CANNOT_WEAKEN_ACCESS_PRIVILEGE!>override<!> fun foo() {}
|
||||
}
|
||||
|
||||
class M : L() {
|
||||
<!CANNOT_WEAKEN_ACCESS_PRIVILEGE!>internal<!> override fun foo() {}
|
||||
internal override fun foo() {}
|
||||
}
|
||||
//---------------
|
||||
trait R {
|
||||
@@ -82,4 +78,4 @@ trait Q : R {
|
||||
|
||||
class S : P, Q {
|
||||
<!CANNOT_CHANGE_ACCESS_PRIVILEGE!>internal<!> override fun foo() {}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user