[FIR] Add JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS diagnostic

This commit is contained in:
Andrey Zinovyev
2021-08-19 12:37:26 +03:00
committed by Space
parent 3fee87a0f3
commit 84f5d6b149
7 changed files with 26 additions and 2 deletions
@@ -65,6 +65,7 @@ object JVM_DIAGNOSTICS_LIST : DiagnosticList("FirJvmErrors") {
val LOCAL_JVM_RECORD by error<PsiElement>() val LOCAL_JVM_RECORD by error<PsiElement>()
val NON_FINAL_JVM_RECORD by error<PsiElement>(PositioningStrategy.NON_FINAL_MODIFIER_OR_NAME) val NON_FINAL_JVM_RECORD by error<PsiElement>(PositioningStrategy.NON_FINAL_MODIFIER_OR_NAME)
val ENUM_JVM_RECORD by error<PsiElement>(PositioningStrategy.ENUM_MODIFIER) val ENUM_JVM_RECORD by error<PsiElement>(PositioningStrategy.ENUM_MODIFIER)
val JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS by error<PsiElement>()
} }
} }
@@ -54,5 +54,6 @@ object FirJvmErrors {
val LOCAL_JVM_RECORD by error0<PsiElement>() val LOCAL_JVM_RECORD by error0<PsiElement>()
val NON_FINAL_JVM_RECORD by error0<PsiElement>(SourceElementPositioningStrategies.NON_FINAL_MODIFIER_OR_NAME) val NON_FINAL_JVM_RECORD by error0<PsiElement>(SourceElementPositioningStrategies.NON_FINAL_MODIFIER_OR_NAME)
val ENUM_JVM_RECORD by error0<PsiElement>(SourceElementPositioningStrategies.ENUM_MODIFIER) val ENUM_JVM_RECORD by error0<PsiElement>(SourceElementPositioningStrategies.ENUM_MODIFIER)
val JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS by error0<PsiElement>()
} }
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.getAnnotationByFqName
import org.jetbrains.kotlin.fir.declarations.utils.isEnumClass import org.jetbrains.kotlin.fir.declarations.utils.isEnumClass
import org.jetbrains.kotlin.fir.declarations.utils.isFinal import org.jetbrains.kotlin.fir.declarations.utils.isFinal
import org.jetbrains.kotlin.fir.declarations.utils.isLocal import org.jetbrains.kotlin.fir.declarations.utils.isLocal
import org.jetbrains.kotlin.fir.declarations.utils.primaryConstructor
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
object FirJvmRecordChecker : FirRegularClassChecker() { object FirJvmRecordChecker : FirRegularClassChecker() {
@@ -38,5 +39,9 @@ object FirJvmRecordChecker : FirRegularClassChecker() {
reporter.reportOn(declaration.source, FirJvmErrors.ENUM_JVM_RECORD, context) reporter.reportOn(declaration.source, FirJvmErrors.ENUM_JVM_RECORD, context)
return return
} }
if (declaration.primaryConstructor?.valueParameters?.isEmpty() == true) {
reporter.reportOn(annotationSource, FirJvmErrors.JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS, context)
}
} }
} }
@@ -4,7 +4,7 @@
// JVM_TARGET: 15 // JVM_TARGET: 15
// ENABLE_JVM_PREVIEW // ENABLE_JVM_PREVIEW
@JvmRecord <!JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS!>@JvmRecord<!>
class A0 class A0
@JvmRecord @JvmRecord
@@ -12,7 +12,7 @@ class A1 {
constructor() constructor()
} }
@JvmRecord <!JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS!>@JvmRecord<!>
class A2() class A2()
@JvmRecord @JvmRecord
@@ -3556,4 +3556,10 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token, token,
) )
} }
add(FirJvmErrors.JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS) { firDiagnostic ->
JvmRecordWithoutPrimaryConstructorParametersImpl(
firDiagnostic as FirPsiDiagnostic,
token,
)
}
} }
@@ -2477,4 +2477,8 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = EnumJvmRecord::class override val diagnosticClass get() = EnumJvmRecord::class
} }
abstract class JvmRecordWithoutPrimaryConstructorParameters : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = JvmRecordWithoutPrimaryConstructorParameters::class
}
} }
@@ -4014,3 +4014,10 @@ internal class EnumJvmRecordImpl(
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
} }
internal class JvmRecordWithoutPrimaryConstructorParametersImpl(
firDiagnostic: FirPsiDiagnostic,
override val token: ValidityToken,
) : KtFirDiagnostic.JvmRecordWithoutPrimaryConstructorParameters(), KtAbstractFirDiagnostic<PsiElement> {
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}