[FIR] Add support for ILLEGAL_JVM_NAME diagnostic

2021-07-28 15:40:16 +03:00
parent 00c60bf569
commit 5ebad97cd5
10 changed files with 72 additions and 12 deletions
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.psi.KtAnnotationEntry
 object JVM_DIAGNOSTICS_LIST : DiagnosticList("FirJvmErrors") {
    val DECLARATIONS by object : DiagnosticGroup("Declarations") {
        val CONFLICTING_JVM_DECLARATIONS by error<PsiElement>()
+        val ILLEGAL_JVM_NAME by error<PsiElement>()
    }

    val TYPES by object : DiagnosticGroup("Types") {
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.psi.KtExpression
 object FirJvmErrors {
    // Declarations
    val CONFLICTING_JVM_DECLARATIONS by error0<PsiElement>()
+    val ILLEGAL_JVM_NAME by error0<PsiElement>()

    // Types
    val JAVA_TYPE_MISMATCH by error2<KtExpression, ConeKotlinType, ConeKotlinType>()
@@ -12,6 +12,7 @@ object JvmDeclarationCheckers : DeclarationCheckers() {
    override val basicDeclarationCheckers: Set<FirBasicDeclarationChecker>
        get() = setOf(
            FirJvmExternalDeclarationChecker,
+            FirJvmNameChecker,
        )

    override val classCheckers: Set<FirClassChecker>
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration
+
+import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
+import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirBasicDeclarationChecker
+import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
+import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors
+import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn
+import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.declarations.findArgumentByName
+import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
+import org.jetbrains.kotlin.fir.expressions.FirConstExpression
+import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
+import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
+
+object FirJvmNameChecker : FirBasicDeclarationChecker() {
+    override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
+        if (declaration !is FirAnnotatedDeclaration) {
+            return
+        }
+
+        val jvmName = declaration.findJvmNameAnnotation() ?: return
+        val name = jvmName.findArgumentByName(Name.identifier("name")) ?: return
+
+        if (name.typeRef.coneType != context.session.builtinTypes.stringType.type) {
+            return
+        }
+
+        val value = name.safeAs<FirConstExpression<*>>()?.value as? String ?: return
+
+        if (!Name.isValidIdentifier(value)) {
+            reporter.reportOn(jvmName.source, FirJvmErrors.ILLEGAL_JVM_NAME, context)
+        }
+    }
+
+    private fun FirAnnotatedDeclaration.findJvmNameAnnotation(): FirAnnotationCall? {
+        return annotations.firstOrNull {
+            it.calleeReference.safeAs<FirResolvedNamedReference>()?.name?.toString() == "JvmName"
+        }
+    }
+}
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.DEPRECATED
 import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.ENUM_JVM_RECORD
 import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.FIELD_IN_JVM_RECORD
 import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.ILLEGAL_JAVA_LANG_RECORD_SUPERTYPE
+import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.ILLEGAL_JVM_NAME
 import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.INNER_JVM_RECORD
 import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.JAVA_TYPE_MISMATCH
 import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.JVM_PACKAGE_NAME_CANNOT_BE_EMPTY
@@ -93,6 +94,8 @@ object FirJvmDefaultErrorMessages {
            map.put(DELEGATION_BY_IN_JVM_RECORD, "Delegation is not allowed for @JvmRecord classes")
            map.put(NON_DATA_CLASS_JVM_RECORD, "Only data classes are allowed to be marked as @JvmRecord")
            map.put(ILLEGAL_JAVA_LANG_RECORD_SUPERTYPE, "Classes cannot have explicit 'java.lang.Record' supertype")
+
+            map.put(ILLEGAL_JVM_NAME, "Illegal JVM name")
        }
    }
 }
@@ -1,12 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-@JvmName("")
-fun foo(a: Any) {}
-
-@JvmName(".")
-fun foo() {}
-
-@JvmName("/")
-fun fooSlash() {}
-
-@JvmName("<")
-fun fooLT() {}
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 <!ILLEGAL_JVM_NAME!>@JvmName("")<!>
 fun foo(a: Any) {}
@@ -3664,4 +3664,10 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
            token,
        )
    }
+    add(FirJvmErrors.ILLEGAL_JVM_NAME) { firDiagnostic ->
+        IllegalJvmNameImpl(
+            firDiagnostic as FirPsiDiagnostic,
+            token,
+        )
+    }
 }
@@ -2550,4 +2550,8 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
        override val diagnosticClass get() = IllegalJavaLangRecordSupertype::class
    }

+    abstract class IllegalJvmName : KtFirDiagnostic<PsiElement>() {
+        override val diagnosticClass get() = IllegalJvmName::class
+    }
+
 }
@@ -4138,3 +4138,10 @@ internal class IllegalJavaLangRecordSupertypeImpl(
    override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
 }

+internal class IllegalJvmNameImpl(
+    firDiagnostic: FirPsiDiagnostic,
+    override val token: ValidityToken,
+) : KtFirDiagnostic.IllegalJvmName(), KtAbstractFirDiagnostic<PsiElement> {
+    override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
+}
+