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

K2: report JVM backend errors in the same way in PSI as LT

Browse Source 
Do not try to find PSI element, but always use the IR element offsets
instead. This greatly simplifies test data because we don't need to have
custom PSI- and LT- based diagnostic ranges in every test, and K1/K2
behavior also is mostly the same.

The exact offset ranges are not as important for backend diagnostics, so
it's better to have K2+PSI and K2+LT behaving the same.
This commit is contained in:
Alexander Udalov
2023-07-27 19:12:36 +02:00
committed by Space Team
parent 6069aaee9c
commit 965946d3ef
148 changed files with 267 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.fir.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
class C {
companion object {
val X = 1
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val `X$1`<!> = 1<!>
}
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val X<!> = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.kt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
class C {
companion object {
val X = 1
<!CONFLICTING_JVM_DECLARATIONS!>val `X$1`<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val `X$1` = 1<!>
}
<!CONFLICTING_JVM_DECLARATIONS!>val X<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val X = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.fir.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
class B {
companion object <!REDECLARATION!>A<!> {
}
val <!REDECLARATION!>A<!>: A = B.A
}
class C {
companion object A {
val A: A = C.A
}
}
<!CONFLICTING_JVM_DECLARATIONS{LT}!>class <!CONFLICTING_JVM_DECLARATIONS{PSI}!>D<!> {
companion object A {
<!CONFLICTING_JVM_DECLARATIONS!>lateinit var A: A<!>
}
}<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
Vendored
+3 -3
View File
@@ -1,4 +1,4 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
class B {
companion object <!REDECLARATION!>A<!> {
@@ -13,8 +13,8 @@ class C {
}
}
class <!CONFLICTING_JVM_DECLARATIONS!>D<!> {
<!CONFLICTING_JVM_DECLARATIONS!>class D {
companion object A {
<!CONFLICTING_JVM_DECLARATIONS!>lateinit var A: A<!>
}
}
}<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.fir.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
<!CONFLICTING_JVM_DECLARATIONS{LT}!>data class <!CONFLICTING_JVM_DECLARATIONS{PSI}!>C(val c: Int)<!> {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun `copy$default`(c: C, x: Int, m: Int, mh: Any)<!> = C(this.c)<!>
}<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.kt
Vendored
+4 -4
View File
@@ -1,6 +1,6 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
data class <!CONFLICTING_JVM_DECLARATIONS!>C(val c: Int)<!> {
<!CONFLICTING_JVM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int, mh: Any)<!> = C(this.c)
}
<!CONFLICTING_JVM_DECLARATIONS!>data class C(val c: Int) {
<!CONFLICTING_JVM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int, mh: Any) = C(this.c)<!>
}<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.fir.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun `a$default`(c: C, x: Int, m: Int, mh: Any)<!> {}<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun a(x: Int = 1)<!> {}<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_JVM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int, mh: Any)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun a(x: Int = 1)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int, mh: Any) {}<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun a(x: Int = 1) {}<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.fir.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
<!CONFLICTING_JVM_DECLARATIONS{LT}, CONFLICTING_JVM_DECLARATIONS{LT}!>enum class <!CONFLICTING_JVM_DECLARATIONS{PSI}, CONFLICTING_JVM_DECLARATIONS{PSI}!>E<!> {
A;
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun values(): Array<E><!> = null!!<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun valueOf(s: String): E<!> = null!!<!>
}<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt
Vendored
+5 -5
View File
@@ -1,9 +1,9 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
enum class <!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>E<!> {
<!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>enum class E {
A;
<!CONFLICTING_JVM_DECLARATIONS!>fun values(): Array<E><!> = null!!
<!CONFLICTING_JVM_DECLARATIONS!>fun valueOf(s: String): E<!> = null!!
}
<!CONFLICTING_JVM_DECLARATIONS!>fun values(): Array<E> = null!!<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun valueOf(s: String): E = null!!<!>
}<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.fir.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
object O {
val INSTANCE: O = null!!
}
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>object O2<!> {
<!CONFLICTING_JVM_DECLARATIONS!>lateinit var INSTANCE: O2<!>
}<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
object O {
val INSTANCE: O = null!!
}
<!CONFLICTING_JVM_DECLARATIONS!>object O2<!> {
<!CONFLICTING_JVM_DECLARATIONS!>object O2 {
<!CONFLICTING_JVM_DECLARATIONS!>lateinit var INSTANCE: O2<!>
}
}<!>