From df6f51b49f43f46c3b39627f754716b1371b82b9 Mon Sep 17 00:00:00 2001
From: Nikolay Lunyak <nikolay.lunyak@jetbrains.com>
Date: Tue, 10 Oct 2023 15:05:47 +0300
Subject: [PATCH] [FIR] Ignore the operator keyword when checking conflicting
 overloads

^KT-59880
---
 .../fir/analysis/checkers/FirRedeclarationPresenter.kt      | 3 ---
 .../tests/dataClasses/conflictingOverloads.fir.kt           | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirRedeclarationPresenter.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirRedeclarationPresenter.kt
index df597748731..0b51b7a4ece 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirRedeclarationPresenter.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirRedeclarationPresenter.kt
@@ -75,9 +75,6 @@ internal object FirRedeclarationPresenter {
 
     fun represent(it: FirNamedFunctionSymbol) = buildString {
         appendRepresentationBeforeCallableId(it)
-        if (it.isOperator) {
-            append("operator ")
-        }
         appendRepresentation(it.callableId)
         appendValueParameters(it)
     }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.fir.kt b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.fir.kt
index 640a34b246d..b09e81dfd81 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.fir.kt
+++ b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.fir.kt
@@ -1,4 +1,4 @@
-data class A(val x: Int, val y: String) {
-    fun component1() = 1
-    fun component2() = 2
+data class <!CONFLICTING_OVERLOADS, CONFLICTING_OVERLOADS!>A(val x: Int, val y: String)<!> {
+    <!CONFLICTING_OVERLOADS!>fun component1()<!> = 1
+    <!CONFLICTING_OVERLOADS!>fun component2()<!> = 2
 }
\ No newline at end of file