From 3b4cef1b565620276b1f46094b22453c939e3e78 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 11 Jun 2020 15:19:27 +0700 Subject: [PATCH] Minor. Rename excludes list --- .../kotlin/descriptors/commonizer/mergedtree/memberScopes.kt | 2 +- .../descriptors/commonizer/utils/{blacklist.kt => excludes.kt} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/{blacklist.kt => excludes.kt} (94%) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/memberScopes.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/memberScopes.kt index 736f3ab150a..1dd5245abc5 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/memberScopes.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/memberScopes.kt @@ -54,7 +54,7 @@ internal inline fun FunctionCollector( if (candidate.kind.isReal && !candidate.isKniBridgeFunction() && !candidate.isDeprecatedTopLevelFunction() - && !candidate.isBlacklistedDarwinFunction() + && !candidate.isIgnoredDarwinFunction() ) { typedCollector(candidate) } diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/blacklist.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt similarity index 94% rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/blacklist.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt index a52835c2004..c81bac42d13 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/blacklist.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt @@ -16,7 +16,7 @@ internal fun SimpleFunctionDescriptor.isDeprecatedTopLevelFunction() = containingDeclaration is PackageFragmentDescriptor && annotations.hasAnnotation(DEPRECATED_ANNOTATION_FQN) // the following logic determines Kotlin functions with conflicting overloads in Darwin library: -internal fun SimpleFunctionDescriptor.isBlacklistedDarwinFunction(): Boolean { +internal fun SimpleFunctionDescriptor.isIgnoredDarwinFunction(): Boolean { if ((containingDeclaration as? PackageFragmentDescriptor)?.fqName?.isUnderDarwinPackage != true) return false