[FIR] Introduce generalized NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS

KvanTTT · Space Team · commit 7e3716c44b93 · 2025-10-07T14:14:35.000Z
and report it on all expect classes not only annotation ones
diff --git a/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDataClassConverters.kt b/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDataClassConverters.kt
@@ -529,6 +529,12 @@ internal val KT_DIAGNOSTIC_CONVERTER = KaDiagnosticConverterBuilder.buildConvert
             token,
         )
     }
+    add(FirErrors.NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS) { firDiagnostic ->
+        NoImplicitDefaultConstructorOnExpectClassImpl(
+            firDiagnostic as KtPsiDiagnostic,
+            token,
+        )
+    }
     add(FirErrors.FUNCTION_CALL_EXPECTED) { firDiagnostic ->
         FunctionCallExpectedImpl(
             firDiagnostic.a,
@@ -1457,12 +1463,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KaDiagnosticConverterBuilder.buildConvert
             token,
         )
     }
-    add(FirErrors.NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS) { firDiagnostic ->
-        NoImplicitDefaultConstructorOnExpectAnnotationClassImpl(
-            firDiagnostic as KtPsiDiagnostic,
-            token,
-        )
-    }
     add(FirJsErrors.JS_MODULE_PROHIBITED_ON_VAR) { firDiagnostic ->
         JsModuleProhibitedOnVarImpl(
             firDiagnostic as KtPsiDiagnostic,
diff --git a/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnostics.kt b/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnostics.kt
@@ -415,6 +415,10 @@ sealed interface KaFirDiagnostic<PSI : PsiElement> : KaDiagnosticWithPsi<PSI> {
         override val diagnosticClass get() = NoConstructor::class
     }
 
+    interface NoImplicitDefaultConstructorOnExpectClass : KaFirDiagnostic<PsiElement> {
+        override val diagnosticClass get() = NoImplicitDefaultConstructorOnExpectClass::class
+    }
+
     interface FunctionCallExpected : KaFirDiagnostic<PsiElement> {
         override val diagnosticClass get() = FunctionCallExpected::class
         val functionName: String
@@ -1043,10 +1047,6 @@ sealed interface KaFirDiagnostic<PSI : PsiElement> : KaDiagnosticWithPsi<PSI> {
         override val diagnosticClass get() = DslMarkerPropagatesToMany::class
     }
 
-    interface NoImplicitDefaultConstructorOnExpectAnnotationClass : KaFirDiagnostic<KtAnnotationEntry> {
-        override val diagnosticClass get() = NoImplicitDefaultConstructorOnExpectAnnotationClass::class
-    }
-
     interface JsModuleProhibitedOnVar : KaFirDiagnostic<KtElement> {
         override val diagnosticClass get() = JsModuleProhibitedOnVar::class
     }
diff --git a/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnosticsImpl.kt b/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnosticsImpl.kt
@@ -484,6 +484,11 @@ internal class NoConstructorImpl(
     token: KaLifetimeToken,
 ) : KaAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KaFirDiagnostic.NoConstructor
 
+internal class NoImplicitDefaultConstructorOnExpectClassImpl(
+    firDiagnostic: KtPsiDiagnostic,
+    token: KaLifetimeToken,
+) : KaAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KaFirDiagnostic.NoImplicitDefaultConstructorOnExpectClass
+
 internal class FunctionCallExpectedImpl(
     override val functionName: String,
     override val hasValueParameters: Boolean,
@@ -1253,11 +1258,6 @@ internal class DslMarkerPropagatesToManyImpl(
     token: KaLifetimeToken,
 ) : KaAbstractFirDiagnostic<KtAnnotationEntry>(firDiagnostic, token), KaFirDiagnostic.DslMarkerPropagatesToMany
 
-internal class NoImplicitDefaultConstructorOnExpectAnnotationClassImpl(
-    firDiagnostic: KtPsiDiagnostic,
-    token: KaLifetimeToken,
-) : KaAbstractFirDiagnostic<KtAnnotationEntry>(firDiagnostic, token), KaFirDiagnostic.NoImplicitDefaultConstructorOnExpectAnnotationClass
-
 internal class JsModuleProhibitedOnVarImpl(
     firDiagnostic: KtPsiDiagnostic,
     token: KaLifetimeToken,
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
@@ -207,6 +207,7 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
     val CALL_RESOLUTION by object : DiagnosticGroup("Call resolution") {
         val CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS by error<KtExpression>()
         val NO_CONSTRUCTOR by error<PsiElement>(PositioningStrategy.VALUE_ARGUMENTS_LIST)
+        val NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS by error<PsiElement>(PositioningStrategy.SUPERTYPES_LIST)
         val FUNCTION_CALL_EXPECTED by error<PsiElement>(PositioningStrategy.REFERENCED_NAME_BY_QUALIFIED) {
             parameter<String>("functionName")
             parameter<Boolean>("hasValueParameters")
@@ -485,8 +486,6 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
         val IGNORABILITY_ANNOTATIONS_WITH_CHECKER_DISABLED by error<KtAnnotationEntry>()
 
         val DSL_MARKER_PROPAGATES_TO_MANY by warning<KtAnnotationEntry>()
-
-        val NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS by error<KtAnnotationEntry>()
     }
 
     val OPT_IN by object : DiagnosticGroup("OptIn") {
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
@@ -224,6 +224,7 @@ object FirErrors : KtDiagnosticsContainer() {
     // Call resolution
     val CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS: KtDiagnosticFactory0 = KtDiagnosticFactory0("CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS", ERROR, SourceElementPositioningStrategies.DEFAULT, KtExpression::class, getRendererFactory())
     val NO_CONSTRUCTOR: KtDiagnosticFactory0 = KtDiagnosticFactory0("NO_CONSTRUCTOR", ERROR, SourceElementPositioningStrategies.VALUE_ARGUMENTS_LIST, PsiElement::class, getRendererFactory())
+    val NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS: KtDiagnosticFactory0 = KtDiagnosticFactory0("NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS", ERROR, SourceElementPositioningStrategies.SUPERTYPES_LIST, PsiElement::class, getRendererFactory())
     val FUNCTION_CALL_EXPECTED: KtDiagnosticFactory2<String, Boolean> = KtDiagnosticFactory2("FUNCTION_CALL_EXPECTED", ERROR, SourceElementPositioningStrategies.REFERENCED_NAME_BY_QUALIFIED, PsiElement::class, getRendererFactory())
     val ILLEGAL_SELECTOR: KtDiagnosticFactory0 = KtDiagnosticFactory0("ILLEGAL_SELECTOR", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
     val NO_RECEIVER_ALLOWED: KtDiagnosticFactory0 = KtDiagnosticFactory0("NO_RECEIVER_ALLOWED", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
@@ -364,7 +365,6 @@ object FirErrors : KtDiagnosticsContainer() {
     val ANNOTATIONS_ON_BLOCK_LEVEL_EXPRESSION_ON_THE_SAME_LINE: KtDiagnosticFactory0 = KtDiagnosticFactory0("ANNOTATIONS_ON_BLOCK_LEVEL_EXPRESSION_ON_THE_SAME_LINE", WARNING, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
     val IGNORABILITY_ANNOTATIONS_WITH_CHECKER_DISABLED: KtDiagnosticFactory0 = KtDiagnosticFactory0("IGNORABILITY_ANNOTATIONS_WITH_CHECKER_DISABLED", ERROR, SourceElementPositioningStrategies.DEFAULT, KtAnnotationEntry::class, getRendererFactory())
     val DSL_MARKER_PROPAGATES_TO_MANY: KtDiagnosticFactory0 = KtDiagnosticFactory0("DSL_MARKER_PROPAGATES_TO_MANY", WARNING, SourceElementPositioningStrategies.DEFAULT, KtAnnotationEntry::class, getRendererFactory())
-    val NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS: KtDiagnosticFactory0 = KtDiagnosticFactory0("NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS", ERROR, SourceElementPositioningStrategies.DEFAULT, KtAnnotationEntry::class, getRendererFactory())
 
     // OptIn
     val OPT_IN_USAGE: KtDiagnosticFactory2<ClassId, String> = KtDiagnosticFactory2("OPT_IN_USAGE", WARNING, SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED, PsiElement::class, getRendererFactory())
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
@@ -65,6 +65,7 @@ val FIR_NON_SUPPRESSIBLE_ERROR_NAMES: Set<String> = setOf(
     "MISSING_DEPENDENCY_IN_INFERRED_TYPE_ANNOTATION_ERROR",
     "CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS",
     "NO_CONSTRUCTOR",
+    "NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS",
     "FUNCTION_CALL_EXPECTED",
     "ILLEGAL_SELECTOR",
     "NO_RECEIVER_ALLOWED",
@@ -181,7 +182,6 @@ val FIR_NON_SUPPRESSIBLE_ERROR_NAMES: Set<String> = setOf(
     "NON_INTERNAL_PUBLISHED_API",
     "NON_SOURCE_ANNOTATION_ON_INLINED_LAMBDA_EXPRESSION",
     "IGNORABILITY_ANNOTATIONS_WITH_CHECKER_DISABLED",
-    "NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS",
     "JS_MODULE_PROHIBITED_ON_VAR",
     "JS_MODULE_PROHIBITED_ON_NON_NATIVE",
     "NESTED_JS_MODULE_PROHIBITED",
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
@@ -773,7 +773,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.MISSING_DEPENDENC
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.MISSING_DEPENDENCY_IN_INFERRED_TYPE_ANNOTATION
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NAME_BASED_DESTRUCTURING_UNDERSCORE_WITHOUT_RENAMING
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_FINAL_PROPERTY_WITH_EXPLICIT_BACKING_FIELD
-import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS
+import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.OVERRIDING_IGNORABLE_WITH_MUST_USE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.PROPERTY_WITH_EXPLICIT_FIELD_AND_ACCESSORS
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETER_ON_LHS_OF_DOT
@@ -1426,8 +1426,8 @@ object FirErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
             """.trimIndent(),
         )
         map.put(
-            NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS,
-            """No implicit default constructor on expect annotation class."""
+            NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS,
+            """Expect class does not declare any constructors."""
         )
 
         // OptIn
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
@@ -93,7 +93,7 @@ private fun ConeDiagnostic.toKtDiagnostic(
     is ConeFunctionCallExpectedError -> FirErrors.FUNCTION_CALL_EXPECTED.createOn(source, this.name.asString(), this.hasValueParameters, session)
     is ConeFunctionExpectedError -> FirErrors.FUNCTION_EXPECTED.createOn(source, this.expression, this.type, session)
     is ConeNoConstructorError -> FirErrors.NO_CONSTRUCTOR.createOn(callOrAssignmentSource ?: source, session)
-    is ConeNoImplicitDefaultConstructorOnExpectAnnotationClass -> FirErrors.NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS.createOn(callOrAssignmentSource ?: source, session)
+    is ConeNoImplicitDefaultConstructorOnExpectClass -> FirErrors.NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS.createOn(callOrAssignmentSource ?: source, session)
     is ConeResolutionToClassifierError -> when (this.candidateSymbol.classKind) {
         ClassKind.INTERFACE -> FirErrors.INTERFACE_AS_FUNCTION.createOn(source, this.candidateSymbol, session)
         ClassKind.CLASS -> when {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirCallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirCallResolver.kt
@@ -653,7 +653,7 @@ class FirCallResolver(
             } else {
                 buildReferenceWithErrorCandidate(
                     callInfo,
-                    if (annotationClassSymbol.isExpect) ConeNoImplicitDefaultConstructorOnExpectAnnotationClass else ConeNoConstructorError,
+                    if (annotationClassSymbol.isExpect) ConeNoImplicitDefaultConstructorOnExpectClass else ConeNoConstructorError,
                     reference.source
                 )
             }
@@ -844,8 +844,14 @@ class FirCallResolver(
                             explicitReceiver.value?.toString() ?: "",
                             explicitReceiver.resolvedType,
                         )
-                    reference is FirSuperReference && (reference.superTypeRef.firClassLike(session) as? FirClass)?.isInterface == true -> ConeNoConstructorError
-                    else -> ConeUnresolvedNameError(name, operatorToken, explicitReceiver?.resolvedType)
+                    else -> {
+                        val classLikeBySuperRef = (reference as? FirSuperReference)?.superTypeRef?.firClassLike(session) as? FirClass
+                        when {
+                            classLikeBySuperRef?.isInterface == true -> ConeNoConstructorError
+                            classLikeBySuperRef?.isExpect == true -> ConeNoImplicitDefaultConstructorOnExpectClass
+                            else -> ConeUnresolvedNameError(name, operatorToken, explicitReceiver?.resolvedType)
+                        }
+                    }
                 }
             }
 
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt
@@ -92,8 +92,8 @@ object ConeNoConstructorError : ConeDiagnostic {
     override val reason: String get() = "This type does not have a constructor"
 }
 
-object ConeNoImplicitDefaultConstructorOnExpectAnnotationClass : ConeDiagnostic {
-    override val reason: String get() = "No implicit default constructor on expect annotation class"
+object ConeNoImplicitDefaultConstructorOnExpectClass : ConeDiagnostic {
+    override val reason: String get() = "No implicit default constructor on expect class"
 }
 
 object ConeContractShouldBeFirstStatement : ConeDiagnostic {
diff --git a/compiler/testData/cli/metadata/inheritorOfExpectSealedClass.out b/compiler/testData/cli/metadata/inheritorOfExpectSealedClass.out
@@ -7,7 +7,7 @@ actual sealed class Base
 compiler/testData/cli/metadata/inheritorOfExpectSealedClass/common-2.kt:1:21: error: base: expect and corresponding actual are declared in the same module.
 actual sealed class Base
                     ^^^^
-compiler/testData/cli/metadata/inheritorOfExpectSealedClass/common-3.kt:1:17: error: unresolved reference '<init>'.
+compiler/testData/cli/metadata/inheritorOfExpectSealedClass/common-3.kt:1:17: error: expect class does not declare any constructors.
 class Derived : Base()
-                ^^^^
+                ^^^^^^
 COMPILATION_ERROR
diff --git a/compiler/testData/diagnostics/nativeTests/multiplatform/overrideInit_expectAnnotation.fir.kt b/compiler/testData/diagnostics/nativeTests/multiplatform/overrideInit_expectAnnotation.fir.kt
@@ -16,13 +16,13 @@ expect annotation class MyOverrideInit
 
 class DoesNotOverride : NSAssertionHandler {
     <!CONSTRUCTOR_DOES_NOT_OVERRIDE_ANY_SUPER_CONSTRUCTOR!>@OptIn(kotlinx.cinterop.BetaInteropApi::class)
-    @<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>MyOverrideInit<!>
+    <!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@MyOverrideInit<!>
     constructor(x: Int) { }<!>
 }
 
 class OverridesOverriden : NSString {
     <!CONSTRUCTOR_OVERRIDES_ALREADY_OVERRIDDEN_OBJC_INITIALIZER!>@OptIn(kotlinx.cinterop.BetaInteropApi::class)
-    @<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>MyOverrideInit<!>
+    <!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@MyOverrideInit<!>
     constructor(coder: NSCoder) { }<!>
 
     @Suppress("OVERRIDE_DEPRECATION")
diff --git a/compiler/testData/diagnostics/nativeTests/multiplatform/overrideInit_expectAnnotation.ll.kt b/compiler/testData/diagnostics/nativeTests/multiplatform/overrideInit_expectAnnotation.ll.kt
@@ -19,13 +19,13 @@ expect annotation class MyOverrideInit
 
 class DoesNotOverride : NSAssertionHandler {
     @OptIn(kotlinx.cinterop.BetaInteropApi::class)
-    @<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>MyOverrideInit<!>
+    <!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@MyOverrideInit<!>
     constructor(x: Int) { }
 }
 
 class OverridesOverriden : NSString {
     @OptIn(kotlinx.cinterop.BetaInteropApi::class)
-    @<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>MyOverrideInit<!>
+    <!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@MyOverrideInit<!>
     constructor(coder: NSCoder) { }
 
     @Suppress("OVERRIDE_DEPRECATION")
diff --git a/compiler/testData/diagnostics/tests/multiplatform/errorWhenUseExpectAnnWithoutDefaultConstructor.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/errorWhenUseExpectAnnWithoutDefaultConstructor.fir.kt
@@ -5,12 +5,12 @@
 
 <!NO_ACTUAL_FOR_EXPECT{JVM}!>expect<!> annotation class Ann
 
-<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>@Ann<!>
+<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@Ann<!>
 fun commonFoo() {}
 
 // MODULE: m1-jvm()()(m1-common)
 
-<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>@Ann<!>
+<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@Ann<!>
 fun platformFoo() {}
 
 /* GENERATED_FIR_TAGS: annotationDeclaration, expect, functionDeclaration */
diff --git a/compiler/testData/diagnostics/tests/multiplatform/errorWhenUseExpectAnnWithoutDefaultConstructor.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/errorWhenUseExpectAnnWithoutDefaultConstructor.ll.kt
@@ -5,12 +5,12 @@
 
 expect annotation class Ann
 
-<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>@Ann<!>
+<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@Ann<!>
 fun commonFoo() {}
 
 // MODULE: m1-jvm()()(m1-common)
 
-<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>@Ann<!>
+<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@Ann<!>
 fun platformFoo() {}
 
 /* GENERATED_FIR_TAGS: annotationDeclaration, expect, functionDeclaration */
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.fir.kt
@@ -11,7 +11,7 @@ expect annotation class Foo5()
 expect annotation class Foo6()
 <!EXPECT_ACTUAL_IR_INCOMPATIBILITY{JVM}!>expect<!> annotation class Foo7<!EXPECT_ACTUAL_IR_MISMATCH{JVM}!>()<!>
 
-<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>@Foo1<!>
+<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@Foo1<!>
 fun foo() {}
 
 @Foo5
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.ll.kt
@@ -11,7 +11,7 @@ expect annotation class Foo5()
 expect annotation class Foo6()
 expect annotation class Foo7()
 
-<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_ANNOTATION_CLASS!>@Foo1<!>
+<!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>@Foo1<!>
 fun foo() {}
 
 @Foo5
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt
@@ -5,7 +5,7 @@
 
 expect open class A
 expect class B : A
-open <!UNRESOLVED_REFERENCE!>class C<!> : <!SUPERTYPE_NOT_INITIALIZED!>A<!>
+open class C : <!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS, SUPERTYPE_NOT_INITIALIZED!>A<!>
 
 // MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/noImplicitDefaultConstructorOnExpectClass.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/noImplicitDefaultConstructorOnExpectClass.fir.kt
@@ -5,7 +5,7 @@
 
 <!NO_ACTUAL_FOR_EXPECT{JVM}!>expect<!> open class A
 
-class C : <!UNRESOLVED_REFERENCE!>A<!>() {
+class C : <!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>A()<!> {
     fun f() {
         <!EXPECT_CLASS_AS_FUNCTION!>A<!>()
     }
@@ -18,7 +18,7 @@ class E : I<!NO_CONSTRUCTOR!>()<!>
 
 // MODULE: m1-jvm()()(m1-common)
 
-class D : <!UNRESOLVED_REFERENCE!>A<!>() {
+class D : <!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>A()<!> {
     fun g() {
         <!EXPECT_CLASS_AS_FUNCTION!>A<!>()
     }
diff --git a/compiler/testData/diagnostics/tests/multiplatform/noImplicitDefaultConstructorOnExpectClass.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/noImplicitDefaultConstructorOnExpectClass.ll.kt
@@ -5,7 +5,7 @@
 
 expect open class A
 
-class C : <!UNRESOLVED_REFERENCE!>A<!>() {
+class C : <!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>A()<!> {
     fun f() {
         <!EXPECT_CLASS_AS_FUNCTION!>A<!>()
     }
@@ -18,7 +18,7 @@ class E : I<!NO_CONSTRUCTOR!>()<!>
 
 // MODULE: m1-jvm()()(m1-common)
 
-class D : <!UNRESOLVED_REFERENCE!>A<!>() {
+class D : <!NO_IMPLICIT_DEFAULT_CONSTRUCTOR_ON_EXPECT_CLASS!>A()<!> {
     fun g() {
         <!EXPECT_CLASS_AS_FUNCTION!>A<!>()
     }

Original file line number	Diff line number	Diff line change
`@@ -415,6 +415,10 @@ sealed interface KaFirDiagnostic<PSI : PsiElement> : KaDiagnosticWithPsi<PSI> {`
`415`	`415`	`override val diagnosticClass get() = NoConstructor::class`
`416`	`416`	`}`
`417`	`417`
	`418`	`+ interface NoImplicitDefaultConstructorOnExpectClass : KaFirDiagnostic<PsiElement> {`
	`419`	`+ override val diagnosticClass get() = NoImplicitDefaultConstructorOnExpectClass::class`
	`420`	`+ }`
	`421`	`+`
`418`	`422`	`interface FunctionCallExpected : KaFirDiagnostic<PsiElement> {`
`419`	`423`	`override val diagnosticClass get() = FunctionCallExpected::class`
`420`	`424`	`val functionName: String`
`@@ -1043,10 +1047,6 @@ sealed interface KaFirDiagnostic<PSI : PsiElement> : KaDiagnosticWithPsi<PSI> {`
`1043`	`1047`	`override val diagnosticClass get() = DslMarkerPropagatesToMany::class`
`1044`	`1048`	`}`
`1045`	`1049`
`1046`		`- interface NoImplicitDefaultConstructorOnExpectAnnotationClass : KaFirDiagnostic<KtAnnotationEntry> {`
`1047`		`- override val diagnosticClass get() = NoImplicitDefaultConstructorOnExpectAnnotationClass::class`
`1048`		`- }`
`1049`		`-`
`1050`	`1050`	`interface JsModuleProhibitedOnVar : KaFirDiagnostic<KtElement> {`
`1051`	`1051`	`override val diagnosticClass get() = JsModuleProhibitedOnVar::class`
`1052`	`1052`	`}`
Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ class FirCallResolver(`
`653`	`653`	`} else {`
`654`	`654`	`buildReferenceWithErrorCandidate(`
`655`	`655`	`callInfo,`
`656`		`- if (annotationClassSymbol.isExpect) ConeNoImplicitDefaultConstructorOnExpectAnnotationClass else ConeNoConstructorError,`
	`656`	`+ if (annotationClassSymbol.isExpect) ConeNoImplicitDefaultConstructorOnExpectClass else ConeNoConstructorError,`
`657`	`657`	`reference.source`
`658`	`658`	`)`
`659`	`659`	`}`
`@@ -844,8 +844,14 @@ class FirCallResolver(`
`844`	`844`	`explicitReceiver.value?.toString() ?: "",`
`845`	`845`	`explicitReceiver.resolvedType,`
`846`	`846`	`)`
`847`		`- reference is FirSuperReference && (reference.superTypeRef.firClassLike(session) as? FirClass)?.isInterface == true -> ConeNoConstructorError`
`848`		`- else -> ConeUnresolvedNameError(name, operatorToken, explicitReceiver?.resolvedType)`
	`847`	`+ else -> {`
	`848`	`+ val classLikeBySuperRef = (reference as? FirSuperReference)?.superTypeRef?.firClassLike(session) as? FirClass`
	`849`	`+ when {`
	`850`	`+ classLikeBySuperRef?.isInterface == true -> ConeNoConstructorError`
	`851`	`+ classLikeBySuperRef?.isExpect == true -> ConeNoImplicitDefaultConstructorOnExpectClass`
	`852`	`+ else -> ConeUnresolvedNameError(name, operatorToken, explicitReceiver?.resolvedType)`
	`853`	`+ }`
	`854`	`+ }`
`849`	`855`	`}`
`850`	`856`	`}`
`851`	`857`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ object ConeNoConstructorError : ConeDiagnostic {`
`92`	`92`	`override val reason: String get() = "This type does not have a constructor"`
`93`	`93`	`}`
`94`	`94`
`95`		`-object ConeNoImplicitDefaultConstructorOnExpectAnnotationClass : ConeDiagnostic {`
`96`		`- override val reason: String get() = "No implicit default constructor on expect annotation class"`
	`95`	`+object ConeNoImplicitDefaultConstructorOnExpectClass : ConeDiagnostic {`
	`96`	`+ override val reason: String get() = "No implicit default constructor on expect class"`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`object ConeContractShouldBeFirstStatement : ConeDiagnostic {`