[FIR] Add JVM_RECORD_NOT_VAL_PARAMETER diagnostic
This commit is contained in:
+1
@@ -67,6 +67,7 @@ object JVM_DIAGNOSTICS_LIST : DiagnosticList("FirJvmErrors") {
|
|||||||
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>()
|
val JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS by error<PsiElement>()
|
||||||
val NON_DATA_CLASS_JVM_RECORD by error<PsiElement>()
|
val NON_DATA_CLASS_JVM_RECORD by error<PsiElement>()
|
||||||
|
val JVM_RECORD_NOT_VAL_PARAMETER by error<PsiElement>()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -56,5 +56,6 @@ object FirJvmErrors {
|
|||||||
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>()
|
val JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS by error0<PsiElement>()
|
||||||
val NON_DATA_CLASS_JVM_RECORD by error0<PsiElement>()
|
val NON_DATA_CLASS_JVM_RECORD by error0<PsiElement>()
|
||||||
|
val JVM_RECORD_NOT_VAL_PARAMETER by error0<PsiElement>()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+11
@@ -6,12 +6,14 @@
|
|||||||
package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration
|
package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration
|
||||||
|
|
||||||
import org.jetbrains.kotlin.config.LanguageFeature
|
import org.jetbrains.kotlin.config.LanguageFeature
|
||||||
|
import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
|
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirRegularClassChecker
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirRegularClassChecker
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.FirProperty
|
||||||
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
|
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
|
||||||
import org.jetbrains.kotlin.fir.declarations.getAnnotationByFqName
|
import org.jetbrains.kotlin.fir.declarations.getAnnotationByFqName
|
||||||
import org.jetbrains.kotlin.fir.declarations.utils.*
|
import org.jetbrains.kotlin.fir.declarations.utils.*
|
||||||
@@ -58,6 +60,15 @@ object FirJvmRecordChecker : FirRegularClassChecker() {
|
|||||||
|
|
||||||
if (declaration.primaryConstructor?.valueParameters?.isEmpty() == true) {
|
if (declaration.primaryConstructor?.valueParameters?.isEmpty() == true) {
|
||||||
reporter.reportOn(annotationSource, FirJvmErrors.JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS, context)
|
reporter.reportOn(annotationSource, FirJvmErrors.JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS, context)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
declaration.declarations.forEach { decl ->
|
||||||
|
if (decl is FirProperty) {
|
||||||
|
if (decl.isVar && decl.source?.kind == FirFakeSourceElementKind.PropertyFromParameter) {
|
||||||
|
reporter.reportOn(decl.source, FirJvmErrors.JVM_RECORD_NOT_VAL_PARAMETER, context)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Vendored
+3
@@ -9,6 +9,9 @@ class BasicRecord(val x: String)
|
|||||||
@JvmRecord
|
@JvmRecord
|
||||||
data class BasicDataRecord(val x: String)
|
data class BasicDataRecord(val x: String)
|
||||||
|
|
||||||
|
@JvmRecord
|
||||||
|
data class VarInConstructor(<!JVM_RECORD_NOT_VAL_PARAMETER!>var x: String<!>)
|
||||||
|
|
||||||
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
|
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
|
||||||
<!ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED!>class BasicRecordWithSuperClass<!>(val x: String) : Record()
|
<!ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED!>class BasicRecordWithSuperClass<!>(val x: String) : Record()
|
||||||
|
|
||||||
|
|||||||
Vendored
+3
@@ -9,6 +9,9 @@ class BasicRecord(val x: String)
|
|||||||
@JvmRecord
|
@JvmRecord
|
||||||
data class BasicDataRecord(val x: String)
|
data class BasicDataRecord(val x: String)
|
||||||
|
|
||||||
|
@JvmRecord
|
||||||
|
data class VarInConstructor(<!JVM_RECORD_NOT_VAL_PARAMETER!>var x: String<!>)
|
||||||
|
|
||||||
@JvmRecord
|
@JvmRecord
|
||||||
class BasicRecordWithSuperClass(val x: String) : <!ILLEGAL_JAVA_LANG_RECORD_SUPERTYPE!>Record()<!>
|
class BasicRecordWithSuperClass(val x: String) : <!ILLEGAL_JAVA_LANG_RECORD_SUPERTYPE!>Record()<!>
|
||||||
|
|
||||||
|
|||||||
+6
@@ -3568,4 +3568,10 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
|
|||||||
token,
|
token,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
add(FirJvmErrors.JVM_RECORD_NOT_VAL_PARAMETER) { firDiagnostic ->
|
||||||
|
JvmRecordNotValParameterImpl(
|
||||||
|
firDiagnostic as FirPsiDiagnostic,
|
||||||
|
token,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
@@ -2485,4 +2485,8 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
|
|||||||
override val diagnosticClass get() = NonDataClassJvmRecord::class
|
override val diagnosticClass get() = NonDataClassJvmRecord::class
|
||||||
}
|
}
|
||||||
|
|
||||||
|
abstract class JvmRecordNotValParameter : KtFirDiagnostic<PsiElement>() {
|
||||||
|
override val diagnosticClass get() = JvmRecordNotValParameter::class
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+7
@@ -4028,3 +4028,10 @@ internal class NonDataClassJvmRecordImpl(
|
|||||||
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal class JvmRecordNotValParameterImpl(
|
||||||
|
firDiagnostic: FirPsiDiagnostic,
|
||||||
|
override val token: ValidityToken,
|
||||||
|
) : KtFirDiagnostic.JvmRecordNotValParameter(), KtAbstractFirDiagnostic<PsiElement> {
|
||||||
|
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user