diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt index 2b367a5bb2a..02b28f85fb5 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt @@ -3779,16 +3779,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert token, ) } - add(FirErrors.AMBIGUOUS_ACTUALS) { firDiagnostic -> - AmbiguousActualsImpl( - firSymbolBuilder.buildSymbol(firDiagnostic.a), - firDiagnostic.b.map { firBasedSymbol -> - firSymbolBuilder.buildSymbol(firBasedSymbol) - }, - firDiagnostic as KtPsiDiagnostic, - token, - ) - } add(FirErrors.AMBIGUOUS_EXPECTS) { firDiagnostic -> AmbiguousExpectsImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a), diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt index 2ed9da48d32..57e91d7c1b4 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt @@ -2642,12 +2642,6 @@ sealed interface KtFirDiagnostic : KtDiagnosticWithPsi { val compatibility: Map>, List> } - interface AmbiguousActuals : KtFirDiagnostic { - override val diagnosticClass get() = AmbiguousActuals::class - val declaration: KtSymbol - val candidates: List - } - interface AmbiguousExpects : KtFirDiagnostic { override val diagnosticClass get() = AmbiguousExpects::class val declaration: KtSymbol diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt index 663ede133e8..8d6403bfcd3 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt @@ -3183,13 +3183,6 @@ internal class ActualWithoutExpectImpl( token: KtLifetimeToken, ) : KtAbstractFirDiagnostic(firDiagnostic, token), KtFirDiagnostic.ActualWithoutExpect -internal class AmbiguousActualsImpl( - override val declaration: KtSymbol, - override val candidates: List, - firDiagnostic: KtPsiDiagnostic, - token: KtLifetimeToken, -) : KtAbstractFirDiagnostic(firDiagnostic, token), KtFirDiagnostic.AmbiguousActuals - internal class AmbiguousExpectsImpl( override val declaration: KtSymbol, override val modules: List, 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 3a603cdb14b..f556b3f07af 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 @@ -1285,11 +1285,6 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") { parameter, Collection>>("compatibility") } - val AMBIGUOUS_ACTUALS by error(PositioningStrategy.INCOMPATIBLE_DECLARATION) { - parameter("declaration") - parameter>("candidates") - } - val AMBIGUOUS_EXPECTS by error(PositioningStrategy.INCOMPATIBLE_DECLARATION) { parameter("declaration") parameter>("modules") 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 ab5ece4c35a..cdeaf2df33d 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 @@ -677,7 +677,6 @@ object FirErrors { val EXPECTED_FUNCTION_SOURCE_WITH_DEFAULT_ARGUMENTS_NOT_FOUND: KtDiagnosticFactory0 by error0() val NO_ACTUAL_FOR_EXPECT: KtDiagnosticFactory3, FirModuleData, Map>, Collection>>> by error3, FirModuleData, Map>, Collection>>>(SourceElementPositioningStrategies.INCOMPATIBLE_DECLARATION) val ACTUAL_WITHOUT_EXPECT: KtDiagnosticFactory2, Map>, Collection>>> by error2, Map>, Collection>>>(SourceElementPositioningStrategies.DECLARATION_NAME_ONLY) - val AMBIGUOUS_ACTUALS: KtDiagnosticFactory2, Collection>> by error2, Collection>>(SourceElementPositioningStrategies.INCOMPATIBLE_DECLARATION) val AMBIGUOUS_EXPECTS: KtDiagnosticFactory2, Collection> by error2, Collection>(SourceElementPositioningStrategies.INCOMPATIBLE_DECLARATION) val NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS: KtDiagnosticFactory2, List, Map>, Collection>>>>> by error2, List, Map>, Collection>>>>>(SourceElementPositioningStrategies.ACTUAL_DECLARATION_NAME) val ACTUAL_MISSING: KtDiagnosticFactory0 by error0(SourceElementPositioningStrategies.ACTUAL_DECLARATION_NAME) diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirNonSuppressibleErrorNames.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirNonSuppressibleErrorNames.kt index a1d73bc2ae0..5959330a90e 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirNonSuppressibleErrorNames.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirNonSuppressibleErrorNames.kt @@ -462,7 +462,6 @@ val FIR_NON_SUPPRESSIBLE_ERROR_NAMES: Set = setOf( "EXPECTED_FUNCTION_SOURCE_WITH_DEFAULT_ARGUMENTS_NOT_FOUND", "NO_ACTUAL_FOR_EXPECT", "ACTUAL_WITHOUT_EXPECT", - "AMBIGUOUS_ACTUALS", "AMBIGUOUS_EXPECTS", "NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS", "ACTUAL_MISSING", diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrorsDefaultMessages.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrorsDefaultMessages.kt index c087c37728f..d840b0e8a1d 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrorsDefaultMessages.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrorsDefaultMessages.kt @@ -74,7 +74,6 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ACTUAL_TYPE_ALIAS import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ACTUAL_TYPE_ALIAS_WITH_USE_SITE_VARIANCE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ACTUAL_WITHOUT_EXPECT import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ADAPTED_CALLABLE_REFERENCE_AGAINST_REFLECTION_TYPE -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.AMBIGUOUS_ACTUALS import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.AMBIGUOUS_ALTERED_ASSIGN import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.AMBIGUOUS_ANNOTATION_ARGUMENT import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.AMBIGUOUS_ANONYMOUS_TYPE_INFERRED @@ -2066,7 +2065,6 @@ object FirErrorsDefaultMessages : BaseDiagnosticRendererFactory() { SYMBOL, FirPlatformIncompatibilityDiagnosticRenderer.TEXT ) - map.put(AMBIGUOUS_ACTUALS, "''{0}'' has several compatible actual declarations in modules {1}.", SYMBOL, SYMBOLS) map.put(AMBIGUOUS_EXPECTS, "''{0}'' has several compatible expect declarations in modules {1}.", SYMBOL, COLLECTION(MODULE_DATA)) map.put( NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS,