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

DescriptorKindFilter: more correct filtering of kind mask from excludes

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-07-16 17:12:44 +03:00
parent 94a00540be
commit e934d7166b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
+10 -2
View File
@@ -100,9 +100,17 @@ public fun JetScope.getDescriptorsFiltered(
} }
public class DescriptorKindFilter( public class DescriptorKindFilter(
public val kindMask: Int, kindMask: Int,
public val excludes: List<DescriptorKindExclude> = listOf() public val excludes: List<DescriptorKindExclude> = listOf()
) { ) {
public val kindMask: Int
init {
var mask = kindMask
excludes.forEach { mask = mask and it.fullyExcludedDescriptorKinds.inv() }
this.kindMask = mask
}
public fun accepts(descriptor: DeclarationDescriptor): Boolean public fun accepts(descriptor: DeclarationDescriptor): Boolean
= kindMask and descriptor.kind() != 0 && excludes.all { !it.matches(descriptor) } = kindMask and descriptor.kind() != 0 && excludes.all { !it.matches(descriptor) }
@@ -110,7 +118,7 @@ public class DescriptorKindFilter(
= kindMask and kinds != 0 = kindMask and kinds != 0
public fun exclude(exclude: DescriptorKindExclude): DescriptorKindFilter public fun exclude(exclude: DescriptorKindExclude): DescriptorKindFilter
= DescriptorKindFilter(kindMask and exclude.fullyExcludedDescriptorKinds.inv(), excludes + listOf(exclude)) = DescriptorKindFilter(kindMask, excludes + listOf(exclude))
public fun withoutKinds(kinds: Int): DescriptorKindFilter public fun withoutKinds(kinds: Int): DescriptorKindFilter
= DescriptorKindFilter(kindMask and kinds.inv(), excludes) = DescriptorKindFilter(kindMask and kinds.inv(), excludes)