[FIR JS] Support NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE

2023-01-04 16:50:15 +02:00
parent 5b3a73f7cd
commit 85bcef537c
14 changed files with 80 additions and 19 deletions
@@ -4829,6 +4829,13 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
            token,
        )
    }
+    add(FirJsErrors.NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE) { firDiagnostic ->
+        NonExternalDeclarationInInappropriateFileImpl(
+            firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a),
+            firDiagnostic as KtPsiDiagnostic,
+            token,
+        )
+    }
    add(FirJsErrors.DELEGATION_BY_DYNAMIC) { firDiagnostic ->
        DelegationByDynamicImpl(
            firDiagnostic as KtPsiDiagnostic,
@@ -3356,6 +3356,11 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
        override val diagnosticClass get() = NonAbstractMemberOfExternalInterface::class
    }

+    abstract class NonExternalDeclarationInInappropriateFile : KtFirDiagnostic<KtElement>() {
+        override val diagnosticClass get() = NonExternalDeclarationInInappropriateFile::class
+        abstract val type: KtType
+    }
+
    abstract class DelegationByDynamic : KtFirDiagnostic<KtElement>() {
        override val diagnosticClass get() = DelegationByDynamic::class
    }
@@ -4063,6 +4063,12 @@ internal class NonAbstractMemberOfExternalInterfaceImpl(
    override val token: KtLifetimeToken,
 ) : KtFirDiagnostic.NonAbstractMemberOfExternalInterface(), KtAbstractFirDiagnostic<KtExpression>

+internal class NonExternalDeclarationInInappropriateFileImpl(
+    override val type: KtType,
+    override val firDiagnostic: KtPsiDiagnostic,
+    override val token: KtLifetimeToken,
+) : KtFirDiagnostic.NonExternalDeclarationInInappropriateFile(), KtAbstractFirDiagnostic<KtElement>
+
 internal class DelegationByDynamicImpl(
    override val firDiagnostic: KtPsiDiagnostic,
    override val token: KtLifetimeToken,
@@ -76,6 +76,9 @@ object JS_DIAGNOSTICS_LIST : DiagnosticList("FirJsErrors") {
        val INLINE_CLASS_IN_EXTERNAL_DECLARATION by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
        val EXTENSION_FUNCTION_IN_EXTERNAL_DECLARATION by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
        val NON_ABSTRACT_MEMBER_OF_EXTERNAL_INTERFACE by error<KtExpression>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
+        val NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) {
+            parameter<ConeKotlinType>("type")
+        }
    }

    val DYNAMICS by object : DiagnosticGroup("Dynamics") {
@@ -67,6 +67,7 @@ object FirJsErrors {
    val INLINE_CLASS_IN_EXTERNAL_DECLARATION by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
    val EXTENSION_FUNCTION_IN_EXTERNAL_DECLARATION by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
    val NON_ABSTRACT_MEMBER_OF_EXTERNAL_INTERFACE by error0<KtExpression>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
+    val NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE by error1<KtElement, ConeKotlinType>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)

    // Dynamics
    val DELEGATION_BY_DYNAMIC by error0<KtElement>()
@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NATIVE_SETTE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NESTED_CLASS_IN_EXTERNAL_INTERFACE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NESTED_EXTERNAL_DECLARATION
 import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NON_ABSTRACT_MEMBER_OF_EXTERNAL_INTERFACE
+import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.OVERRIDING_EXTERNAL_FUN_WITH_OPTIONAL_PARAMS
 import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.OVERRIDING_EXTERNAL_FUN_WITH_OPTIONAL_PARAMS_WITH_FAKE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.RUNTIME_ANNOTATION_NOT_SUPPORTED
@@ -129,6 +130,11 @@ object FirJsErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
            KtDiagnosticRenderers.TO_STRING,
            CommonRenderers.STRING
        )
+        map.put(
+            NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE,
+            "Can''t put non-external declarations in file marked with {0} annotation",
+            FirDiagnosticRenderers.RENDER_TYPE
+        )

        map.checkMissingMessages(FirJsErrors)
    }
@@ -25,6 +25,7 @@ object JsDeclarationCheckers : DeclarationCheckers() {
            FirJsModuleChecker,
            FirJsRuntimeAnnotationChecker,
            FirJsExternalChecker,
+            FirJsExternalFileChecker,
        )

    override val classCheckers: Set<FirClassChecker>
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2023 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.js.checkers.declaration
+
+import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
+import org.jetbrains.kotlin.diagnostics.reportOn
+import org.jetbrains.kotlin.fir.analysis.checkers.closestNonLocalWith
+import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
+import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirBasicDeclarationChecker
+import org.jetbrains.kotlin.fir.analysis.js.checkers.isNativeObject
+import org.jetbrains.kotlin.fir.analysis.checkers.isTopLevel
+import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors
+import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirFile
+import org.jetbrains.kotlin.fir.declarations.fullyExpandedClassId
+import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.name.JsStandardClassIds
+import org.jetbrains.kotlin.utils.addToStdlib.lastIsInstanceOrNull
+
+object FirJsExternalFileChecker : FirBasicDeclarationChecker() {
+    override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
+        val closestNonLocal = context.closestNonLocalWith(declaration)?.symbol ?: return
+
+        if (closestNonLocal.isNativeObject(context) || !context.isTopLevel) {
+            return
+        }
+
+        val targetAnnotations = context.containingDeclarations
+            .lastIsInstanceOrNull<FirFile>()
+            ?.annotations
+            ?.firstOrNull { it.fullyExpandedClassId(context.session) in JsStandardClassIds.Annotations.annotationsRequiringExternal }
+
+        if (targetAnnotations != null) {
+            reporter.reportOn(
+                declaration.source,
+                FirJsErrors.NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE,
+                targetAnnotations.typeRef.coneType,
+                context
+            )
+        }
+    }
+}
@@ -1,9 +0,0 @@
-@file:JsModule("lib")
-
-class A {
-    class B
-
-    fun bar() {}
-}
-
-fun foo() = "OK"
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
@file:JsModule("lib")

 class <!NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE!>A<!> {
@@ -1,9 +0,0 @@
-@file:JsQualifier("a.b")
-
-class A {
-    class B
-
-    fun bar() {}
-}
-
-fun foo() = "OK"
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
@file:JsQualifier("a.b")

 class <!NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE!>A<!> {
@@ -20,6 +20,8 @@ object JsStandardClassIds {
        val JsNativeInvoke = "nativeInvoke".jsId()
        val JsNativeGetter = "nativeGetter".jsId()
        val JsNativeSetter = "nativeSetter".jsId()
+
+        val annotationsRequiringExternal = setOf(JsModule, JsQualifier)
    }

    object Callables {
@@ -18,13 +18,14 @@ package org.jetbrains.kotlin.js.resolve.diagnostics

 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
+import org.jetbrains.kotlin.name.JsStandardClassIds
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.checkers.DeclarationCheckerContext
 import org.jetbrains.kotlin.resolve.checkers.DeclarationChecker

 object JsExternalFileChecker : DeclarationChecker {
-    private val annotationFqNames = setOf(AnnotationsUtils.JS_MODULE_ANNOTATION, AnnotationsUtils.JS_QUALIFIER_ANNOTATION)
+    private val annotationFqNames = JsStandardClassIds.Annotations.annotationsRequiringExternal.map { it.asSingleFqName() }

    override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) {
        if (!AnnotationsUtils.isNativeObject(descriptor) && DescriptorUtils.isTopLevelDeclaration(descriptor)) {