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

Renamed method

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-07-16 17:14:29 +03:00
parent 14b63759a9
commit 4cfe92f1e5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt
+1 -1
View File
@@ -34,7 +34,7 @@ public class SamConstructorDescriptor(
) )
public object SamConstructorDescriptorKindExclude : DescriptorKindExclude { public object SamConstructorDescriptorKindExclude : DescriptorKindExclude {
override fun matches(descriptor: DeclarationDescriptor) = descriptor is SamConstructorDescriptor override fun excludes(descriptor: DeclarationDescriptor) = descriptor is SamConstructorDescriptor
override val fullyExcludedDescriptorKinds: Int get() = 0 override val fullyExcludedDescriptorKinds: Int get() = 0
} }
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
+5 -5
View File
@@ -112,7 +112,7 @@ public class DescriptorKindFilter(
} }
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.excludes(descriptor) }
public fun acceptsKinds(kinds: Int): Boolean public fun acceptsKinds(kinds: Int): Boolean
= kindMask and kinds != 0 = kindMask and kinds != 0
@@ -202,21 +202,21 @@ public class DescriptorKindFilter(
} }
public trait DescriptorKindExclude { public trait DescriptorKindExclude {
public fun matches(descriptor: DeclarationDescriptor): Boolean public fun excludes(descriptor: DeclarationDescriptor): Boolean
public val fullyExcludedDescriptorKinds: Int public val fullyExcludedDescriptorKinds: Int
override fun toString() = this.javaClass.getSimpleName() override fun toString() = this.javaClass.getSimpleName()
public object Extensions : DescriptorKindExclude { public object Extensions : DescriptorKindExclude {
override fun matches(descriptor: DeclarationDescriptor) override fun excludes(descriptor: DeclarationDescriptor)
= descriptor is CallableDescriptor && descriptor.getExtensionReceiverParameter() != null = descriptor is CallableDescriptor && descriptor.getExtensionReceiverParameter() != null
override val fullyExcludedDescriptorKinds: Int get() = 0 override val fullyExcludedDescriptorKinds: Int get() = 0
} }
public object NonExtensions : DescriptorKindExclude { public object NonExtensions : DescriptorKindExclude {
override fun matches(descriptor: DeclarationDescriptor) override fun excludes(descriptor: DeclarationDescriptor)
= descriptor !is CallableDescriptor || descriptor.getExtensionReceiverParameter() == null = descriptor !is CallableDescriptor || descriptor.getExtensionReceiverParameter() == null
override val fullyExcludedDescriptorKinds: Int override val fullyExcludedDescriptorKinds: Int
@@ -224,7 +224,7 @@ public trait DescriptorKindExclude {
} }
public object EnumEntry : DescriptorKindExclude { public object EnumEntry : DescriptorKindExclude {
override fun matches(descriptor: DeclarationDescriptor) override fun excludes(descriptor: DeclarationDescriptor)
= descriptor is ClassDescriptor && descriptor.getKind() == ClassKind.ENUM_ENTRY = descriptor is ClassDescriptor && descriptor.getKind() == ClassKind.ENUM_ENTRY
override val fullyExcludedDescriptorKinds: Int get() = 0 override val fullyExcludedDescriptorKinds: Int get() = 0
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
+1 -1
View File
@@ -258,7 +258,7 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
private companion object { private companion object {
object NonAnnotationClassifierExclude : DescriptorKindExclude { object NonAnnotationClassifierExclude : DescriptorKindExclude {
override fun matches(descriptor: DeclarationDescriptor): Boolean { override fun excludes(descriptor: DeclarationDescriptor): Boolean {
if (descriptor !is ClassifierDescriptor) return false if (descriptor !is ClassifierDescriptor) return false
return descriptor !is ClassDescriptor || descriptor.getKind() != ClassKind.ANNOTATION_CLASS return descriptor !is ClassDescriptor || descriptor.getKind() != ClassKind.ANNOTATION_CLASS
} }