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

[Tests] Update test data after changes to FIR diagnostic messages

Browse Source
This commit is contained in:
Kirill Rakhman
2023-08-11 11:00:37 +02:00
committed by Space Team
parent de1c92a32f
commit d0cc86f52c
101 changed files with 675 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.fir.diag.txt
Vendored
+14 -14
View File
@@ -1,27 +1,27 @@
/b.kt:(96,97): error: Cannot access 'class B : Any': it is private in file
/b.kt:(96,97): error: Cannot access 'class B : Any': it is private in file.
/b.kt:(107,108): error: Cannot access 'class B : Any': it is private in file
/b.kt:(107,108): error: Cannot access 'class B : Any': it is private in file.
/b.kt:(145,154): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'
/b.kt:(145,154): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'.
/b.kt:(168,169): error: Cannot access 'class D : Any': it is private in file
/b.kt:(168,169): error: Cannot access 'class D : Any': it is private in file.
/b.kt:(179,180): error: Cannot access 'class D : Any': it is private in file
/b.kt:(179,180): error: Cannot access 'class D : Any': it is private in file.
/b.kt:(181,190): error: Cannot access 'companion object Companion : Any': it is private in 'a/D'
/b.kt:(181,190): error: Cannot access 'companion object Companion : Any': it is private in 'a/D'.
/b.kt:(225,226): error: Cannot access 'class B : Any': it is private in file
/b.kt:(225,226): error: Cannot access 'class B : Any': it is private in file.
/b.kt:(243,244): error: Cannot access 'class D : Any': it is private in file
/b.kt:(243,244): error: Cannot access 'class D : Any': it is private in file.
/b.kt:(263,264): error: Cannot access 'class B : Any': it is private in file
/b.kt:(263,264): error: Cannot access 'class B : Any': it is private in file.
/b.kt:(265,268): error: Cannot access 'class B : Any': it is private in file
/b.kt:(265,268): error: Cannot access 'class B : Any': it is private in file.
/b.kt:(277,280): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'
/b.kt:(277,280): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'.
/b.kt:(287,288): error: Cannot access 'class D : Any': it is private in file
/b.kt:(287,288): error: Cannot access 'class D : Any': it is private in file.
/b.kt:(289,293): error: Cannot access 'companion object Companion : Any': it is private in 'a/D'
/b.kt:(289,293): error: Cannot access 'companion object Companion : Any': it is private in 'a/D'.
/b.kt:(319,322): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'
/b.kt:(319,322): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'.
compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt47986Default.fir.kt:(175,183): error: Not enough information to infer type variable K
/kt47986Default.fir.kt:(175,183): error: Not enough information to infer type argument for 'K'.
compiler/testData/diagnostics/tests/inference/builderInference/kt47986Disabled.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt47986Disabled.fir.kt:(249,257): error: Not enough information to infer type variable K
/kt47986Disabled.fir.kt:(249,257): error: Not enough information to infer type argument for 'K'.
compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt47986_2.fir.kt:(187,195): error: Not enough information to infer type variable K
/kt47986_2.fir.kt:(187,195): error: Not enough information to infer type argument for 'K'.
compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt47986_3.fir.kt:(181,189): error: Not enough information to infer type variable K
/kt47986_3.fir.kt:(181,189): error: Not enough information to infer type argument for 'K'.
compiler/testData/diagnostics/tests/inference/builderInference/kt51464.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt51464.fir.kt:(298,307): error: Not enough information to infer type variable R
/kt51464.fir.kt:(298,307): error: Not enough information to infer type argument for 'R'.
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt45461.kt:(245,252): warning: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0
/kt45461.kt:(245,252): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0.
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt45461_12.kt:(296,303): warning: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0
/kt45461_12.kt:(296,303): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0.
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.fir.diag.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
/kt45461_2.kt:(198,201): warning: 'kotlin/Int' is a final type, and thus a value of the type parameter is predetermined
/kt45461_2.kt:(198,201): warning: Type 'kotlin/Int' is final, so the value of the type parameter is predetermined.
/kt45461_2.kt:(253,260): warning: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int). This will become an error in Kotlin 2.0
/kt45461_2.kt:(253,260): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int). This will become an error in Kotlin 2.0.
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.diag.txt
Vendored
+3 -3
View File
@@ -1,5 +1,5 @@
/kt45461_25.fir.kt:(176,180): warning: Unchecked cast: 'kotlin/Nothing?' to 'S'
/kt45461_25.fir.kt:(176,180): warning: Unchecked cast of 'kotlin/Nothing?' to 'S'.
/kt45461_25.fir.kt:(206,209): warning: 'kotlin/Int' is a final type, and thus a value of the type parameter is predetermined
/kt45461_25.fir.kt:(206,209): warning: Type 'kotlin/Int' is final, so the value of the type parameter is predetermined.
/kt45461_25.fir.kt:(276,283): error: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int)
/kt45461_25.fir.kt:(276,283): error: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int).
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_26.fir.diag.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
/kt45461_26.fir.kt:(176,180): warning: Unchecked cast: 'kotlin/Nothing?' to 'S'
/kt45461_26.fir.kt:(176,180): warning: Unchecked cast of 'kotlin/Nothing?' to 'S'.
/kt45461_26.fir.kt:(224,232): warning: 'Out<kotlin/Int>' is a final type, and thus a value of the type parameter is predetermined
/kt45461_26.fir.kt:(224,232): warning: Type 'Out<kotlin/Int>' is final, so the value of the type parameter is predetermined.
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt45461_5.kt:(269,276): warning: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0
/kt45461_5.kt:(269,276): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0.
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.fir.diag.txt
Vendored
+3 -3
View File
@@ -1,5 +1,5 @@
/kt48765.kt:(282,285): warning: Type argument for a type parameter T can't be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Number (multiple incompatible classes). This will become an error in Kotlin 2.0
/kt48765.kt:(282,285): warning: Type argument for type parameter 'T' cannot be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Number (multiple incompatible classes). This will become an error in Kotlin 2.0.
/kt48765.kt:(345,351): warning: 'kotlin/String' is a final type, and thus a value of the type parameter is predetermined
/kt48765.kt:(345,351): warning: Type 'kotlin/String' is final, so the value of the type parameter is predetermined.
/kt48765.kt:(379,383): warning: Unchecked cast: 'kotlin/String' to 'T'
/kt48765.kt:(379,383): warning: Unchecked cast of 'kotlin/String' to 'T'.
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt48935.kt:(240,262): warning: Type argument for a type parameter T has possible incompatible upper bounds: Base, DoesNotImplementBase (final class and interface)
/kt48935.kt:(240,262): warning: Type argument for type parameter 'T' has possible incompatible upper bounds: Base, DoesNotImplementBase (final class and interface).
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/kt49661.fir.kt:(243,244): warning: Type argument for a type parameter T can't be inferred because it has incompatible upper bounds: Foo, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0
/kt49661.fir.kt:(243,244): warning: Type argument for type parameter 'T' cannot be inferred because it has incompatible upper bounds: Foo, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0.
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/selectFromCovariantAndContravariantTypes.kt:(335,344): warning: Type argument for a type parameter V can't be inferred because it has incompatible upper bounds: A, B (multiple incompatible classes). This will become an error in Kotlin 2.0
/selectFromCovariantAndContravariantTypes.kt:(335,344): warning: Type argument for type parameter 'V' cannot be inferred because it has incompatible upper bounds: A, B (multiple incompatible classes). This will become an error in Kotlin 2.0.
compiler/testData/diagnostics/tests/inline/nonPublicMember/kt55179.fir.diag.txt
Vendored
+4 -4
View File
@@ -1,7 +1,7 @@
/kt55179.fir.kt:(217,223): warning: Expected performance impact from inlining is insignificant. Inlining works best for functions with parameters of functional types
/kt55179.fir.kt:(217,223): warning: Expected performance impact from inlining is insignificant. Inlining works best for functions with parameters of function types.
/kt55179.fir.kt:(240,243): error: Non-private inline function 'fun foo(): Unit' cannot access members of private classes: 'constructor(): Foo'
/kt55179.fir.kt:(240,243): error: Non-private inline function 'fun foo(): Unit' cannot access members of private class 'constructor(): Foo'.
/kt55179.fir.kt:(254,263): error: Non-private inline function 'fun foo(): Unit' cannot access members of private classes: 'companion object Companion : Any'
/kt55179.fir.kt:(254,263): error: Non-private inline function 'fun foo(): Unit' cannot access members of private class 'companion object Companion : Any'.
/kt55179.fir.kt:(272,280): error: Non-private inline function 'fun foo(): Unit' cannot access members of private classes: 'fun buildFoo(): Foo'
/kt55179.fir.kt:(272,280): error: Non-private inline function 'fun foo(): Unit' cannot access members of private class 'fun buildFoo(): Foo'.
compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullableWarnings.fir.diag.txt
Vendored
+4 -4
View File
@@ -1,7 +1,7 @@
/main.kt:(98,103): error: Argument type mismatch: actual type is 'V' but '@EnhancedNullability V & Any' was expected
/main.kt:(98,103): error: Argument type mismatch: actual type is 'V', but '@EnhancedNullability V & Any' was expected.
/main.kt:(119,120): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>' but 'ft<@EnhancedNullability kotlin/collections/MutableList<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|() V & Any>, @EnhancedNullability kotlin/collections/List<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|() V & Any>>' was expected
/main.kt:(119,120): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>', but 'ft<@EnhancedNullability kotlin/collections/MutableList<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|() V & Any>, @EnhancedNullability kotlin/collections/List<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|() V & Any>>' was expected.
/main.kt:(133,138): error: Argument type mismatch: actual type is 'V' but '@EnhancedNullability E & Any' was expected
/main.kt:(133,138): error: Argument type mismatch: actual type is 'V', but '@EnhancedNullability E & Any' was expected.
/main.kt:(154,155): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>' but 'ft<@EnhancedNullability kotlin/collections/MutableList<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|() E & Any>, @EnhancedNullability kotlin/collections/List<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|() E & Any>>' was expected
/main.kt:(154,155): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>', but 'ft<@EnhancedNullability kotlin/collections/MutableList<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|() E & Any>, @EnhancedNullability kotlin/collections/List<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|() E & Any>>' was expected.
compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinOverridesDefinitelyNonNullable.fir.diag.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
/main.kt:(72,80): error: 'takeV' overrides nothing
/main.kt:(72,80): error: 'takeV' overrides nothing.
/main.kt:(137,145): error: 'takeVList' overrides nothing
/main.kt:(137,145): error: 'takeVList' overrides nothing.
compiler/testData/diagnostics/tests/multiplatform/annotationMatching/checkDiagnosticFullText.fir.diag.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
/jvm.kt:(86,93): warning: Annotation `@Ann()` is missing on actual declaration.
All annotations from expect `class OnClass : Any` must be present with the same arguments on actual `class OnClass : Any`, otherwise they might behave incorrectly.
All annotations from expect 'class OnClass : Any' must be present with the same arguments on actual 'class OnClass : Any', otherwise they might behave incorrectly.
/jvm.kt:(134,142): warning: Annotation `@Ann()` is missing on actual declaration.
All annotations from expect `fun onMember(): Unit` must be present with the same arguments on actual `fun onMember(): Unit`, otherwise they might behave incorrectly.
All annotations from expect 'fun onMember(): Unit' must be present with the same arguments on actual 'fun onMember(): Unit', otherwise they might behave incorrectly.
/jvm.kt:(213,225): warning: Annotation `@Ann()` is missing on actual declaration.
All annotations from expect `class ViaTypealias : Any` must be present with the same arguments on actual `class ViaTypealiasImpl : Any`, otherwise they might behave incorrectly.
All annotations from expect 'class ViaTypealias : Any' must be present with the same arguments on actual 'class ViaTypealiasImpl : Any', otherwise they might behave incorrectly.
/jvm.kt:(279,295): warning: Annotation `@WithArg(s = String(str))` has different arguments on actual declaration: `@WithArg(s = String(other str))`.
All annotations from expect `fun withDifferentArg(): Unit` must be present with the same arguments on actual `fun withDifferentArg(): Unit`, otherwise they might behave incorrectly.
All annotations from expect 'fun withDifferentArg(): Unit' must be present with the same arguments on actual 'fun withDifferentArg(): Unit', otherwise they might behave incorrectly.
compiler/testData/diagnostics/tests/senselessComparison/complexExpression.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/complexExpression.fir.kt:(75,121): warning: Condition is always 'false'
/complexExpression.fir.kt:(75,121): warning: Condition is always 'false'.
compiler/testData/diagnostics/tests/smartCasts/smartCastOnAlienPropertyFromInvisibleClass.fir.diag.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
/B.kt:(133,134): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module
/B.kt:(133,134): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module.
/B.kt:(265,268): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module
/B.kt:(265,268): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module.
compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/notFirstStatement.fir.kt
Vendored
+3 -3
View File
@@ -7,7 +7,7 @@ import kotlin.contracts.*
fun foo(y: Boolean) {
val x: Int = 42
<!CONTRACT_NOT_ALLOWED("Contract should be the first statement")!>contract<!> {
<!CONTRACT_NOT_ALLOWED("Contract should be the first statement.")!>contract<!> {
returns() implies y
}
}
@@ -23,14 +23,14 @@ inline fun case1(block: () -> Unit) {
block()
}
inline fun case_2(block: () -> Unit) = <!CONTRACT_NOT_ALLOWED("Contracts are only allowed in function body blocks")!>contract<!> {
inline fun case_2(block: () -> Unit) = <!CONTRACT_NOT_ALLOWED("Contracts are only allowed in function body blocks.")!>contract<!> {
callsInPlace(<!USAGE_IS_NOT_INLINABLE!>block<!>, InvocationKind.EXACTLY_ONCE)
}
fun case_3(block: () -> Unit) {
class Class {
fun innerFun(block2: () -> Unit) {
<!CONTRACT_NOT_ALLOWED("Contracts are not allowed for local functions")!>contract<!> {
<!CONTRACT_NOT_ALLOWED("Contracts are not allowed for local functions.")!>contract<!> {
callsInPlace(block2, InvocationKind.EXACTLY_ONCE)
}
block2()
compiler/testData/diagnostics/testsWithStdLib/labelClashes.fir.diag.txt
Vendored
+4 -4
View File
@@ -1,7 +1,7 @@
/labelClashes.fir.kt:(84,87): error: Unresolved reference: inc
/labelClashes.fir.kt:(84,87): error: Unresolved reference 'inc'.
/labelClashes.fir.kt:(151,154): error: Unresolved reference: inc
/labelClashes.fir.kt:(151,154): error: Unresolved reference 'inc'.
/labelClashes.fir.kt:(268,271): error: Unresolved reference: foo
/labelClashes.fir.kt:(268,271): error: Unresolved reference 'foo'.
/labelClashes.fir.kt:(331,334): error: Unresolved reference: foo
/labelClashes.fir.kt:(331,334): error: Unresolved reference 'foo'.
compiler/testData/diagnostics/testsWithStdLib/typealias/upperBoundViolated2.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/upperBoundViolated2.fir.kt:(111,123): error: Type argument is not within its bounds: should be subtype of 'kotlin/collections/List<kotlin/CharSequence>'
/upperBoundViolated2.fir.kt:(111,123): error: Type argument is not within its bounds: should be subtype of 'kotlin/collections/List<kotlin/CharSequence>'.