diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirJsDiagnosticsList.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirJsDiagnosticsList.kt index fe0fce3480f..32244febf6d 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirJsDiagnosticsList.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirJsDiagnosticsList.kt @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.psi.* @OptIn(PrivateForInline::class) object JS_DIAGNOSTICS_LIST : DiagnosticList("FirJsErrors") { val ANNOTATIONS by object : DiagnosticGroup("Annotations") { - val WRONG_JS_QUALIFIER by error() val JS_MODULE_PROHIBITED_ON_VAR by error(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) val JS_MODULE_PROHIBITED_ON_NON_NATIVE by error(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) val NESTED_JS_MODULE_PROHIBITED by error(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirWebCommonDiagnosticList.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirWebCommonDiagnosticList.kt index 69ff40596a8..74c1feb42c3 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirWebCommonDiagnosticList.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirWebCommonDiagnosticList.kt @@ -13,6 +13,10 @@ import org.jetbrains.kotlin.util.PrivateForInline @Suppress("ClassName", "unused") @OptIn(PrivateForInline::class) object WEB_COMMON_DIAGNOSTICS_LIST : DiagnosticList("FirWebCommonErrors") { + val ANNOTATIONS by object : DiagnosticGroup("Annotations") { + val WRONG_JS_QUALIFIER by error() + } + val EXTERNALS by object : DiagnosticGroup("Externals") { val NESTED_EXTERNAL_DECLARATION by error(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) val WRONG_EXTERNAL_DECLARATION by error(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) { diff --git a/compiler/fir/checkers/checkers.js/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrors.kt b/compiler/fir/checkers/checkers.js/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrors.kt index 355fb29bb67..6c47f67d30e 100644 --- a/compiler/fir/checkers/checkers.js/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrors.kt +++ b/compiler/fir/checkers/checkers.js/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrors.kt @@ -25,7 +25,6 @@ import org.jetbrains.kotlin.psi.KtExpression */ object FirJsErrors { // Annotations - val WRONG_JS_QUALIFIER by error0() val JS_MODULE_PROHIBITED_ON_VAR by error0(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT) val JS_MODULE_PROHIBITED_ON_NON_NATIVE by error0(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT) val NESTED_JS_MODULE_PROHIBITED by error0(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT) diff --git a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrorsDefaultMessages.kt b/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrorsDefaultMessages.kt index 4c8f138f2b4..40011480cf8 100644 --- a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrorsDefaultMessages.kt +++ b/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/diagnostics/js/FirJsErrorsDefaultMessages.kt @@ -57,14 +57,12 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.RUNTIME_ANNO import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.SPREAD_OPERATOR_IN_DYNAMIC_CALL import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.UNCHECKED_CAST_TO_EXTERNAL_INTERFACE import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.WRONG_EXPORTED_DECLARATION -import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.WRONG_JS_QUALIFIER import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.WRONG_MULTIPLE_INHERITANCE import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.WRONG_OPERATION_WITH_DYNAMIC @Suppress("unused") object FirJsErrorsDefaultMessages : BaseDiagnosticRendererFactory() { override val MAP = KtDiagnosticFactoryToRendererMap("FIR").also { map -> - map.put(WRONG_JS_QUALIFIER, "Qualifier contains illegal characters.") map.put(JS_MODULE_PROHIBITED_ON_VAR, "'@JsModule' and '@JsNonModule' annotations are prohibited for 'var' declarations. Use 'val' instead.") map.put(JS_MODULE_PROHIBITED_ON_NON_NATIVE, "'@JsModule' and '@JsNonModule' annotations are prohibited for non-external declarations.") map.put( diff --git a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/JsExpressionCheckers.kt b/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/JsExpressionCheckers.kt index b11ff7d459a..623f8f59135 100644 --- a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/JsExpressionCheckers.kt +++ b/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/JsExpressionCheckers.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.analysis.js.checkers import org.jetbrains.kotlin.fir.analysis.checkers.expression.* import org.jetbrains.kotlin.fir.analysis.js.checkers.expression.* import org.jetbrains.kotlin.fir.analysis.web.common.checkers.expression.FirJsCodeConstantArgumentChecker +import org.jetbrains.kotlin.fir.analysis.web.common.checkers.expression.FirJsQualifierChecker object JsExpressionCheckers : ExpressionCheckers() { override val annotationCallCheckers: Set diff --git a/compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/WasmExpressionCheckers.kt b/compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/WasmExpressionCheckers.kt index 2e121370e51..391663b4c9f 100644 --- a/compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/WasmExpressionCheckers.kt +++ b/compiler/fir/checkers/checkers.wasm/src/org/jetbrains/kotlin/fir/analysis/wasm/checkers/WasmExpressionCheckers.kt @@ -9,8 +9,14 @@ import org.jetbrains.kotlin.fir.analysis.checkers.expression.* import org.jetbrains.kotlin.fir.analysis.wasm.checkers.expression.FirWasmDefinedExternallyCallChecker import org.jetbrains.kotlin.fir.analysis.wasm.checkers.expression.FirWasmJsCodeCallChecker import org.jetbrains.kotlin.fir.analysis.web.common.checkers.expression.FirJsCodeConstantArgumentChecker +import org.jetbrains.kotlin.fir.analysis.web.common.checkers.expression.FirJsQualifierChecker object WasmExpressionCheckers : ExpressionCheckers() { + override val annotationCallCheckers: Set + get() = setOf( + FirJsQualifierChecker, + ) + override val basicExpressionCheckers: Set get() = setOf( FirWasmDefinedExternallyCallChecker, diff --git a/compiler/fir/checkers/checkers.web.common/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/web/common/FirWebCommonErrors.kt b/compiler/fir/checkers/checkers.web.common/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/web/common/FirWebCommonErrors.kt index c39797a2d35..ef801b1632c 100644 --- a/compiler/fir/checkers/checkers.web.common/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/web/common/FirWebCommonErrors.kt +++ b/compiler/fir/checkers/checkers.web.common/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/web/common/FirWebCommonErrors.kt @@ -19,6 +19,9 @@ import org.jetbrains.kotlin.psi.KtParameter * Generated from: [org.jetbrains.kotlin.fir.checkers.generator.diagnostics.WEB_COMMON_DIAGNOSTICS_LIST] */ object FirWebCommonErrors { + // Annotations + val WRONG_JS_QUALIFIER by error0() + // Externals val NESTED_EXTERNAL_DECLARATION by error0(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT) val WRONG_EXTERNAL_DECLARATION by error1(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT) diff --git a/compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/diagnostics/web/common/FirWebCommonErrorsDefaultMessages.kt b/compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/diagnostics/web/common/FirWebCommonErrorsDefaultMessages.kt index c5164c35927..d9dc43cb2c0 100644 --- a/compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/diagnostics/web/common/FirWebCommonErrorsDefaultMessages.kt +++ b/compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/diagnostics/web/common/FirWebCommonErrorsDefaultMessages.kt @@ -22,10 +22,12 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErro import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.WRONG_DEFAULT_VALUE_FOR_EXTERNAL_FUN_PARAMETER import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.WRONG_EXTERNAL_DECLARATION import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.WRONG_INITIALIZER_OF_EXTERNAL_DECLARATION +import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.WRONG_JS_QUALIFIER @Suppress("unused") object FirWebCommonErrorsDefaultMessages : BaseDiagnosticRendererFactory() { override val MAP = KtDiagnosticFactoryToRendererMap("FIR").also { map -> + map.put(WRONG_JS_QUALIFIER, "Qualifier contains illegal characters.") map.put(NESTED_EXTERNAL_DECLARATION, "Non-top-level 'external' declaration.") map.put(WRONG_EXTERNAL_DECLARATION, "Declaration of such kind ({0}) cannot be external.", CommonRenderers.STRING) map.put(NESTED_CLASS_IN_EXTERNAL_INTERFACE, "Interface cannot contain nested classes and objects.") diff --git a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/expression/FirJsQualifierChecker.kt b/compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/web/common/checkers/expression/FirJsQualifierChecker.kt similarity index 80% rename from compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/expression/FirJsQualifierChecker.kt rename to compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/web/common/checkers/expression/FirJsQualifierChecker.kt index 246ee4674f0..b04f12c1738 100644 --- a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/expression/FirJsQualifierChecker.kt +++ b/compiler/fir/checkers/checkers.web.common/src/org/jetbrains/kotlin/fir/analysis/web/common/checkers/expression/FirJsQualifierChecker.kt @@ -3,18 +3,18 @@ * 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.expression +package org.jetbrains.kotlin.fir.analysis.web.common.checkers.expression import org.jetbrains.kotlin.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirAnnotationCallChecker -import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors +import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors import org.jetbrains.kotlin.fir.declarations.toAnnotationClassId import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.js.validateQualifier -import org.jetbrains.kotlin.name.JsStandardClassIds.Annotations.JsQualifier +import org.jetbrains.kotlin.name.WebCommonStandardClassIds.Annotations.JsQualifier object FirJsQualifierChecker : FirAnnotationCallChecker() { override fun check(expression: FirAnnotationCall, context: CheckerContext, reporter: DiagnosticReporter) { @@ -25,7 +25,7 @@ object FirJsQualifierChecker : FirAnnotationCallChecker() { val string = (expression.argumentMapping.mapping.values.firstOrNull() as? FirConstExpression<*>)?.value as? String ?: return if (!validateQualifier(string)) { - reporter.reportOn(expression.argumentList.arguments.first().source, FirJsErrors.WRONG_JS_QUALIFIER, context) + reporter.reportOn(expression.argumentList.arguments.first().source, FirWebCommonErrors.WRONG_JS_QUALIFIER, context) } } } diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirNonSuppressibleErrorNames.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirNonSuppressibleErrorNames.kt index a7cfcdf0fa9..33703d8dc99 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirNonSuppressibleErrorNames.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirNonSuppressibleErrorNames.kt @@ -157,7 +157,6 @@ val FIR_NON_SUPPRESSIBLE_ERROR_NAMES: Set = setOf( "VOLATILE_ON_VALUE", "VOLATILE_ON_DELEGATE", "NON_SOURCE_ANNOTATION_ON_INLINED_LAMBDA_EXPRESSION", - "WRONG_JS_QUALIFIER", "JS_MODULE_PROHIBITED_ON_VAR", "JS_MODULE_PROHIBITED_ON_NON_NATIVE", "NESTED_JS_MODULE_PROHIBITED", @@ -181,6 +180,7 @@ val FIR_NON_SUPPRESSIBLE_ERROR_NAMES: Set = setOf( "NAME_CONTAINS_ILLEGAL_CHARS", "JS_NAME_CLASH", "JS_FAKE_NAME_CLASH", + "WRONG_JS_QUALIFIER", "OPT_IN_USAGE_ERROR", "OPT_IN_OVERRIDE_ERROR", "OPT_IN_CAN_ONLY_BE_USED_AS_ANNOTATION", diff --git a/compiler/testData/diagnostics/wasmTests/jsInterop/wrongQualifier.kt b/compiler/testData/diagnostics/wasmTests/jsInterop/wrongQualifier.kt new file mode 100644 index 00000000000..a188aef0d30 --- /dev/null +++ b/compiler/testData/diagnostics/wasmTests/jsInterop/wrongQualifier.kt @@ -0,0 +1,24 @@ +// FIR_IDENTICAL +// FILE: a.kt +@file:JsQualifier("") + +// FILE: b.kt +@file:JsQualifier("a..b") + +// FILE: c.kt +@file:JsQualifier("a.") + +// FILE: d.kt +@file:JsQualifier(".a") + +// FILE: e.kt +@file:JsQualifier("%^&") + +// FILE: f.kt +@file:JsQualifier("a.bc.d23._$") + +// FILE: g.kt +typealias JsQ = JsQualifier + +// FILE: h.kt +@file:JsQ(value = "%^&") diff --git a/core/compiler.common.js/src/org/jetbrains/kotlin/js/JsHelpers.kt b/core/compiler.common.web/src/org/jetbrains/kotlin/js/JsHelpers.kt similarity index 100% rename from core/compiler.common.js/src/org/jetbrains/kotlin/js/JsHelpers.kt rename to core/compiler.common.web/src/org/jetbrains/kotlin/js/JsHelpers.kt diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsFirWasmTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsFirWasmTestGenerated.java index 5b04890c3ad..b0d76d33354 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsFirWasmTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsFirWasmTestGenerated.java @@ -122,6 +122,12 @@ public class DiagnosticsFirWasmTestGenerated extends AbstractDiagnosticsFirWasmT public void testTypes() throws Exception { runTest("compiler/testData/diagnostics/wasmTests/jsInterop/types.kt"); } + + @Test + @TestMetadata("wrongQualifier.kt") + public void testWrongQualifier() throws Exception { + runTest("compiler/testData/diagnostics/wasmTests/jsInterop/wrongQualifier.kt"); + } } @Nested diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsWasmTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsWasmTestGenerated.java index 468b9a96688..424df7dfe06 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsWasmTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/diagnostics/DiagnosticsWasmTestGenerated.java @@ -122,6 +122,12 @@ public class DiagnosticsWasmTestGenerated extends AbstractDiagnosticsWasmTest { public void testTypes() throws Exception { runTest("compiler/testData/diagnostics/wasmTests/jsInterop/types.kt"); } + + @Test + @TestMetadata("wrongQualifier.kt") + public void testWrongQualifier() throws Exception { + runTest("compiler/testData/diagnostics/wasmTests/jsInterop/wrongQualifier.kt"); + } } @Nested