From 68619be02335413bdb000130554a2afb9876f3ae Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 18 Mar 2015 21:02:29 +0300 Subject: [PATCH] Minor in JS frontend: extract native annotation checkers to separate file. --- .../js/resolve/KotlinJsCheckerProvider.kt | 100 +-------------- .../js/resolve/nativeAnnotationCheckers.kt | 116 ++++++++++++++++++ 2 files changed, 117 insertions(+), 99 deletions(-) create mode 100644 js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsCheckerProvider.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsCheckerProvider.kt index 2ff03f9c7ca..03319b3b772 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsCheckerProvider.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsCheckerProvider.kt @@ -16,109 +16,11 @@ package org.jetbrains.kotlin.js.resolve -import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider -import org.jetbrains.kotlin.resolve.DeclarationChecker -import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.kotlin.diagnostics.DiagnosticSink -import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.kotlin.psi.JetNamedFunction -import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs -import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.types.TypeUtils -import org.jetbrains.kotlin.js.PredefinedAnnotation -import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf import org.jetbrains.kotlin.js.resolve.diagnostics.JsCallChecker +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider public object KotlinJsCheckerProvider : AdditionalCheckerProvider( additionalDeclarationCheckers = listOf(NativeInvokeChecker(), NativeGetterChecker(), NativeSetterChecker()), additionalCallCheckers = listOf(JsCallChecker()), additionalTypeCheckers = listOf() ) - -private abstract class AbstractNativeAnnotationsChecker(private val requiredAnnotation: PredefinedAnnotation) : DeclarationChecker { - - open fun additionalCheck(declaration: JetNamedFunction, descriptor: FunctionDescriptor, diagnosticHolder: DiagnosticSink) {} - - override fun check(declaration: JetDeclaration, descriptor: DeclarationDescriptor, diagnosticHolder: DiagnosticSink) { - val annotationDescriptor = descriptor.getAnnotations().findAnnotation(requiredAnnotation.fqName) - if (annotationDescriptor == null) return - - if (declaration !is JetNamedFunction || descriptor !is FunctionDescriptor) { - diagnosticHolder.report(ErrorsJs.NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN.on(declaration, annotationDescriptor.getType())) - return - } - - val isMember = !DescriptorUtils.isTopLevelDeclaration(descriptor) && descriptor.getVisibility() != Visibilities.LOCAL - val isExtension = DescriptorUtils.isExtension(descriptor) - - if (isMember && (isExtension || !AnnotationsUtils.isNativeObject(descriptor)) || - !isMember && !isExtension - ) { - diagnosticHolder.report(ErrorsJs.NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN.on(declaration, annotationDescriptor.getType())) - } - - additionalCheck(declaration, descriptor, diagnosticHolder) - } -} - -public class NativeInvokeChecker : AbstractNativeAnnotationsChecker(PredefinedAnnotation.NATIVE_INVOKE) - -private abstract class AbstractNativeIndexerChecker( - requiredAnnotation: PredefinedAnnotation, - private val indexerKind: String, - private val requiredParametersCount: Int -) : AbstractNativeAnnotationsChecker(requiredAnnotation) { - - override fun additionalCheck(declaration: JetNamedFunction, descriptor: FunctionDescriptor, diagnosticHolder: DiagnosticSink) { - val parameters = descriptor.getValueParameters() - if (parameters.size() > 0) { - val firstParamClassDescriptor = DescriptorUtils.getClassDescriptorForType(parameters.get(0).getType()) - if (firstParamClassDescriptor != KotlinBuiltIns.getInstance().getString() && - !DescriptorUtils.isSubclass(firstParamClassDescriptor, KotlinBuiltIns.getInstance().getNumber()) - ) { - diagnosticHolder.report(ErrorsJs.NATIVE_INDEXER_KEY_SHOULD_BE_STRING_OR_NUMBER.on(declaration.getValueParameters().firstOrNull(), indexerKind)) - } - } - - if (parameters.size() != requiredParametersCount) { - diagnosticHolder.report(ErrorsJs.NATIVE_INDEXER_WRONG_PARAMETER_COUNT.on(declaration, requiredParametersCount, indexerKind)) - } - - for (parameter in declaration.getValueParameters()) { - if (parameter.hasDefaultValue()) { - diagnosticHolder.report(ErrorsJs.NATIVE_INDEXER_CAN_NOT_HAVE_DEFAULT_ARGUMENTS.on(parameter, indexerKind)) - } - } - } -} - -public class NativeGetterChecker : AbstractNativeIndexerChecker(PredefinedAnnotation.NATIVE_GETTER, "getter", requiredParametersCount = 1) { - override fun additionalCheck(declaration: JetNamedFunction, descriptor: FunctionDescriptor, diagnosticHolder: DiagnosticSink) { - super.additionalCheck(declaration, descriptor, diagnosticHolder) - - if (!TypeUtils.isNullableType(descriptor.getReturnType())) { - diagnosticHolder.report(ErrorsJs.NATIVE_GETTER_RETURN_TYPE_SHOULD_BE_NULLABLE.on(declaration)) - } - } -} - -public class NativeSetterChecker : AbstractNativeIndexerChecker(PredefinedAnnotation.NATIVE_SETTER, "setter", requiredParametersCount = 2) { - override fun additionalCheck(declaration: JetNamedFunction, descriptor: FunctionDescriptor, diagnosticHolder: DiagnosticSink) { - super.additionalCheck(declaration, descriptor, diagnosticHolder) - - val returnType = descriptor.getReturnType() - if (KotlinBuiltIns.isUnit(returnType)) return - - val parameters = descriptor.getValueParameters() - if (parameters.size() < 2) return - - val secondParameterType = parameters.get(1).getType() - if (secondParameterType isSubtypeOf returnType) return - - diagnosticHolder.report(ErrorsJs.NATIVE_SETTER_WRONG_RETURN_TYPE.on(declaration)) - } -} diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt new file mode 100644 index 00000000000..a69cfe9919e --- /dev/null +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt @@ -0,0 +1,116 @@ +/* + * Copyright 2010-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.js.resolve + +import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.diagnostics.DiagnosticSink +import org.jetbrains.kotlin.js.PredefinedAnnotation +import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs +import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils +import org.jetbrains.kotlin.psi.JetDeclaration +import org.jetbrains.kotlin.psi.JetNamedFunction +import org.jetbrains.kotlin.resolve.DeclarationChecker +import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf + +private abstract class AbstractNativeAnnotationsChecker(private val requiredAnnotation: PredefinedAnnotation) : DeclarationChecker { + + open fun additionalCheck(declaration: JetNamedFunction, descriptor: FunctionDescriptor, diagnosticHolder: DiagnosticSink) {} + + override fun check(declaration: JetDeclaration, descriptor: DeclarationDescriptor, diagnosticHolder: DiagnosticSink) { + val annotationDescriptor = descriptor.getAnnotations().findAnnotation(requiredAnnotation.fqName) + if (annotationDescriptor == null) return + + if (declaration !is JetNamedFunction || descriptor !is FunctionDescriptor) { + diagnosticHolder.report(ErrorsJs.NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN.on(declaration, annotationDescriptor.getType())) + return + } + + val isMember = !DescriptorUtils.isTopLevelDeclaration(descriptor) && descriptor.getVisibility() != Visibilities.LOCAL + val isExtension = DescriptorUtils.isExtension(descriptor) + + if (isMember && (isExtension || !AnnotationsUtils.isNativeObject(descriptor)) || + !isMember && !isExtension + ) { + diagnosticHolder.report(ErrorsJs.NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN.on(declaration, annotationDescriptor.getType())) + } + + additionalCheck(declaration, descriptor, diagnosticHolder) + } +} + +public class NativeInvokeChecker : AbstractNativeAnnotationsChecker(PredefinedAnnotation.NATIVE_INVOKE) + +private abstract class AbstractNativeIndexerChecker( + requiredAnnotation: PredefinedAnnotation, + private val indexerKind: String, + private val requiredParametersCount: Int +) : AbstractNativeAnnotationsChecker(requiredAnnotation) { + + override fun additionalCheck(declaration: JetNamedFunction, descriptor: FunctionDescriptor, diagnosticHolder: DiagnosticSink) { + val parameters = descriptor.getValueParameters() + if (parameters.size() > 0) { + val firstParamClassDescriptor = DescriptorUtils.getClassDescriptorForType(parameters.get(0).getType()) + if (firstParamClassDescriptor != KotlinBuiltIns.getInstance().getString() && + !DescriptorUtils.isSubclass(firstParamClassDescriptor, KotlinBuiltIns.getInstance().getNumber()) + ) { + diagnosticHolder.report(ErrorsJs.NATIVE_INDEXER_KEY_SHOULD_BE_STRING_OR_NUMBER.on(declaration.getValueParameters().firstOrNull(), indexerKind)) + } + } + + if (parameters.size() != requiredParametersCount) { + diagnosticHolder.report(ErrorsJs.NATIVE_INDEXER_WRONG_PARAMETER_COUNT.on(declaration, requiredParametersCount, indexerKind)) + } + + for (parameter in declaration.getValueParameters()) { + if (parameter.hasDefaultValue()) { + diagnosticHolder.report(ErrorsJs.NATIVE_INDEXER_CAN_NOT_HAVE_DEFAULT_ARGUMENTS.on(parameter, indexerKind)) + } + } + } +} + +public class NativeGetterChecker : AbstractNativeIndexerChecker(PredefinedAnnotation.NATIVE_GETTER, "getter", requiredParametersCount = 1) { + override fun additionalCheck(declaration: JetNamedFunction, descriptor: FunctionDescriptor, diagnosticHolder: DiagnosticSink) { + super.additionalCheck(declaration, descriptor, diagnosticHolder) + + if (!TypeUtils.isNullableType(descriptor.getReturnType())) { + diagnosticHolder.report(ErrorsJs.NATIVE_GETTER_RETURN_TYPE_SHOULD_BE_NULLABLE.on(declaration)) + } + } +} + +public class NativeSetterChecker : AbstractNativeIndexerChecker(PredefinedAnnotation.NATIVE_SETTER, "setter", requiredParametersCount = 2) { + override fun additionalCheck(declaration: JetNamedFunction, descriptor: FunctionDescriptor, diagnosticHolder: DiagnosticSink) { + super.additionalCheck(declaration, descriptor, diagnosticHolder) + + val returnType = descriptor.getReturnType() + if (KotlinBuiltIns.isUnit(returnType)) return + + val parameters = descriptor.getValueParameters() + if (parameters.size() < 2) return + + val secondParameterType = parameters.get(1).getType() + if (secondParameterType isSubtypeOf returnType) return + + diagnosticHolder.report(ErrorsJs.NATIVE_SETTER_WRONG_RETURN_TYPE.on(declaration)) + } +}