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/functionAndProperty/class.fir.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
class C {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/class.kt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
class C {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
class C {
companion object {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.kt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
class C {
companion object {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.fir.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
class C(<!CONFLICTING_JVM_DECLARATIONS!>val x: Int<!>) {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
class C(<!CONFLICTING_JVM_DECLARATIONS!>val x: Int<!>) {
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.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 foo(x: Any)<!> {}<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun Any.foo()<!> {}<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.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 foo(x: Any)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun Any.foo()<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun foo(x: Any) {}<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun Any.foo() {}<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.fir.kt
Vendored
+2 -3
View File
@@ -1,8 +1,7 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX(t: Any)<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val Any.x: Int<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX(t: Any) = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>val Any.x: Int
get() = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt
Vendored
+2 -3
View File
@@ -1,8 +1,7 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_JVM_DECLARATIONS!>fun getX(t: Any)<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX(t: Any) = 1<!>
val Any.x: Int
<!CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>get() = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun setX(x: Int)<!> {}<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>var x: Int<!> = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int) {}<!>
<!CONFLICTING_JVM_DECLARATIONS!>var x: Int<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>var x: Int = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.fir.kt
Vendored
+2 -3
View File
@@ -1,9 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun setX(x: Int)<!> {}<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int) {}<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>var x: Int<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>var x: Int = 1
set(v) {}<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.kt
Vendored
+2 -3
View File
@@ -1,9 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int) {}<!>
var x: Int = 1
<!CONFLICTING_JVM_DECLARATIONS!>set(v)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>set(v) {}<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
fun foo() {
class C {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.kt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
fun foo() {
class C {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.fir.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
class Outer {
fun foo() {
class C {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
}
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.kt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
class Outer {
fun foo() {
class C {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
class B {
class C {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.kt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
class B {
class C {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.fir.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
object C {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.kt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
object C {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.fir.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
fun foo() =
object {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.kt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
fun foo() =
object {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
class Outer {
val x = object {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
class Outer {
val x = object {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.fir.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// COMPARE_WITH_LIGHT_TREE
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.kt
Vendored
+3 -3
View File
@@ -1,4 +1,4 @@
// COMPARE_WITH_LIGHT_TREE
// FIR_IDENTICAL
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.fir.kt
Vendored
+2 -4
View File
@@ -1,5 +1,3 @@
// COMPARE_WITH_LIGHT_TREE
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x: Int<!>
<!CONFLICTING_JVM_DECLARATIONS!>val x: Int
get() = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt
Vendored
+2 -4
View File
@@ -1,5 +1,3 @@
// COMPARE_WITH_LIGHT_TREE
val x: Int
<!CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>get() = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt
Vendored
+2 -4
View File
@@ -1,7 +1,5 @@
// COMPARE_WITH_LIGHT_TREE
interface T {
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>val x: Int<!>
<!CONFLICTING_JVM_DECLARATIONS!>val x: Int
get() = 1<!>
<!CONFLICTING_JVM_DECLARATIONS{LT}!><!CONFLICTING_JVM_DECLARATIONS{PSI}!>fun getX()<!> = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}
compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt
Vendored
+2 -4
View File
@@ -1,7 +1,5 @@
// COMPARE_WITH_LIGHT_TREE
interface T {
val x: Int
<!CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>get() = 1<!>
<!CONFLICTING_JVM_DECLARATIONS!>fun getX() = 1<!>
}