azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Add INNER_JVM_RECORD diagnostic

Browse Source
This commit is contained in:
Andrey Zinovyev
2021-08-19 15:07:45 +03:00
committed by Space
parent 49484c4292
commit dbc1e31e67
8 changed files with 25 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirJvmDiagnosticsList.kt
+1
View File
@@ -69,6 +69,7 @@ object JVM_DIAGNOSTICS_LIST : DiagnosticList("FirJvmErrors") {
val NON_DATA_CLASS_JVM_RECORD by error<PsiElement>()
val JVM_RECORD_NOT_VAL_PARAMETER by error<PsiElement>()
val JVM_RECORD_NOT_LAST_VARARG_PARAMETER by error<PsiElement>()
val INNER_JVM_RECORD by error<PsiElement>(PositioningStrategy.INNER_MODIFIER)
}
}
compiler/fir/checkers/checkers.jvm/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/jvm/FirJvmErrors.kt
+1
View File
@@ -58,5 +58,6 @@ object FirJvmErrors {
val NON_DATA_CLASS_JVM_RECORD by error0<PsiElement>()
val JVM_RECORD_NOT_VAL_PARAMETER by error0<PsiElement>()
val JVM_RECORD_NOT_LAST_VARARG_PARAMETER by error0<PsiElement>()
val INNER_JVM_RECORD by error0<PsiElement>(SourceElementPositioningStrategies.INNER_MODIFIER)
}
compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmRecordChecker.kt
+5
View File
@@ -43,6 +43,11 @@ object FirJvmRecordChecker : FirRegularClassChecker() {
return
}
if (declaration.isInner) {
reporter.reportOn(declaration.source, FirJvmErrors.INNER_JVM_RECORD, context)
return
}
if (!declaration.isFinal) {
reporter.reportOn(declaration.source, FirJvmErrors.NON_FINAL_JVM_RECORD, context)
return
compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.fir.kt
Vendored
-56
View File
@@ -1,56 +0,0 @@
// !API_VERSION: 1.5
// !LANGUAGE: +JvmRecordSupport
// SKIP_TXT
// JVM_TARGET: 15
// ENABLE_JVM_PREVIEW
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
class A0
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
class A1 {
constructor()
}
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
class A2()
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
class A3(name: String)
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
class A4(var name: String)
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
class A5(vararg val name: String, y: Int)
@JvmRecord
<!NON_FINAL_JVM_RECORD!>open<!> class A6(val x: String)
@JvmRecord
<!NON_FINAL_JVM_RECORD!>abstract<!> class A7(val x: String)
@JvmRecord
<!NON_FINAL_JVM_RECORD!>sealed<!> class A8(val x: String)
@JvmRecord
<!ENUM_JVM_RECORD!>enum<!> class A9(val x: String) {
X("");
}
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
class A10(
val x: String,
val y: Int,
vararg val z: Double,
)
fun main() {
<!LOCAL_JVM_RECORD!>@JvmRecord<!>
class Local
}
class Outer {
<!NON_DATA_CLASS_JVM_RECORD!>@JvmRecord<!>
inner class Inner(val name: String)
}
compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !API_VERSION: 1.5
// !LANGUAGE: +JvmRecordSupport
// SKIP_TXT
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt
+6
View File
@@ -3580,4 +3580,10 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirJvmErrors.INNER_JVM_RECORD) { firDiagnostic ->
InnerJvmRecordImpl(
firDiagnostic as FirPsiDiagnostic,
token,
)
}
}
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt
+4
View File
@@ -2493,4 +2493,8 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = JvmRecordNotLastVarargParameter::class
}
abstract class InnerJvmRecord : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = InnerJvmRecord::class
}
}
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+7
View File
@@ -4042,3 +4042,10 @@ internal class JvmRecordNotLastVarargParameterImpl(
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}
internal class InnerJvmRecordImpl(
firDiagnostic: FirPsiDiagnostic,
override val token: ValidityToken,
) : KtFirDiagnostic.InnerJvmRecord(), KtAbstractFirDiagnostic<PsiElement> {
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}