From 5240233eda46eb1a194a66cbdec550ad8acdaf95 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Sat, 20 Feb 2016 19:23:49 +0300 Subject: [PATCH] Minor. Remove HIDDEN_ANNOTATION_FQ_NAME. --- .../src/org/jetbrains/kotlin/resolve/deprecationUtil.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt index ddd83ec9ca9..dd792c4370b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -178,11 +178,7 @@ enum class DeprecationLevelValue { WARNING, ERROR, HIDDEN } -@Deprecated("Should be removed together with kotlin.HiddenDeclaration") -private val HIDDEN_ANNOTATION_FQ_NAME = FqName("kotlin.HiddenDeclaration") - fun DeclarationDescriptor.isHiddenInResolution(): Boolean { if (this is FunctionDescriptor && this.isHiddenToOvercomeSignatureClash) return true - return annotations.findAnnotation(HIDDEN_ANNOTATION_FQ_NAME) != null - || getDeprecation()?.deprecationLevel == DeprecationLevelValue.HIDDEN + return getDeprecation()?.deprecationLevel == DeprecationLevelValue.HIDDEN }