diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/methodOfAnyImplementedInInterface.kt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/methodOfAnyImplementedInInterface.kt index 411419ce10c..a13c1084fb8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/methodOfAnyImplementedInInterface.kt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/methodOfAnyImplementedInInterface.kt @@ -1,7 +1,7 @@ interface A { - override fun toString() = "Hello" - override fun equals(other: Any?) = true - override fun hashCode(): Int { + override fun toString() = "Hello" + override fun equals(other: Any?) = true + override fun hashCode(): Int { return 42; } } @@ -13,9 +13,9 @@ interface B { } interface C { - override operator fun toString(): String = "Rest" - override operator fun equals(other: Any?): Boolean = false - override operator fun hashCode(): Int = 2 + override operator fun toString(): String = "Rest" + override operator fun equals(other: Any?): Boolean = false + override operator fun hashCode(): Int = 2 } interface D { diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt index e78a5b44955..ba946656f57 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt @@ -361,7 +361,7 @@ object DIAGNOSTICS_LIST : DiagnosticList() { val REDECLARATION by error() { parameter>>("conflictingDeclarations") } - val ANY_METHOD_IMPLEMENTED_IN_INTERFACE by error() + val METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE by error() } val INVALID_LOCAL_DECLARATIONS by object : DiagnosticGroup("Invalid local declarations") { diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt index b0f80f3859d..5a00e77e094 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt @@ -235,7 +235,7 @@ object FirErrors { val MANY_COMPANION_OBJECTS by error0(SourceElementPositioningStrategies.COMPANION_OBJECT) val CONFLICTING_OVERLOADS by error1>>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT) val REDECLARATION by error1>>() - val ANY_METHOD_IMPLEMENTED_IN_INTERFACE by error0() + val METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE by error0() // Invalid local declarations val LOCAL_OBJECT_NOT_ALLOWED by error1(SourceElementPositioningStrategies.DECLARATION_NAME) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt index ce276ecf144..06950a91ccd 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt @@ -55,7 +55,7 @@ object FirMethodOfAnyImplementedInInterfaceChecker : FirRegularClassChecker(), F val inspector = getInspector(context) if (inspector.contains(it)) { - reporter.reportOn(it.source, FirErrors.ANY_METHOD_IMPLEMENTED_IN_INTERFACE, context) + reporter.reportOn(it.source, FirErrors.METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE, context) } } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt index 8668b767ed3..3687b9ffbe1 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt @@ -38,7 +38,6 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ANNOTATION_ARGUME import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ANNOTATION_CLASS_MEMBER import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ANNOTATION_PARAMETER_DEFAULT_VALUE_MUST_BE_CONSTANT import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ANONYMOUS_FUNCTION_PARAMETER_WITH_DEFAULT_VALUE -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ANY_METHOD_IMPLEMENTED_IN_INTERFACE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ASSIGNED_VALUE_IS_NEVER_READ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ASSIGN_OPERATOR_AMBIGUITY @@ -125,6 +124,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.LOCAL_INTERFACE_N import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.LOCAL_OBJECT_NOT_ALLOWED import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.MANY_COMPANION_OBJECTS import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.MANY_IMPL_MEMBER_NOT_IMPLEMENTED +import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.MISSING_VAL_ON_ANNOTATION_PARAMETER import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.MULTIPLE_VARARG_PARAMETERS import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.MUST_BE_INITIALIZED @@ -546,7 +546,7 @@ class FirDefaultErrorMessages : DefaultErrorMessages.Extension { map.put(MANY_COMPANION_OBJECTS, "Only one companion object is allowed per class") map.put(CONFLICTING_OVERLOADS, "Conflicting overloads: {0}", SYMBOLS) // * map.put(REDECLARATION, "Conflicting declarations: {0}", SYMBOLS) // * - map.put(ANY_METHOD_IMPLEMENTED_IN_INTERFACE, "An interface may not implement a method of 'Any'") // & + map.put(METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE, "An interface may not implement a method of 'Any'") // & // Invalid local declarations map.put( diff --git a/compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.fir.kt b/compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.fir.kt index e6f1fa81177..d2292d03dbb 100644 --- a/compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.fir.kt +++ b/compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.fir.kt @@ -1,9 +1,9 @@ interface IA { - override fun toString(): String = "IA" + override fun toString(): String = "IA" - override fun equals(other: Any?): Boolean = super.equals(other) + override fun equals(other: Any?): Boolean = super.equals(other) - override fun hashCode(): Int { + override fun hashCode(): Int { return 42; } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyChain.fir.kt b/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyChain.fir.kt deleted file mode 100644 index 841367435a3..00000000000 --- a/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyChain.fir.kt +++ /dev/null @@ -1,13 +0,0 @@ -interface IA - -interface IB : IA { - override fun toString(): String = "IB" -} - -interface IC : IB { - override fun toString(): String = "IC" -} - -interface ID : IC { - override fun toString(): String = "ID" -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyChain.kt b/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyChain.kt index 15a455488ad..a9cdccc7c4f 100644 --- a/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyChain.kt +++ b/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyChain.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL interface IA interface IB : IA { diff --git a/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyDiamond.fir.kt b/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyDiamond.fir.kt deleted file mode 100644 index 71e49f8a213..00000000000 --- a/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyDiamond.fir.kt +++ /dev/null @@ -1,11 +0,0 @@ -interface ILeft { - override fun toString(): String -} - -interface IRight { - override fun toString(): String -} - -interface IDiamond : ILeft, IRight { - override fun toString(): String = "IDiamond" -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyDiamond.kt b/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyDiamond.kt index ddffaeddf01..7de006dd977 100644 --- a/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyDiamond.kt +++ b/compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyDiamond.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL interface ILeft { override fun toString(): String } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt index da043ac62c7..ff3c004a7c0 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt @@ -1025,8 +1025,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert token, ) } - add(FirErrors.ANY_METHOD_IMPLEMENTED_IN_INTERFACE) { firDiagnostic -> - AnyMethodImplementedInInterfaceImpl( + add(FirErrors.METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE) { firDiagnostic -> + MethodOfAnyImplementedInInterfaceImpl( firDiagnostic as FirPsiDiagnostic<*>, token, ) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt index 78f575cb821..8965c8ff594 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt @@ -730,8 +730,8 @@ sealed class KtFirDiagnostic : KtDiagnosticWithPsi { abstract val conflictingDeclarations: List } - abstract class AnyMethodImplementedInInterface : KtFirDiagnostic() { - override val diagnosticClass get() = AnyMethodImplementedInInterface::class + abstract class MethodOfAnyImplementedInInterface : KtFirDiagnostic() { + override val diagnosticClass get() = MethodOfAnyImplementedInInterface::class } abstract class LocalObjectNotAllowed : KtFirDiagnostic() { diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt index 9347c868413..9af26df0c66 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt @@ -1169,10 +1169,10 @@ internal class RedeclarationImpl( override val firDiagnostic: FirPsiDiagnostic<*> by weakRef(firDiagnostic) } -internal class AnyMethodImplementedInInterfaceImpl( +internal class MethodOfAnyImplementedInInterfaceImpl( firDiagnostic: FirPsiDiagnostic<*>, override val token: ValidityToken, -) : KtFirDiagnostic.AnyMethodImplementedInInterface(), KtAbstractFirDiagnostic { +) : KtFirDiagnostic.MethodOfAnyImplementedInInterface(), KtAbstractFirDiagnostic { override val firDiagnostic: FirPsiDiagnostic<*> by weakRef(firDiagnostic) }