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

Minor. Rename excludes list

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-06-11 15:19:27 +07:00
parent cbabb4f76a
commit 3b4cef1b56
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/memberScopes.kt
+1 -1
View File
@@ -54,7 +54,7 @@ internal inline fun FunctionCollector(
if (candidate.kind.isReal if (candidate.kind.isReal
&& !candidate.isKniBridgeFunction() && !candidate.isKniBridgeFunction()
&& !candidate.isDeprecatedTopLevelFunction() && !candidate.isDeprecatedTopLevelFunction()
&& !candidate.isBlacklistedDarwinFunction() && !candidate.isIgnoredDarwinFunction()
) { ) {
typedCollector(candidate) typedCollector(candidate)
} }
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/blacklist.kt → native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt
+1 -1
View File
@@ -16,7 +16,7 @@ internal fun SimpleFunctionDescriptor.isDeprecatedTopLevelFunction() =
containingDeclaration is PackageFragmentDescriptor && annotations.hasAnnotation(DEPRECATED_ANNOTATION_FQN) containingDeclaration is PackageFragmentDescriptor && annotations.hasAnnotation(DEPRECATED_ANNOTATION_FQN)
// the following logic determines Kotlin functions with conflicting overloads in Darwin library: // 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) if ((containingDeclaration as? PackageFragmentDescriptor)?.fqName?.isUnderDarwinPackage != true)
return false return false