diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.fir.diag.txt index 38b45e4f767..15a8f326c07 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.fir.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.fir.diag.txt @@ -1,3 +1,3 @@ -/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 a future release - /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:(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 a future release diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.diag.txt index 68eecabc4c6..8fc60f3995d 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.diag.txt @@ -1,5 +1,5 @@ /kt45461_25.fir.kt:(176,180): warning: Unchecked cast: kotlin/Nothing? to S -/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:(206,209): warning: 'kotlin/Int' is a final type, and thus a 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) diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.fir.diag.txt index 0ebb167bbf7..c85d29a1d39 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.fir.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.fir.diag.txt @@ -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 a future release -/kt48765.kt:(379,383): warning: Unchecked cast: kotlin/String to T - /kt48765.kt:(345,351): warning: 'kotlin/String' is a final type, and thus a value of the type parameter is predetermined + +/kt48765.kt:(379,383): warning: Unchecked cast: kotlin/String to T diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt index 65c312d72e1..3589b343b23 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt @@ -342,7 +342,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes if (DiagnosticsDirectives.RENDER_DIAGNOSTICS_FULL_TEXT !in module.directives) return if (diagnostics.isEmpty()) return - val reportedDiagnostics = diagnostics.map { + val reportedDiagnostics = diagnostics.sortedBy { it.textRanges.first().startOffset }.map { val severity = AnalyzerWithCompilerReport.convertSeverity(it.severity).toString().toLowerCaseAsciiOnly() val message = RootDiagnosticRendererFactory(it).render(it) "/${file.name}:${it.textRanges.first()}: $severity: $message" diff --git a/plugins/assign-plugin/testData/diagnostics/incorrectUsage.fir.diag.txt b/plugins/assign-plugin/testData/diagnostics/incorrectUsage.fir.diag.txt index 42cbc4e86ea..542bd366c0a 100644 --- a/plugins/assign-plugin/testData/diagnostics/incorrectUsage.fir.diag.txt +++ b/plugins/assign-plugin/testData/diagnostics/incorrectUsage.fir.diag.txt @@ -1,7 +1,7 @@ -/incorrectUsage.fir.kt:(396,397): error: - /incorrectUsage.fir.kt:(390,395): error: None of the following functions are applicable: [fun assign(v: String): Unit, fun assign(v: StringProperty): Unit] -/incorrectUsage.fir.kt:(542,543): error: +/incorrectUsage.fir.kt:(396,397): error: /incorrectUsage.fir.kt:(536,541): error: None of the following functions are applicable: [fun assign(v: String): Unit, fun assign(v: StringProperty): Unit] + +/incorrectUsage.fir.kt:(542,543): error: diff --git a/plugins/assign-plugin/testData/diagnostics/otherOperators.fir.diag.txt b/plugins/assign-plugin/testData/diagnostics/otherOperators.fir.diag.txt index f7f05d67786..10850907428 100644 --- a/plugins/assign-plugin/testData/diagnostics/otherOperators.fir.diag.txt +++ b/plugins/assign-plugin/testData/diagnostics/otherOperators.fir.diag.txt @@ -22,8 +22,12 @@ /otherOperators.fir.kt:(1057,1066): error: No set method providing array access +/otherOperators.fir.kt:(1128,1129): error: Too many arguments for public final fun /StringProperty.get(): R|kotlin/String| + /otherOperators.fir.kt:(1131,1133): error: Unresolved reference: += +/otherOperators.fir.kt:(1177,1178): error: Too many arguments for public final fun /StringProperty.get(): R|kotlin/String| + /otherOperators.fir.kt:(1180,1182): error: Unresolved reference: += /otherOperators.fir.kt:(1325,1328): error: No set method providing array access @@ -31,7 +35,3 @@ /otherOperators.fir.kt:(1431,1437): error: Variable expected /otherOperators.fir.kt:(1477,1483): error: Variable expected - -/otherOperators.fir.kt:(1128,1129): error: Too many arguments for public final fun /StringProperty.get(): R|kotlin/String| - -/otherOperators.fir.kt:(1177,1178): error: Too many arguments for public final fun /StringProperty.get(): R|kotlin/String|