[Wasm] Move FirJsExportAnnotationChecker to web.common and reuse in Wasm
#KT-56849
This commit is contained in:
committed by
Space Team
parent
c1fa0a3e8c
commit
640bf67480
-1
@@ -115,7 +115,6 @@ object JS_DIAGNOSTICS_LIST : DiagnosticList("FirJsErrors") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val EXPORT by object : DiagnosticGroup("Export") {
|
val EXPORT by object : DiagnosticGroup("Export") {
|
||||||
val NESTED_JS_EXPORT by error<KtElement>()
|
|
||||||
val WRONG_EXPORTED_DECLARATION by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) {
|
val WRONG_EXPORTED_DECLARATION by error<KtElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) {
|
||||||
parameter<String>("kind")
|
parameter<String>("kind")
|
||||||
}
|
}
|
||||||
|
|||||||
+4
@@ -30,6 +30,10 @@ object WEB_COMMON_DIAGNOSTICS_LIST : DiagnosticList("FirWebCommonErrors") {
|
|||||||
val WRONG_DEFAULT_VALUE_FOR_EXTERNAL_FUN_PARAMETER by error<KtElement>()
|
val WRONG_DEFAULT_VALUE_FOR_EXTERNAL_FUN_PARAMETER by error<KtElement>()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val EXPORT by object : DiagnosticGroup("Export") {
|
||||||
|
val NESTED_JS_EXPORT by error<KtElement>()
|
||||||
|
}
|
||||||
|
|
||||||
val JSCODE by object : DiagnosticGroup("JsCode") {
|
val JSCODE by object : DiagnosticGroup("JsCode") {
|
||||||
val JSCODE_ARGUMENT_NON_CONST_EXPRESSION by error<KtElement>()
|
val JSCODE_ARGUMENT_NON_CONST_EXPRESSION by error<KtElement>()
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -76,7 +76,6 @@ object FirJsErrors {
|
|||||||
val EXTERNAL_INTERFACE_AS_REIFIED_TYPE_ARGUMENT by error1<KtElement, ConeKotlinType>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val EXTERNAL_INTERFACE_AS_REIFIED_TYPE_ARGUMENT by error1<KtElement, ConeKotlinType>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
|
|
||||||
// Export
|
// Export
|
||||||
val NESTED_JS_EXPORT by error0<KtElement>()
|
|
||||||
val WRONG_EXPORTED_DECLARATION by error1<KtElement, String>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val WRONG_EXPORTED_DECLARATION by error1<KtElement, String>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val NON_EXPORTABLE_TYPE by warning2<KtElement, String, ConeKotlinType>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
val NON_EXPORTABLE_TYPE by warning2<KtElement, String, ConeKotlinType>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val NON_CONSUMABLE_EXPORTED_IDENTIFIER by warning1<KtElement, String>()
|
val NON_CONSUMABLE_EXPORTED_IDENTIFIER by warning1<KtElement, String>()
|
||||||
|
|||||||
-2
@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NATIVE_INDEX
|
|||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NATIVE_INDEXER_KEY_SHOULD_BE_STRING_OR_NUMBER
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NATIVE_INDEXER_KEY_SHOULD_BE_STRING_OR_NUMBER
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NATIVE_INDEXER_WRONG_PARAMETER_COUNT
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NATIVE_INDEXER_WRONG_PARAMETER_COUNT
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NATIVE_SETTER_WRONG_RETURN_TYPE
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NATIVE_SETTER_WRONG_RETURN_TYPE
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NESTED_JS_EXPORT
|
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NESTED_JS_MODULE_PROHIBITED
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NESTED_JS_MODULE_PROHIBITED
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NON_CONSUMABLE_EXPORTED_IDENTIFIER
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NON_CONSUMABLE_EXPORTED_IDENTIFIER
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NON_EXPORTABLE_TYPE
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors.NON_EXPORTABLE_TYPE
|
||||||
@@ -201,7 +200,6 @@ object FirJsErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
|
|||||||
FirDiagnosticRenderers.RENDER_TYPE,
|
FirDiagnosticRenderers.RENDER_TYPE,
|
||||||
)
|
)
|
||||||
map.put(EXTERNAL_INTERFACE_AS_CLASS_LITERAL, "Cannot refer to external interface from class literal.")
|
map.put(EXTERNAL_INTERFACE_AS_CLASS_LITERAL, "Cannot refer to external interface from class literal.")
|
||||||
map.put(NESTED_JS_EXPORT, "'@JsExport' is only allowed on files and top-level declarations.")
|
|
||||||
map.put(WRONG_EXPORTED_DECLARATION, "Declaration of such kind ({0}) cannot be exported to JavaScript.", CommonRenderers.STRING)
|
map.put(WRONG_EXPORTED_DECLARATION, "Declaration of such kind ({0}) cannot be exported to JavaScript.", CommonRenderers.STRING)
|
||||||
map.put(
|
map.put(
|
||||||
NON_EXPORTABLE_TYPE,
|
NON_EXPORTABLE_TYPE,
|
||||||
|
|||||||
+1
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.analysis.js.checkers
|
|||||||
|
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.*
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.*
|
||||||
import org.jetbrains.kotlin.fir.analysis.js.checkers.declaration.*
|
import org.jetbrains.kotlin.fir.analysis.js.checkers.declaration.*
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.web.common.checkers.declaration.FirJsExportAnnotationChecker
|
||||||
|
|
||||||
object JsDeclarationCheckers : DeclarationCheckers() {
|
object JsDeclarationCheckers : DeclarationCheckers() {
|
||||||
override val functionCheckers: Set<FirFunctionChecker>
|
override val functionCheckers: Set<FirFunctionChecker>
|
||||||
|
|||||||
+2
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.analysis.wasm.checkers
|
|||||||
|
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.*
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.*
|
||||||
import org.jetbrains.kotlin.fir.analysis.wasm.checkers.declaration.*
|
import org.jetbrains.kotlin.fir.analysis.wasm.checkers.declaration.*
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.web.common.checkers.declaration.FirJsExportAnnotationChecker
|
||||||
|
|
||||||
object WasmDeclarationCheckers : DeclarationCheckers() {
|
object WasmDeclarationCheckers : DeclarationCheckers() {
|
||||||
override val classCheckers: Set<FirClassChecker>
|
override val classCheckers: Set<FirClassChecker>
|
||||||
@@ -21,5 +22,6 @@ object WasmDeclarationCheckers : DeclarationCheckers() {
|
|||||||
FirWasmExportAnnotationChecker,
|
FirWasmExportAnnotationChecker,
|
||||||
FirWasmExternalChecker,
|
FirWasmExternalChecker,
|
||||||
FirWasmJsFunAnnotationChecker,
|
FirWasmJsFunAnnotationChecker,
|
||||||
|
FirJsExportAnnotationChecker
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+3
@@ -33,6 +33,9 @@ object FirWebCommonErrors {
|
|||||||
val WRONG_INITIALIZER_OF_EXTERNAL_DECLARATION by error0<KtElement>()
|
val WRONG_INITIALIZER_OF_EXTERNAL_DECLARATION by error0<KtElement>()
|
||||||
val WRONG_DEFAULT_VALUE_FOR_EXTERNAL_FUN_PARAMETER by error0<KtElement>()
|
val WRONG_DEFAULT_VALUE_FOR_EXTERNAL_FUN_PARAMETER by error0<KtElement>()
|
||||||
|
|
||||||
|
// Export
|
||||||
|
val NESTED_JS_EXPORT by error0<KtElement>()
|
||||||
|
|
||||||
// JsCode
|
// JsCode
|
||||||
val JSCODE_ARGUMENT_NON_CONST_EXPRESSION by error0<KtElement>()
|
val JSCODE_ARGUMENT_NON_CONST_EXPRESSION by error0<KtElement>()
|
||||||
|
|
||||||
|
|||||||
+3
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErro
|
|||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.JSCODE_ARGUMENT_NON_CONST_EXPRESSION
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.JSCODE_ARGUMENT_NON_CONST_EXPRESSION
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.NESTED_CLASS_IN_EXTERNAL_INTERFACE
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.NESTED_CLASS_IN_EXTERNAL_INTERFACE
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.NESTED_EXTERNAL_DECLARATION
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.NESTED_EXTERNAL_DECLARATION
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.NESTED_JS_EXPORT
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.NON_ABSTRACT_MEMBER_OF_EXTERNAL_INTERFACE
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.NON_ABSTRACT_MEMBER_OF_EXTERNAL_INTERFACE
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.WRONG_BODY_OF_EXTERNAL_DECLARATION
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors.WRONG_BODY_OF_EXTERNAL_DECLARATION
|
||||||
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
|
||||||
@@ -47,6 +48,8 @@ object FirWebCommonErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
|
|||||||
"Wrong default value for parameter of external function. Must be ' = definedExternally'."
|
"Wrong default value for parameter of external function. Must be ' = definedExternally'."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
map.put(NESTED_JS_EXPORT, "'@JsExport' is only allowed on files and top-level declarations.")
|
||||||
|
|
||||||
map.put(JSCODE_ARGUMENT_NON_CONST_EXPRESSION, "An argument for the 'js()' function must be a constant string expression.")
|
map.put(JSCODE_ARGUMENT_NON_CONST_EXPRESSION, "An argument for the 'js()' function must be a constant string expression.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+5
-5
@@ -3,25 +3,25 @@
|
|||||||
* 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.declaration
|
package org.jetbrains.kotlin.fir.analysis.web.common.checkers.declaration
|
||||||
|
|
||||||
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.declaration.FirBasicDeclarationChecker
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirBasicDeclarationChecker
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.isTopLevel
|
import org.jetbrains.kotlin.fir.analysis.checkers.isTopLevel
|
||||||
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.FirDeclaration
|
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
|
||||||
import org.jetbrains.kotlin.fir.declarations.FirFile
|
import org.jetbrains.kotlin.fir.declarations.FirFile
|
||||||
import org.jetbrains.kotlin.fir.declarations.getAnnotationByClassId
|
import org.jetbrains.kotlin.fir.declarations.getAnnotationByClassId
|
||||||
import org.jetbrains.kotlin.name.JsStandardClassIds
|
import org.jetbrains.kotlin.name.WebCommonStandardClassIds
|
||||||
|
|
||||||
object FirJsExportAnnotationChecker : FirBasicDeclarationChecker() {
|
object FirJsExportAnnotationChecker : FirBasicDeclarationChecker() {
|
||||||
override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
|
override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
|
||||||
val jsExport = declaration.getAnnotationByClassId(JsStandardClassIds.Annotations.JsExport, context.session) ?: return
|
val jsExport = declaration.getAnnotationByClassId(WebCommonStandardClassIds.Annotations.JsExport, context.session) ?: return
|
||||||
|
|
||||||
if (declaration !is FirFile && !context.isTopLevel) {
|
if (declaration !is FirFile && !context.isTopLevel) {
|
||||||
reporter.reportOn(jsExport.source, FirJsErrors.NESTED_JS_EXPORT, context)
|
reporter.reportOn(jsExport.source, FirWebCommonErrors.NESTED_JS_EXPORT, context)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -633,8 +633,8 @@ val FIR_NON_SUPPRESSIBLE_ERROR_NAMES: Set<String> = setOf(
|
|||||||
"JS_EXTERNAL_INHERITORS_ONLY",
|
"JS_EXTERNAL_INHERITORS_ONLY",
|
||||||
"JS_EXTERNAL_ARGUMENT",
|
"JS_EXTERNAL_ARGUMENT",
|
||||||
"EXTERNAL_INTERFACE_AS_REIFIED_TYPE_ARGUMENT",
|
"EXTERNAL_INTERFACE_AS_REIFIED_TYPE_ARGUMENT",
|
||||||
"NESTED_JS_EXPORT",
|
|
||||||
"WRONG_EXPORTED_DECLARATION",
|
"WRONG_EXPORTED_DECLARATION",
|
||||||
|
"NESTED_JS_EXPORT",
|
||||||
"DELEGATION_BY_DYNAMIC",
|
"DELEGATION_BY_DYNAMIC",
|
||||||
"PROPERTY_DELEGATION_BY_DYNAMIC",
|
"PROPERTY_DELEGATION_BY_DYNAMIC",
|
||||||
"SPREAD_OPERATOR_IN_DYNAMIC_CALL",
|
"SPREAD_OPERATOR_IN_DYNAMIC_CALL",
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
// !OPT_IN: kotlin.js.ExperimentalJsExport
|
|
||||||
|
|
||||||
@JsExport
|
|
||||||
fun foo1() {
|
|
||||||
}
|
|
||||||
|
|
||||||
class C {
|
|
||||||
@JsExport
|
|
||||||
fun memberFunction() {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun foo2() {
|
|
||||||
@JsExport
|
|
||||||
fun localFun() {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val p1 = (@JsExport fun () {})
|
|
||||||
|
|
||||||
<!WRONG_ANNOTATION_TARGET!>@JsExport<!>
|
|
||||||
class C2
|
|
||||||
|
|
||||||
<!WRONG_ANNOTATION_TARGET!>@JsExport<!>
|
|
||||||
var p2: Int = 1
|
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// FIR_IDENTICAL
|
||||||
// !OPT_IN: kotlin.js.ExperimentalJsExport
|
// !OPT_IN: kotlin.js.ExperimentalJsExport
|
||||||
|
|
||||||
@JsExport
|
@JsExport
|
||||||
|
|||||||
Reference in New Issue
Block a user