From 601c51788725c39abc19236958137f33a2df347b Mon Sep 17 00:00:00 2001 From: Roman Efremov Date: Tue, 17 Oct 2023 14:20:15 +0200 Subject: [PATCH] [FIR] Don't print function's default value parameters ...in `ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT` diagnostic message. ^KT-62585 --- ...rExpectActualAnnotationIncompatibilityDiagnosticRenderers.kt | 1 + .../annotationMatching/defaultValueParametersRendering.fir.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirExpectActualAnnotationIncompatibilityDiagnosticRenderers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirExpectActualAnnotationIncompatibilityDiagnosticRenderers.kt index 5bed7826b48..42fea29c035 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirExpectActualAnnotationIncompatibilityDiagnosticRenderers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirExpectActualAnnotationIncompatibilityDiagnosticRenderers.kt @@ -25,6 +25,7 @@ internal object FirExpectActualAnnotationIncompatibilityDiagnosticRenderers { annotationRenderer = null, modifierRenderer = null, contractRenderer = null, + valueParameterRenderer = FirValueParameterRendererNoDefaultValue(), ).renderElementAsString(it.fir, trim = true) // Write property accessors on the same line as the property .run { replace(Printer.LINE_SEPARATOR, "") } diff --git a/compiler/testData/diagnostics/tests/multiplatform/annotationMatching/defaultValueParametersRendering.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/annotationMatching/defaultValueParametersRendering.fir.kt index 7290ba69336..ec40c3c504b 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/annotationMatching/defaultValueParametersRendering.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/annotationMatching/defaultValueParametersRendering.fir.kt @@ -7,4 +7,4 @@ expect fun foo(p: Array = arrayOf()) // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual fun = R|arrayOf|()): Unit; fun foo(p: Array): Unit; Annotation `@Ann()` is missing on actual declaration")!>foo(p: Array) {} +actual fun = ...): Unit; fun foo(p: Array): Unit; Annotation `@Ann()` is missing on actual declaration")!>foo(p: Array) {}