Allow Native @Throws on override when the same list is specified
This commit is contained in:
+120
-4
@@ -11,16 +11,36 @@ class Exception3 : Throwable()
|
||||
<!THROWS_LIST_EMPTY!>@Throws<!>
|
||||
fun foo() {}
|
||||
|
||||
interface Base0 {
|
||||
fun foo()
|
||||
}
|
||||
|
||||
class ThrowsOnOverride : Base0 {
|
||||
<!INCOMPATIBLE_THROWS_OVERRIDE!>@Throws(Exception1::class)<!> override fun foo() {}
|
||||
}
|
||||
|
||||
interface Base1 {
|
||||
@Throws(Exception1::class) fun foo()
|
||||
}
|
||||
|
||||
class HasThrowsOnOverride : Base1 {
|
||||
<!THROWS_ON_OVERRIDE!>@Throws(Exception1::class)<!> override fun foo() {}
|
||||
class InheritsThrowsAndNoThrows : Base0, Base1 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class OverridesThrowsAndNoThrows : Base0, Base1 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception1::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class SameThrowsOnOverride : Base1 {
|
||||
@Throws(Exception1::class) override fun foo() {}
|
||||
}
|
||||
|
||||
class DifferentThrowsOnOverride : Base1 {
|
||||
<!INCOMPATIBLE_THROWS_OVERRIDE!>@Throws(Exception2::class)<!> override fun foo() {}
|
||||
}
|
||||
|
||||
class HasThrowsWithEmptyListOnOverride : Base1 {
|
||||
<!THROWS_ON_OVERRIDE!>@Throws<!> override fun foo() {}
|
||||
<!INCOMPATIBLE_THROWS_OVERRIDE!>@Throws<!> override fun foo() {}
|
||||
}
|
||||
|
||||
interface Base2 {
|
||||
@@ -31,8 +51,28 @@ open class InheritsDifferentThrows1 : Base1, Base2 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>override fun foo() {}<!>
|
||||
}
|
||||
|
||||
open class OverridesDifferentThrows1_1 : Base1, Base2 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception1::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
open class OverridesDifferentThrows1_2 : Base1, Base2 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception2::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
open class OverridesDifferentThrows1_3 : Base1, Base2 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception1::class, Exception2::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class InheritsDifferentThrowsThroughSameClass1 : InheritsDifferentThrows1() {
|
||||
override fun foo() {}
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class OverridesDifferentThrowsThroughSameClass1 : InheritsDifferentThrows1() {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception1::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class OverridesDifferentThrowsThroughSameClass2 : InheritsDifferentThrows1() {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception2::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
interface Base3 {
|
||||
@@ -43,6 +83,30 @@ class InheritsDifferentThrows2 : InheritsDifferentThrows1(), Base3 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class OverridesDifferentThrows2 : InheritsDifferentThrows1(), Base3 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception3::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
open class OverridesDifferentThrows3 : Base1, Base2 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception3::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class InheritsDifferentThrows3 : OverridesDifferentThrows3() {
|
||||
override fun foo() {}
|
||||
}
|
||||
|
||||
class OverrideDifferentThrows4 : OverridesDifferentThrows3() {
|
||||
override fun foo() {}
|
||||
}
|
||||
|
||||
class OverrideDifferentThrows5 : OverridesDifferentThrows3() {
|
||||
@Throws(Exception3::class) override fun foo() {}
|
||||
}
|
||||
|
||||
class OverrideDifferentThrows6 : OverridesDifferentThrows3() {
|
||||
<!INCOMPATIBLE_THROWS_OVERRIDE!>@Throws(Exception1::class)<!> override fun foo() {}
|
||||
}
|
||||
|
||||
interface Base4 {
|
||||
@Throws(Exception1::class) fun foo()
|
||||
}
|
||||
@@ -51,6 +115,18 @@ class InheritsSameThrows : Base1, Base4 {
|
||||
override fun foo() {}
|
||||
}
|
||||
|
||||
class OverridesSameThrows : Base1, Base4 {
|
||||
@Throws(Exception1::class) override fun foo() {}
|
||||
}
|
||||
|
||||
class OverrideDifferentThrows7 : Base1, Base4 {
|
||||
<!INCOMPATIBLE_THROWS_OVERRIDE!>@Throws(Exception2::class)<!> override fun foo() {}
|
||||
}
|
||||
|
||||
class OverrideDifferentThrows8 : Base1, Base3 {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception2::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
interface Base5 {
|
||||
@Throws(Exception1::class, Exception2::class) fun foo()
|
||||
}
|
||||
@@ -63,6 +139,18 @@ class InheritsSameThrowsMultiple : Base5, Base6 {
|
||||
override fun foo() {}
|
||||
}
|
||||
|
||||
class OverridesSameThrowsMultiple1 : Base5, Base6 {
|
||||
@Throws(Exception1::class, Exception2::class) override fun foo() {}
|
||||
}
|
||||
|
||||
class OverridesSameThrowsMultiple2 : Base5, Base6 {
|
||||
@Throws(Exception2::class, Exception1::class) override fun foo() {}
|
||||
}
|
||||
|
||||
class OverridesDifferentThrowsMultiple : Base5, Base6 {
|
||||
<!INCOMPATIBLE_THROWS_OVERRIDE!>@Throws(Exception1::class)<!> override fun foo() {}
|
||||
}
|
||||
|
||||
fun withLocalClass() {
|
||||
class LocalException : Throwable()
|
||||
|
||||
@@ -73,4 +161,32 @@ fun withLocalClass() {
|
||||
class InheritsDifferentThrowsLocal : Base1, Base7() {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class OverridesDifferentThrowsLocal : Base1, Base7() {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception1::class, LocalException::class) override fun foo() {}<!>
|
||||
}
|
||||
}
|
||||
|
||||
interface ThrowsOnFakeOverride : Base1
|
||||
|
||||
class InheritThrowsOnFakeOverride : ThrowsOnFakeOverride {
|
||||
override fun foo() {}
|
||||
}
|
||||
|
||||
class OverrideDifferentThrowsOnFakeOverride : ThrowsOnFakeOverride {
|
||||
<!INCOMPATIBLE_THROWS_OVERRIDE!>@Throws(Exception2::class)<!> override fun foo() {}
|
||||
}
|
||||
|
||||
interface IncompatibleThrowsOnFakeOverride : Base1, Base2
|
||||
|
||||
class OverrideIncompatibleThrowsOnFakeOverride1 : IncompatibleThrowsOnFakeOverride {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception1::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class OverrideIncompatibleThrowsOnFakeOverride2 : IncompatibleThrowsOnFakeOverride {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>@Throws(Exception2::class) override fun foo() {}<!>
|
||||
}
|
||||
|
||||
class InheritIncompatibleThrowsOnFakeOverride : IncompatibleThrowsOnFakeOverride {
|
||||
<!INCOMPATIBLE_THROWS_INHERITED!>override fun foo() {}<!>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user