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

[FIR] Remove debug labels in annotation arguments rendering

Browse Source 
...in `ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT` diagnostic message.

^KT-62585
This commit is contained in:
Roman Efremov
2023-10-17 12:34:34 +02:00
committed by Space Team
parent f54a1b5ced
commit 7893624589
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirExpectActualAnnotationIncompatibilityDiagnosticRenderers.kt
+2
View File
@@ -52,6 +52,8 @@ internal object FirExpectActualAnnotationIncompatibilityDiagnosticRenderers {
typeRenderer = ConeTypeRenderer(),
idRenderer = ConeIdShortRenderer(),
referencedSymbolRenderer = FirIdRendererBasedSymbolRenderer(),
resolvedNamedReferenceRenderer = FirResolvedNamedReferenceRenderer(),
resolvedQualifierRenderer = FirResolvedQualifierRenderer(),
).renderElementAsString(ann, trim = true)
}
}
compiler/testData/diagnostics/tests/multiplatform/annotationMatching/annotationArgRendering.fir.kt
Vendored
+2 -2
View File
@@ -14,9 +14,9 @@ expect fun onType(): @Ann2("") Any?
// MODULE: m1-jvm()()(m1-common)
// FILE: jvm.kt
<!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT!>actual annotation class <!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT("annotation class Ann : Annotation; annotation class Ann : Annotation; Annotation `@Target(allowedTargets = vararg(Q|AnnotationTarget|.R|FUNCTION|, Q|AnnotationTarget|.R|CLASS|))` is missing on actual declaration")!>Ann<!><!>
<!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT!>actual annotation class <!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT("annotation class Ann : Annotation; annotation class Ann : Annotation; Annotation `@Target(allowedTargets = vararg(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS))` is missing on actual declaration")!>Ann<!><!>
<!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT!>actual fun <!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT("fun stringConcat(): Unit; fun stringConcat(): Unit; Annotation `@Ann2(s = String(1).R|plus|(String(2)))` is missing on actual declaration")!>stringConcat<!>() {}<!>
<!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT!>actual fun <!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT("fun stringConcat(): Unit; fun stringConcat(): Unit; Annotation `@Ann2(s = String(1).plus(String(2)))` is missing on actual declaration")!>stringConcat<!>() {}<!>
// Not reported in K1, because supported starting from K2
<!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT!>actual fun <!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT("fun onType(): @Ann2(...) Any?; fun onType(): Any?; Annotation `@Ann2(s = String())` is missing on actual declaration")!>onType<!>(): Any? = null<!>