[Wasm] Move FirJsQualifierChecker to web.common and reuse in Wasm
#KT-56849
This commit is contained in:
committed by
Space Team
parent
640bf67480
commit
d219d5380b
-1
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.psi.*
|
|||||||
@OptIn(PrivateForInline::class)
|
@OptIn(PrivateForInline::class)
|
||||||
object JS_DIAGNOSTICS_LIST : DiagnosticList("FirJsErrors") {
|
object JS_DIAGNOSTICS_LIST : DiagnosticList("FirJsErrors") {
|
||||||
val ANNOTATIONS by object : DiagnosticGroup("Annotations") {
|
val ANNOTATIONS by object : DiagnosticGroup("Annotations") {
|
||||||
val WRONG_JS_QUALIFIER by error<KtElement>()
|
|
||||||
val JS_MODULE_PROHIBITED_ON_VAR by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val JS_MODULE_PROHIBITED_ON_VAR by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val JS_MODULE_PROHIBITED_ON_NON_NATIVE by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val JS_MODULE_PROHIBITED_ON_NON_NATIVE by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val NESTED_JS_MODULE_PROHIBITED by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val NESTED_JS_MODULE_PROHIBITED by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
|
|||||||
+4
@@ -13,6 +13,10 @@ import org.jetbrains.kotlin.util.PrivateForInline
|
|||||||
@Suppress("ClassName", "unused")
|
@Suppress("ClassName", "unused")
|
||||||
@OptIn(PrivateForInline::class)
|
@OptIn(PrivateForInline::class)
|
||||||
object WEB_COMMON_DIAGNOSTICS_LIST : DiagnosticList("FirWebCommonErrors") {
|
object WEB_COMMON_DIAGNOSTICS_LIST : DiagnosticList("FirWebCommonErrors") {
|
||||||
|
val ANNOTATIONS by object : DiagnosticGroup("Annotations") {
|
||||||
|
val WRONG_JS_QUALIFIER by error<KtElement>()
|
||||||
|
}
|
||||||
|
|
||||||
val EXTERNALS by object : DiagnosticGroup("Externals") {
|
val EXTERNALS by object : DiagnosticGroup("Externals") {
|
||||||
val NESTED_EXTERNAL_DECLARATION by error<KtExpression>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val NESTED_EXTERNAL_DECLARATION by error<KtExpression>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val WRONG_EXTERNAL_DECLARATION by error<KtExpression>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) {
|
val WRONG_EXTERNAL_DECLARATION by error<KtExpression>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) {
|
||||||
|
|||||||
-1
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.psi.KtExpression
|
|||||||
*/
|
*/
|
||||||
object FirJsErrors {
|
object FirJsErrors {
|
||||||
// Annotations
|
// Annotations
|
||||||
val WRONG_JS_QUALIFIER by error0<KtElement>()
|
|
||||||
val JS_MODULE_PROHIBITED_ON_VAR by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val JS_MODULE_PROHIBITED_ON_VAR by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val JS_MODULE_PROHIBITED_ON_NON_NATIVE by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val JS_MODULE_PROHIBITED_ON_NON_NATIVE by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val NESTED_JS_MODULE_PROHIBITED by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val NESTED_JS_MODULE_PROHIBITED by error0<KtElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
|
|||||||
-2
@@ -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.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.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_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_MULTIPLE_INHERITANCE
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.WRONG_OPERATION_WITH_DYNAMIC
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.WRONG_OPERATION_WITH_DYNAMIC
|
||||||
|
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
object FirJsErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
|
object FirJsErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
|
||||||
override val MAP = KtDiagnosticFactoryToRendererMap("FIR").also { map ->
|
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_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(JS_MODULE_PROHIBITED_ON_NON_NATIVE, "'@JsModule' and '@JsNonModule' annotations are prohibited for non-external declarations.")
|
||||||
map.put(
|
map.put(
|
||||||
|
|||||||
+1
@@ -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.checkers.expression.*
|
||||||
import org.jetbrains.kotlin.fir.analysis.js.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.FirJsCodeConstantArgumentChecker
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.web.common.checkers.expression.FirJsQualifierChecker
|
||||||
|
|
||||||
object JsExpressionCheckers : ExpressionCheckers() {
|
object JsExpressionCheckers : ExpressionCheckers() {
|
||||||
override val annotationCallCheckers: Set<FirAnnotationCallChecker>
|
override val annotationCallCheckers: Set<FirAnnotationCallChecker>
|
||||||
|
|||||||
+6
@@ -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.FirWasmDefinedExternallyCallChecker
|
||||||
import org.jetbrains.kotlin.fir.analysis.wasm.checkers.expression.FirWasmJsCodeCallChecker
|
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.FirJsCodeConstantArgumentChecker
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.web.common.checkers.expression.FirJsQualifierChecker
|
||||||
|
|
||||||
object WasmExpressionCheckers : ExpressionCheckers() {
|
object WasmExpressionCheckers : ExpressionCheckers() {
|
||||||
|
override val annotationCallCheckers: Set<FirAnnotationCallChecker>
|
||||||
|
get() = setOf(
|
||||||
|
FirJsQualifierChecker,
|
||||||
|
)
|
||||||
|
|
||||||
override val basicExpressionCheckers: Set<FirBasicExpressionChecker>
|
override val basicExpressionCheckers: Set<FirBasicExpressionChecker>
|
||||||
get() = setOf(
|
get() = setOf(
|
||||||
FirWasmDefinedExternallyCallChecker,
|
FirWasmDefinedExternallyCallChecker,
|
||||||
|
|||||||
+3
@@ -19,6 +19,9 @@ import org.jetbrains.kotlin.psi.KtParameter
|
|||||||
* Generated from: [org.jetbrains.kotlin.fir.checkers.generator.diagnostics.WEB_COMMON_DIAGNOSTICS_LIST]
|
* Generated from: [org.jetbrains.kotlin.fir.checkers.generator.diagnostics.WEB_COMMON_DIAGNOSTICS_LIST]
|
||||||
*/
|
*/
|
||||||
object FirWebCommonErrors {
|
object FirWebCommonErrors {
|
||||||
|
// Annotations
|
||||||
|
val WRONG_JS_QUALIFIER by error0<KtElement>()
|
||||||
|
|
||||||
// Externals
|
// Externals
|
||||||
val NESTED_EXTERNAL_DECLARATION by error0<KtExpression>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val NESTED_EXTERNAL_DECLARATION by error0<KtExpression>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val WRONG_EXTERNAL_DECLARATION by error1<KtExpression, String>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val WRONG_EXTERNAL_DECLARATION by error1<KtExpression, String>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
|
|||||||
+2
@@ -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_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_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_INITIALIZER_OF_EXTERNAL_DECLARATION
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.WRONG_JS_QUALIFIER
|
||||||
|
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
object FirWebCommonErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
|
object FirWebCommonErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
|
||||||
override val MAP = KtDiagnosticFactoryToRendererMap("FIR").also { map ->
|
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(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(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.")
|
map.put(NESTED_CLASS_IN_EXTERNAL_INTERFACE, "Interface cannot contain nested classes and objects.")
|
||||||
|
|||||||
+4
-4
@@ -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.
|
* 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.DiagnosticReporter
|
||||||
import org.jetbrains.kotlin.diagnostics.reportOn
|
import org.jetbrains.kotlin.diagnostics.reportOn
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
|
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirAnnotationCallChecker
|
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.declarations.toAnnotationClassId
|
||||||
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
|
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
|
||||||
import org.jetbrains.kotlin.fir.expressions.FirConstExpression
|
import org.jetbrains.kotlin.fir.expressions.FirConstExpression
|
||||||
import org.jetbrains.kotlin.js.validateQualifier
|
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() {
|
object FirJsQualifierChecker : FirAnnotationCallChecker() {
|
||||||
override fun check(expression: FirAnnotationCall, context: CheckerContext, reporter: DiagnosticReporter) {
|
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
|
val string = (expression.argumentMapping.mapping.values.firstOrNull() as? FirConstExpression<*>)?.value as? String ?: return
|
||||||
|
|
||||||
if (!validateQualifier(string)) {
|
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -157,7 +157,6 @@ val FIR_NON_SUPPRESSIBLE_ERROR_NAMES: Set<String> = setOf(
|
|||||||
"VOLATILE_ON_VALUE",
|
"VOLATILE_ON_VALUE",
|
||||||
"VOLATILE_ON_DELEGATE",
|
"VOLATILE_ON_DELEGATE",
|
||||||
"NON_SOURCE_ANNOTATION_ON_INLINED_LAMBDA_EXPRESSION",
|
"NON_SOURCE_ANNOTATION_ON_INLINED_LAMBDA_EXPRESSION",
|
||||||
"WRONG_JS_QUALIFIER",
|
|
||||||
"JS_MODULE_PROHIBITED_ON_VAR",
|
"JS_MODULE_PROHIBITED_ON_VAR",
|
||||||
"JS_MODULE_PROHIBITED_ON_NON_NATIVE",
|
"JS_MODULE_PROHIBITED_ON_NON_NATIVE",
|
||||||
"NESTED_JS_MODULE_PROHIBITED",
|
"NESTED_JS_MODULE_PROHIBITED",
|
||||||
@@ -181,6 +180,7 @@ val FIR_NON_SUPPRESSIBLE_ERROR_NAMES: Set<String> = setOf(
|
|||||||
"NAME_CONTAINS_ILLEGAL_CHARS",
|
"NAME_CONTAINS_ILLEGAL_CHARS",
|
||||||
"JS_NAME_CLASH",
|
"JS_NAME_CLASH",
|
||||||
"JS_FAKE_NAME_CLASH",
|
"JS_FAKE_NAME_CLASH",
|
||||||
|
"WRONG_JS_QUALIFIER",
|
||||||
"OPT_IN_USAGE_ERROR",
|
"OPT_IN_USAGE_ERROR",
|
||||||
"OPT_IN_OVERRIDE_ERROR",
|
"OPT_IN_OVERRIDE_ERROR",
|
||||||
"OPT_IN_CAN_ONLY_BE_USED_AS_ANNOTATION",
|
"OPT_IN_CAN_ONLY_BE_USED_AS_ANNOTATION",
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
// FIR_IDENTICAL
|
||||||
|
// FILE: a.kt
|
||||||
|
@file:JsQualifier(<!WRONG_JS_QUALIFIER!>""<!>)
|
||||||
|
|
||||||
|
// FILE: b.kt
|
||||||
|
@file:JsQualifier(<!WRONG_JS_QUALIFIER!>"a..b"<!>)
|
||||||
|
|
||||||
|
// FILE: c.kt
|
||||||
|
@file:JsQualifier(<!WRONG_JS_QUALIFIER!>"a."<!>)
|
||||||
|
|
||||||
|
// FILE: d.kt
|
||||||
|
@file:JsQualifier(<!WRONG_JS_QUALIFIER!>".a"<!>)
|
||||||
|
|
||||||
|
// FILE: e.kt
|
||||||
|
@file:JsQualifier(<!WRONG_JS_QUALIFIER!>"%^&"<!>)
|
||||||
|
|
||||||
|
// FILE: f.kt
|
||||||
|
@file:JsQualifier("a.bc.d23._$")
|
||||||
|
|
||||||
|
// FILE: g.kt
|
||||||
|
typealias JsQ = JsQualifier
|
||||||
|
|
||||||
|
// FILE: h.kt
|
||||||
|
@file:JsQ(<!WRONG_JS_QUALIFIER!>value = "%^&"<!>)
|
||||||
+6
@@ -122,6 +122,12 @@ public class DiagnosticsFirWasmTestGenerated extends AbstractDiagnosticsFirWasmT
|
|||||||
public void testTypes() throws Exception {
|
public void testTypes() throws Exception {
|
||||||
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/types.kt");
|
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
|
@Nested
|
||||||
|
|||||||
+6
@@ -122,6 +122,12 @@ public class DiagnosticsWasmTestGenerated extends AbstractDiagnosticsWasmTest {
|
|||||||
public void testTypes() throws Exception {
|
public void testTypes() throws Exception {
|
||||||
runTest("compiler/testData/diagnostics/wasmTests/jsInterop/types.kt");
|
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
|
@Nested
|
||||||
|
|||||||
Reference in New Issue
Block a user