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

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
@@ -1,12 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
interface Base1 {
fun getX(): Int
}
interface Base2 {
val x: Int
get() = 1
}
<!CONFLICTING_INHERITED_JVM_DECLARATIONS{LT}!>interface <!CONFLICTING_INHERITED_JVM_DECLARATIONS{PSI}!>Test<!> : Base1, Base2<!>
@@ -1,4 +1,4 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
interface Base1 {
fun getX(): Int
@@ -9,4 +9,4 @@ interface Base2 {
get() = 1
}
interface <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>Test<!> : Base1, Base2
<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>interface Test : Base1, Base2<!>
@@ -1,9 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
interface A {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun f(a: List<Int>): String<!> = TODO()<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>private fun f(a: List<String>): String<!> = TODO()<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun f(a: List<Int>): String = TODO()<!>
<!CONFLICTING_JVM_DECLARATIONS!>private fun f(a: List<String>): String = TODO()<!>
}
class B : A
@@ -1,9 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
interface A {
<!CONFLICTING_JVM_DECLARATIONS!>fun f(a: List<Int>): String<!> = TODO()
<!CONFLICTING_JVM_DECLARATIONS!>private fun f(a: List<String>): String<!> = TODO()
<!CONFLICTING_JVM_DECLARATIONS!>fun f(a: List<Int>): String = TODO()<!>
private <!CONFLICTING_JVM_DECLARATIONS!>fun f(a: List<String>): String = TODO()<!>
}
class B : A
@@ -1,9 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
interface T {
fun getX() = 1
}
class C : T {
<!ACCIDENTAL_OVERRIDE{LT}!><!ACCIDENTAL_OVERRIDE{PSI}!>val x<!> = 1<!>
}
@@ -1,9 +1,9 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
interface T {
fun getX() = 1
}
class C : T {
<!ACCIDENTAL_OVERRIDE!>val x<!> = 1
<!ACCIDENTAL_OVERRIDE!>val x = 1<!>
}
@@ -1,10 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
interface T {
fun getX() = 1
}
interface C : T {
<!ACCIDENTAL_OVERRIDE{LT}!><!ACCIDENTAL_OVERRIDE{PSI}!>val x: Int<!>
<!ACCIDENTAL_OVERRIDE!>val x: Int
get() = 1<!>
}
@@ -1,10 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
interface T {
fun getX() = 1
}
interface C : T {
val x: Int
<!ACCIDENTAL_OVERRIDE!>get()<!> = 1
<!ACCIDENTAL_OVERRIDE!>get() = 1<!>
}
@@ -1,10 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
interface T {
val x: Int
get() = 1
}
interface C : T {
<!ACCIDENTAL_OVERRIDE{LT}!><!ACCIDENTAL_OVERRIDE{PSI}!>fun getX()<!> = 1<!>
}
@@ -1,4 +1,4 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
interface T {
val x: Int
@@ -6,5 +6,5 @@ interface T {
}
interface C : T {
<!ACCIDENTAL_OVERRIDE!>fun getX()<!> = 1
<!ACCIDENTAL_OVERRIDE!>fun getX() = 1<!>
}
@@ -1,13 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
interface T1 {
fun getX() = 1
}
interface T2 {
val x: Int
get() = 1
}
<!CONFLICTING_INHERITED_JVM_DECLARATIONS{LT}!>class <!CONFLICTING_INHERITED_JVM_DECLARATIONS{PSI}!>C<!> : T1, T2 {
}<!>
@@ -1,4 +1,4 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
interface T1 {
fun getX() = 1
@@ -9,5 +9,5 @@ interface T2 {
get() = 1
}
class <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>C<!> : T1, T2 {
}
<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>class C : T1, T2 {
}<!>