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

[FIR] Implement FirInterfaceDefaultMethodCallChecker

Browse Source 
Add diagnostics: INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET,
INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER,
DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET
This commit is contained in:
Ivan Kochurkin
2021-09-01 22:31:16 +03:00
committed by TeamCityServer
parent 97bc079634
commit f414a91c66
19 changed files with 325 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/j+k/defaultMethods.fir.kt
Vendored
+30 -30
View File
@@ -20,23 +20,23 @@ import JavaInterface.testStatic
interface KotlinInterface : JavaInterface {
fun fooo() {
testStatic()
super.test()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
}
}
}
val propertyy: String
get() {
super.test()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
}
}
return ""
@@ -49,23 +49,23 @@ interface KotlinInterface : JavaInterface {
interface KotlinInterfaceIndirectInheritance : KotlinInterface {
fun foooo() {
testStatic()
super.test()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
}
}
}
val propertyyy: String
get() {
super.test()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
}
}
return ""
@@ -74,25 +74,25 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
open class KotlinClass : JavaInterface {
fun foo() {
testStatic()
super.test()
super.testOverride()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
object {
fun run () {
super@KotlinClass.test()
super@KotlinClass.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
}
}
}
val property: String
get() {
super.test()
super.testOverride()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
object {
fun run () {
super@KotlinClass.test()
super@KotlinClass.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
}
}
return ""
@@ -101,25 +101,25 @@ open class KotlinClass : JavaInterface {
class KotlinClassIndirectInheritance : KotlinClass() {
fun foo2(){
testStatic()
super.test()
super.testOverride()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
object {
fun run () {
super@KotlinClassIndirectInheritance.test()
super@KotlinClassIndirectInheritance.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
}
}
}
val property2: String
get() {
super.test()
super.testOverride()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
object {
fun run () {
super@KotlinClassIndirectInheritance.test()
super@KotlinClassIndirectInheritance.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
}
}
return ""
@@ -128,25 +128,25 @@ class KotlinClassIndirectInheritance : KotlinClass() {
class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
fun foo() {
testStatic()
super.test()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
super.testOverride()
object {
fun run () {
super@KotlinClassIndirectInheritance2.test()
super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
}
}
}
val property: String
get() {
super.test()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
super.testOverride()
object {
fun run () {
super@KotlinClassIndirectInheritance2.test()
super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
}
}
return ""
@@ -154,7 +154,7 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
}
fun test() {
JavaInterface.testStatic()
JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
KotlinClass().foo()
KotlinClass().property
KotlinClassIndirectInheritance2().foo()
compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.fir.kt
Vendored
+13 -13
View File
@@ -25,8 +25,8 @@ import JavaInterface.testStatic
interface KotlinInterface : JavaInterface {
fun fooo() {
testStatic()
super.test()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
test()
testOverride()
}
@@ -38,8 +38,8 @@ interface KotlinInterface : JavaInterface {
interface KotlinInterfaceIndirectInheritance : KotlinInterface {
fun foooo() {
testStatic()
super.test()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
testOverride()
super.testOverride()
}
@@ -47,30 +47,30 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
open class KotlinClass : JavaInterface {
fun foo(){
testStatic()
super.test()
super.testOverride()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
}
}
class KotlinClassIndirectInheritance : KotlinClass() {
fun foo2(){
testStatic()
super.test()
super.testOverride()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
}
}
class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
fun foo(){
testStatic()
super.test()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
super.testOverride()
}
}
fun test() {
JavaInterface.testStatic()
JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
KotlinClass().foo()
KotlinClassIndirectInheritance2().foo()
compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.fir.kt
Vendored
+30 -30
View File
@@ -22,23 +22,23 @@ import JavaInterface.testStatic
interface KotlinInterface : JavaInterface {
fun fooo() {
testStatic()
super.test()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testStatic<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
}
}
}
val propertyy: String
get() {
super.test()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
}
}
return ""
@@ -51,23 +51,23 @@ interface KotlinInterface : JavaInterface {
interface KotlinInterfaceIndirectInheritance : KotlinInterface {
fun foooo() {
testStatic()
super.test()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testStatic<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
}
}
}
val propertyyy: String
get() {
super.test()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
}
}
return ""
@@ -76,25 +76,25 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
open class KotlinClass : JavaInterface {
fun foo(){
testStatic()
super.test()
super.testOverride()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testOverride<!>()
object {
fun run () {
super@KotlinClass.test()
super@KotlinClass.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
}
}
}
val property: String
get() {
super.test()
super.testOverride()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testOverride<!>()
object {
fun run () {
super@KotlinClass.test()
super@KotlinClass.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
}
}
return ""
@@ -103,25 +103,25 @@ open class KotlinClass : JavaInterface {
class KotlinClassIndirectInheritance : KotlinClass() {
fun foo2(){
testStatic()
super.test()
super.testOverride()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testOverride<!>()
object {
fun run () {
super@KotlinClassIndirectInheritance.test()
super@KotlinClassIndirectInheritance.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
}
}
}
val property2: String
get() {
super.test()
super.testOverride()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testOverride<!>()
object {
fun run () {
super@KotlinClassIndirectInheritance.test()
super@KotlinClassIndirectInheritance.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
}
}
return ""
@@ -130,25 +130,25 @@ class KotlinClassIndirectInheritance : KotlinClass() {
class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
fun foo(){
testStatic()
super.test()
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
super.testOverride()
object {
fun run () {
super@KotlinClassIndirectInheritance2.test()
super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
}
}
}
val property: String
get() {
super.test()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
super.testOverride()
object {
fun run () {
super@KotlinClassIndirectInheritance2.test()
super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>test<!>()
}
}
return ""
@@ -156,7 +156,7 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
}
fun test() {
JavaInterface.testStatic()
JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_WARNING!>testStatic<!>()
KotlinClass().foo()
KotlinClass().property
KotlinClassIndirectInheritance2().foo()
compiler/testData/diagnostics/tests/j+k/traitDefaultCall.fir.kt
Vendored
-42
View File
@@ -1,42 +0,0 @@
// !JVM_TARGET: 1.6
// FILE: Test.java
public interface Test {
default String test() {
return "123";
}
}
// FILE: test.kt
interface KTrait : Test {
fun ktest() {
super.test()
test()
}
}
interface KTrait2 : KTrait {
fun ktest2() {
super.test()
test()
}
}
class A : KTrait {
fun a() {
super.test()
test()
}
}
class A2 : KTrait2 {
fun a() {
super.test()
test()
}
}
compiler/testData/diagnostics/tests/j+k/traitDefaultCall.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !JVM_TARGET: 1.6
// FILE: Test.java
public interface Test {
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.fir.kt
Vendored
-322
View File
@@ -1,322 +0,0 @@
// !JVM_DEFAULT_MODE: enable
// !JVM_TARGET: 1.8
public interface KInterface {
@<!DEPRECATION!>JvmDefault<!>
fun test(): String {
return "OK";
}
@<!DEPRECATION!>JvmDefault<!>
val property: String
get() = "OK"
fun testNonDefault(): String {
return "OK";
}
val propertyNonDefault: String
get() = "OK"
}
// FILE: 1.kt
interface KotlinInterface : KInterface {
@<!DEPRECATION!>JvmDefault<!>
fun fooo() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
}
@<!DEPRECATION!>JvmDefault<!>
val propertyy: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
return ""
}
fun foooNonDefault() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
}
val propertyyNonDefault: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
return ""
}
}
interface KotlinInterfaceIndirectInheritance : KotlinInterface {
@<!DEPRECATION!>JvmDefault<!>
fun foooo() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceIndirectInheritance.propertyNonDefault
}
}
}
@<!DEPRECATION!>JvmDefault<!>
val propertyyy: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceIndirectInheritance.propertyNonDefault
}
}
return ""
}
fun fooooNonDefault() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceIndirectInheritance.propertyNonDefault
}
}
}
val propertyyyNonDefault: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceIndirectInheritance.propertyNonDefault
}
}
return ""
}
}
open class KotlinClass : KInterface {
fun foo() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClass.test()
super@KotlinClass.property
super@KotlinClass.testNonDefault()
super@KotlinClass.propertyNonDefault
}
}
}
val xproperty: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClass.test()
super@KotlinClass.property
super@KotlinClass.testNonDefault()
super@KotlinClass.propertyNonDefault
}
}
return ""
}
}
class KotlinClassIndirectInheritance : KotlinClass() {
fun foo2() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClassIndirectInheritance.test()
super@KotlinClassIndirectInheritance.property
super@KotlinClassIndirectInheritance.testNonDefault()
super@KotlinClassIndirectInheritance.propertyNonDefault
}
}
}
val property2: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClassIndirectInheritance.test()
super@KotlinClassIndirectInheritance.property
super@KotlinClassIndirectInheritance.testNonDefault()
super@KotlinClassIndirectInheritance.propertyNonDefault
}
}
return ""
}
}
class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
fun foo() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClassIndirectInheritance2.test()
super@KotlinClassIndirectInheritance2.property
super@KotlinClassIndirectInheritance2.testNonDefault()
super@KotlinClassIndirectInheritance2.propertyNonDefault
}
}
}
val xproperty: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClassIndirectInheritance2.test()
super@KotlinClassIndirectInheritance2.property
super@KotlinClassIndirectInheritance2.testNonDefault()
super@KotlinClassIndirectInheritance2.propertyNonDefault
}
}
return ""
}
}
fun test() {
KotlinClass().test()
KotlinClass().property
KotlinClass().propertyNonDefault
KotlinClassIndirectInheritance2().test()
KotlinClassIndirectInheritance2().testNonDefault()
KotlinClassIndirectInheritance2().propertyyy
KotlinClassIndirectInheritance2().propertyyyNonDefault
KotlinClass().test()
KotlinClass().testNonDefault()
KotlinClass().property
KotlinClass().propertyNonDefault
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !JVM_DEFAULT_MODE: enable
// !JVM_TARGET: 1.8