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

Include containing declaration name in message for JVM signature clashes

Browse Source 
#KT-9359 Fixed
This commit is contained in:
Dmitry Petrov
2017-05-24 17:36:08 +03:00
parent d850f01c39
commit 17eab2865d
5 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/checker/duplicateJvmSignature/functionAndProperty/ambiguous.kt
Vendored
+4 -4
View File
@@ -4,9 +4,9 @@ class String
interface I {
<error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
fun foo(l: List<a.b.String>): Unit
fun foo(l: List<kotlin.String>): Unit">fun foo(l: List<String>)</error>
fun foo(l: List<a.b.String>): Unit defined in a.b.I
fun foo(l: List<kotlin.String>): Unit defined in a.b.I">fun foo(l: List<String>)</error>
<error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
fun foo(l: List<a.b.String>): Unit
fun foo(l: List<kotlin.String>): Unit">fun foo(l: List<kotlin.String>)</error>
fun foo(l: List<a.b.String>): Unit defined in a.b.I
fun foo(l: List<kotlin.String>): Unit defined in a.b.I">fun foo(l: List<kotlin.String>)</error>
}
idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
Vendored
+4 -4
View File
@@ -4,8 +4,8 @@
package test
<error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (getX()I):
fun <get-x>(): Int
fun getX(): Int">val x</error> = 1
fun <get-x>(): Int defined in test
fun getX(): Int defined in test">val x</error> = 1
<error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (getX()I):
fun <get-x>(): Int
fun getX(): Int">fun getX()</error> = 1
fun <get-x>(): Int defined in test
fun getX(): Int defined in test">fun getX()</error> = 1
idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt
Vendored
+4 -4
View File
@@ -1,8 +1,8 @@
interface T {
<error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
fun foo(l: List<Int>): Unit
fun foo(l: List<String>): Unit">fun foo(l: List<String>)</error> {}
fun foo(l: List<Int>): Unit defined in T
fun foo(l: List<String>): Unit defined in T">fun foo(l: List<String>)</error> {}
<error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
fun foo(l: List<Int>): Unit
fun foo(l: List<String>): Unit">fun foo(l: List<Int>)</error> {}
fun foo(l: List<Int>): Unit defined in T
fun foo(l: List<String>): Unit defined in T">fun foo(l: List<Int>)</error> {}
}