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

[Wasm] Add JsModule checker to K2

Browse Source 
#KT-56849
This commit is contained in:
Svyatoslav Kuzmich
2023-11-22 11:33:31 +01:00
committed by Space Team
parent 977d1c0e41
commit 7687b86654
11 changed files with 169 additions and 1 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/FirWasmDiagnosticsList.kt
+6
View File
@@ -15,6 +15,12 @@ import org.jetbrains.kotlin.util.PrivateForInline
@Suppress("ClassName", "unused")
@OptIn(PrivateForInline::class)
object WASM_DIAGNOSTICS_LIST : DiagnosticList("FirWasmErrors") {
val ANNOTATIONS by object : DiagnosticGroup("Annotations") {
val JS_MODULE_PROHIBITED_ON_VAR by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
val JS_MODULE_PROHIBITED_ON_NON_EXTERNAL by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
val NESTED_JS_MODULE_PROHIBITED by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
}
val EXTERNALS by object : DiagnosticGroup("Externals") {
val NON_EXTERNAL_TYPE_EXTENDS_EXTERNAL_TYPE by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) {
parameter<ConeKotlinType>("superType")
compiler/fir/checkers/checkers.wasm/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/wasm/FirWasmErrors.kt
+5
View File
@@ -17,6 +17,11 @@ import org.jetbrains.kotlin.psi.KtElement
* Generated from: [org.jetbrains.kotlin.fir.checkers.generator.diagnostics.WASM_DIAGNOSTICS_LIST]
*/
object FirWasmErrors {
// Annotations
val JS_MODULE_PROHIBITED_ON_VAR by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
val JS_MODULE_PROHIBITED_ON_NON_EXTERNAL by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
val NESTED_JS_MODULE_PROHIBITED by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
// Externals
val NON_EXTERNAL_TYPE_EXTENDS_EXTERNAL_TYPE by error1<KtElement, ConeKotlinType>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
val EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE by error1<KtElement, ConeKotlinType>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/diagnostics/wasm/FirWasmErrorsDefaultMessages.kt
+9
View File
@@ -15,6 +15,9 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.JSCODE_I
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.JSCODE_UNSUPPORTED_FUNCTION_KIND
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.JSCODE_WRONG_CONTEXT
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.JS_AND_WASM_EXPORTS_ON_SAME_DECLARATION
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.JS_MODULE_PROHIBITED_ON_NON_EXTERNAL
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.JS_MODULE_PROHIBITED_ON_VAR
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.NESTED_JS_MODULE_PROHIBITED
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.NESTED_WASM_EXPORT
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.NESTED_WASM_IMPORT
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.NON_EXTERNAL_TYPE_EXTENDS_EXTERNAL_TYPE
@@ -30,6 +33,12 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors.WRONG_JS
@Suppress("unused")
object FirWasmErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
override val MAP = KtDiagnosticFactoryToRendererMap("FIR").also { map ->
map.put(JS_MODULE_PROHIBITED_ON_VAR, "'@JsModule' annotation is prohibited for 'var' declarations. Use 'val' instead.")
map.put(JS_MODULE_PROHIBITED_ON_NON_EXTERNAL, "'@JsModule' annotation is prohibited for non-external declarations.")
map.put(
NESTED_JS_MODULE_PROHIBITED,
"'@JsModule' cannot appear here since the file is already marked by either '@JsModule'."
)
map.put(
NON_EXTERNAL_TYPE_EXTENDS_EXTERNAL_TYPE,
"Non-external type extends external type ''{0}''",
compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/WasmDeclarationCheckers.kt
+2 -1
View File
@@ -22,6 +22,7 @@ object WasmDeclarationCheckers : DeclarationCheckers() {
FirWasmExportAnnotationChecker,
FirWasmExternalChecker,
FirWasmJsFunAnnotationChecker,
FirJsExportAnnotationChecker
FirJsExportAnnotationChecker,
FirWasmJsModuleChecker,
)
}
compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/declaration/FirWasmJsModuleChecker.kt
+38
View File
@@ -0,0 +1,38 @@
/*
* Copyright 2010-2022 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.wasm.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.checkers.isTopLevel
import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.declarations.FirFile
import org.jetbrains.kotlin.fir.declarations.FirProperty
import org.jetbrains.kotlin.fir.declarations.hasAnnotation
import org.jetbrains.kotlin.fir.declarations.utils.isEffectivelyExternal
import org.jetbrains.kotlin.name.WebCommonStandardClassIds.Annotations.JsModule
object FirWasmJsModuleChecker : FirBasicDeclarationChecker() {
override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
if (declaration is FirFile || !declaration.hasAnnotation(JsModule, context.session)) return
if (declaration is FirProperty && declaration.isVar) {
reporter.reportOn(declaration.source, FirWasmErrors.JS_MODULE_PROHIBITED_ON_VAR, context)
}
if (!declaration.symbol.isEffectivelyExternal(context.session)) {
reporter.reportOn(declaration.source, FirWasmErrors.JS_MODULE_PROHIBITED_ON_NON_EXTERNAL, context)
}
if (context.isTopLevel && context.containingFile?.hasAnnotation(JsModule, context.session) == true) {
reporter.reportOn(declaration.source, FirWasmErrors.NESTED_JS_MODULE_PROHIBITED, context)
}
}
}
compiler/testData/diagnostics/wasmTests/jsInterop/module/jsVarProhibited.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// FIR_IDENTICAL
package foo
<!JS_MODULE_PROHIBITED_ON_VAR!>@JsModule("bar")
external var bar: Int<!> = definedExternally
typealias JsM = JsModule
<!JS_MODULE_PROHIBITED_ON_VAR!>@JsM("bar")
external var bar2: Int<!> = definedExternally
compiler/testData/diagnostics/wasmTests/jsInterop/module/nestedProhibited.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// FIR_IDENTICAL
@file:JsModule("foo")
package foo
@JsModule("A")
external class <!NESTED_JS_MODULE_PROHIBITED!>A<!> {
class Nested
}
@JsModule("B")
external <!NESTED_JS_MODULE_PROHIBITED!>object B<!>
<!NESTED_JS_MODULE_PROHIBITED!>@JsModule("foo")
external fun foo(): Int<!>
<!NESTED_JS_MODULE_PROHIBITED!>@JsModule("bar")
external val bar: Int<!>
compiler/testData/diagnostics/wasmTests/jsInterop/module/prohibitedOnNonNative.fir.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
package foo
@JsModule("A")
class <!JS_MODULE_PROHIBITED_ON_NON_EXTERNAL!>A<!>
@JsModule("B")
<!JS_MODULE_PROHIBITED_ON_NON_EXTERNAL!>object B<!>
<!JS_MODULE_PROHIBITED_ON_NON_EXTERNAL!>@JsModule("foo")
fun foo()<!> = 23
<!JS_MODULE_PROHIBITED_ON_NON_EXTERNAL!>@JsModule("bar")
val bar<!> = 42
compiler/testData/diagnostics/wasmTests/jsInterop/module/prohibitedOnNonNative.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
package foo
@JsModule("A")
class <!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>A<!>
@JsModule("B")
<!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>object B<!>
<!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>@JsModule("foo")
fun foo()<!> = 23
<!JS_MODULE_PROHIBITED_ON_NON_NATIVE!>@JsModule("bar")
val bar<!> = 42
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsFirWasmTestGenerated.java
Generated
+28
View File
@@ -129,6 +129,34 @@ public class DiagnosticsFirWasmTestGenerated extends AbstractDiagnosticsFirWasmT
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/wrongQualifier.kt");
}
@Nested
@TestMetadata("compiler/testData/diagnostics/wasmTests/jsInterop/module")
@TestDataPath("$PROJECT_ROOT")
public class Module {
@Test
public void testAllFilesPresentInModule() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/wasmTests/jsInterop/module"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("jsVarProhibited.kt")
public void testJsVarProhibited() throws Exception {
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/module/jsVarProhibited.kt");
}
@Test
@TestMetadata("nestedProhibited.kt")
public void testNestedProhibited() throws Exception {
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/module/nestedProhibited.kt");
}
@Test
@TestMetadata("prohibitedOnNonNative.kt")
public void testProhibitedOnNonNative() throws Exception {
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/module/prohibitedOnNonNative.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/wasmTests/jsInterop/rtti")
@TestDataPath("$PROJECT_ROOT")
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsWasmTestGenerated.java
Generated
+28
View File
@@ -129,6 +129,34 @@ public class DiagnosticsWasmTestGenerated extends AbstractDiagnosticsWasmTest {
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/wrongQualifier.kt");
}
@Nested
@TestMetadata("compiler/testData/diagnostics/wasmTests/jsInterop/module")
@TestDataPath("$PROJECT_ROOT")
public class Module {
@Test
public void testAllFilesPresentInModule() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/wasmTests/jsInterop/module"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("jsVarProhibited.kt")
public void testJsVarProhibited() throws Exception {
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/module/jsVarProhibited.kt");
}
@Test
@TestMetadata("nestedProhibited.kt")
public void testNestedProhibited() throws Exception {
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/module/nestedProhibited.kt");
}
@Test
@TestMetadata("prohibitedOnNonNative.kt")
public void testProhibitedOnNonNative() throws Exception {
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/module/prohibitedOnNonNative.kt");
}
}
@Nested
@TestMetadata("compiler/testData/diagnostics/wasmTests/jsInterop/rtti")
@TestDataPath("$PROJECT_ROOT")