Sergej Jaskiewicz
f26e470e80
For some reason type parameters end up in `GlobdalDeclarationTable`, and thus we tracked them in `IdSignatureClashDetector`, which wasn't right and confused the diagnostic renderer that uses `org.jetbrains.kotlin.resolve.MemberComparator` for sorting the declarations to display in diagnostics. That comparator doesn't know jow to work with type parameters. Besides, type parameters, like many other types of declarations, are not considered public wrt KLIB ABI, so there's no need to show CONFLICTING_KLIB_SIGNATURES_ERROR for them. ^KT-65723 Fixed
71 lines
2.4 KiB
Kotlin
Vendored
71 lines
2.4 KiB
Kotlin
Vendored
// WITH_STDLIB
|
|
// FIR_IDENTICAL
|
|
// RENDER_ALL_DIAGNOSTICS_FULL_TEXT
|
|
|
|
// MODULE: lib
|
|
package com.example.klib.serialization.diagnostics
|
|
|
|
fun movedToLib() {}
|
|
|
|
// MODULE: main(lib)
|
|
// FILE: foo.kt
|
|
package com.example.klib.serialization.diagnostics
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>@Deprecated("", level = DeprecationLevel.HIDDEN)
|
|
fun foo(): Long = 0L<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR, CONFLICTING_KLIB_SIGNATURES_ERROR!>var myVal: Long = 0L<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>val myDelegated: Long by <!CONFLICTING_KLIB_SIGNATURES_ERROR!>lazy { 0L }<!><!>
|
|
|
|
// FILE: main.kt
|
|
package com.example.klib.serialization.diagnostics
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>@Deprecated("", level = DeprecationLevel.HIDDEN)
|
|
fun foo(): String = ""<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>fun foo(): Int = 0<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR, CONFLICTING_KLIB_SIGNATURES_ERROR!>@Deprecated("", level = DeprecationLevel.HIDDEN)
|
|
var myVal: Int = 0<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>@Deprecated("", level = DeprecationLevel.HIDDEN)
|
|
val myVal: String
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>get() = ""<!><!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>@Deprecated("", level = DeprecationLevel.HIDDEN)
|
|
val myDelegated: Int by <!CONFLICTING_KLIB_SIGNATURES_ERROR!>lazy { 1 }<!><!>
|
|
|
|
@Deprecated("This function moved to the 'lib' module", level = DeprecationLevel.HIDDEN)
|
|
fun movedToLib() {}
|
|
|
|
class A {
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>@Deprecated(message = "", level = DeprecationLevel.HIDDEN)
|
|
fun <T> parameterized(a: T): T = a<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>fun <T> parameterized(a: T) {}<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>@Deprecated(message = "", level = DeprecationLevel.HIDDEN)
|
|
private fun privateMethod(): Int = 0<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>private fun privateMethod(): Long = 0L<!>
|
|
}
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>@Deprecated(message = "", level = DeprecationLevel.HIDDEN)
|
|
private fun privateTopLevelFunction(): Int = 0<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>private fun privateTopLevelFunction(): Long = 0L<!>
|
|
|
|
fun main() {
|
|
foo()
|
|
movedToLib()
|
|
|
|
// Test that the diagnostic is reported for declarations that are referenced before they are declared
|
|
bar()
|
|
}
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>@Deprecated("", level = DeprecationLevel.HIDDEN)
|
|
fun bar(): Long = 0L<!>
|
|
|
|
<!CONFLICTING_KLIB_SIGNATURES_ERROR!>fun bar(): Long = 1L<!>
|