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

Include file name for package-level members in diagnostics

Browse Source
This commit is contained in:
Dmitry Petrov
2017-05-25 13:12:41 +03:00
parent 7979663e6c
commit a86fe89aae
19 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/conflictingOverloads.out
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: conflicting overloads: public fun a(): List<Int> defined in root package, public fun a(): List<String> defined in root package
compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: conflicting overloads: public fun a(): List<Int> defined in root package in file conflictingOverloads.kt, public fun a(): List<String> defined in root package in file conflictingOverloads.kt
fun a(): List<Int> = null!!
^
compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: conflicting overloads: public fun a(): List<Int> defined in root package, public fun a(): List<String> defined in root package
compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: conflicting overloads: public fun a(): List<Int> defined in root package in file conflictingOverloads.kt, public fun a(): List<String> defined in root package in file conflictingOverloads.kt
fun a(): List<String> = null!!
^
COMPILATION_ERROR
compiler/testData/cli/jvm/signatureClash.out
Vendored
+4 -4
View File
@@ -14,13 +14,13 @@ compiler/testData/cli/jvm/signatureClash.kt:9:5: error: platform declaration cla
val a: Int = 1
^
compiler/testData/cli/jvm/signatureClash.kt:12:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I):
fun <get-b>(): Int defined in root package
fun getB(): Int defined in root package
fun <get-b>(): Int defined in root package in file signatureClash.kt
fun getB(): Int defined in root package in file signatureClash.kt
fun getB(): Int = 1
^
compiler/testData/cli/jvm/signatureClash.kt:13:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I):
fun <get-b>(): Int defined in root package
fun getB(): Int defined in root package
fun <get-b>(): Int defined in root package in file signatureClash.kt
fun getB(): Int defined in root package in file signatureClash.kt
val b: Int = 1
^
compiler/testData/cli/jvm/signatureClash.kt:19:7: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I):