azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Remove HIDDEN_ANNOTATION_FQ_NAME.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-02-20 19:23:49 +03:00
parent 6a1664c1b3
commit 5240233eda
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
+2 -6
View File
@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -178,11 +178,7 @@ enum class DeprecationLevelValue {
WARNING, ERROR, HIDDEN WARNING, ERROR, HIDDEN
} }
@Deprecated("Should be removed together with kotlin.HiddenDeclaration")
private val HIDDEN_ANNOTATION_FQ_NAME = FqName("kotlin.HiddenDeclaration")
fun DeclarationDescriptor.isHiddenInResolution(): Boolean { fun DeclarationDescriptor.isHiddenInResolution(): Boolean {
if (this is FunctionDescriptor && this.isHiddenToOvercomeSignatureClash) return true if (this is FunctionDescriptor && this.isHiddenToOvercomeSignatureClash) return true
return annotations.findAnnotation(HIDDEN_ANNOTATION_FQ_NAME) != null return getDeprecation()?.deprecationLevel == DeprecationLevelValue.HIDDEN
|| getDeprecation()?.deprecationLevel == DeprecationLevelValue.HIDDEN
} }