[FIR] Fix error message for CONFLICTING_INHERITED_MEMBERS

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt

@@ -2091,7 +2091,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
     }
     add(FirErrors.CONFLICTING_INHERITED_MEMBERS) { firDiagnostic ->
         ConflictingInheritedMembersImpl(
-            firDiagnostic.a.map { firCallableSymbol ->
+            firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a),
+            firDiagnostic.b.map { firCallableSymbol ->
                 firSymbolBuilder.callableBuilder.buildCallableSymbol(firCallableSymbol)
             },
             firDiagnostic as KtPsiDiagnostic,

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt

@@ -1492,6 +1492,7 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
 
     abstract class ConflictingInheritedMembers : KtFirDiagnostic<KtClassOrObject>() {
         override val diagnosticClass get() = ConflictingInheritedMembers::class
+        abstract val owner: KtClassLikeSymbol
         abstract val conflictingDeclarations: List<KtCallableSymbol>
     }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt

@@ -1788,6 +1788,7 @@ internal class VarOverriddenByValByDelegationImpl(
 ) : KtFirDiagnostic.VarOverriddenByValByDelegation(), KtAbstractFirDiagnostic<KtClassOrObject>
 
 internal class ConflictingInheritedMembersImpl(
+    override val owner: KtClassLikeSymbol,
     override val conflictingDeclarations: List<KtCallableSymbol>,
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,