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

[FIR] Implement CONFLICTING_INHERITED_MEMBERS diagnostic

Browse Source
This commit is contained in:
Andrey Zinovyev
2021-06-11 17:58:30 +03:00
committed by teamcityserver
parent 78519f851e
commit 3f7d050f8f
11 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.fir.kt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ interface B {
fun <T> a(@An arg: @An Int)
}
interface C : A, B
<!CONFLICTING_INHERITED_MEMBERS!>interface C<!> : A, B
@An
abstract class D {
compiler/testData/diagnostics/tests/override/clashesOnInheritance/kt9550.fir.kt
Vendored
+1 -1
View File
@@ -8,6 +8,6 @@ interface B {
fun bar()
}
interface C1 : A, B {
<!CONFLICTING_INHERITED_MEMBERS!>interface C1<!> : A, B {
override fun bar()
}
compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.fir.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
interface AsyncVal { suspend fun getVal(): Int = 1}
interface SyncVal { fun getVal(): Int = 1 }
<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>class MixSuspend<!> : AsyncVal, SyncVal {
<!CONFLICTING_INHERITED_MEMBERS, MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>class MixSuspend<!> : AsyncVal, SyncVal {
}