From af9b9d2bb11e0d60762926352e0fbecb14f79412 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 2 Sep 2015 19:37:38 +0300 Subject: [PATCH] Fixed recursion in reflection intialization --- .../kotlin/resolve/DescriptorUtils.kt | 4 --- .../kotlin/resolve/isAnnotatedAsHidden.kt | 25 +++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 core/descriptors/src/org/jetbrains/kotlin/resolve/isAnnotatedAsHidden.kt diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt index df0b14e0390..6f93c1c2c25 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt @@ -199,7 +199,3 @@ public val DeclarationDescriptor.parentsWithSelf: Sequence get() = parentsWithSelf.drop(1) -private val HIDDEN_ANNOTATION_FQ_NAME = FqName(HiddenDeclaration::class.qualifiedName!!) - -public fun DeclarationDescriptor.isAnnotatedAsHidden(): Boolean = annotations.findAnnotation(HIDDEN_ANNOTATION_FQ_NAME) != null - diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/isAnnotatedAsHidden.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/isAnnotatedAsHidden.kt new file mode 100644 index 00000000000..a88716803c2 --- /dev/null +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/isAnnotatedAsHidden.kt @@ -0,0 +1,25 @@ +/* + * 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.resolve.descriptorUtil + +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.name.FqName + +// we put this into separate file to avoid using reflection inside reflection +private val HIDDEN_ANNOTATION_FQ_NAME = FqName(HiddenDeclaration::class.qualifiedName!!) + +public fun DeclarationDescriptor.isAnnotatedAsHidden(): Boolean = annotations.findAnnotation(HIDDEN_ANNOTATION_FQ_NAME) != null \ No newline at end of file