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

Renamed methods

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-12 21:23:49 +03:00
parent 5f5d2de5e0
commit b13c0f2248
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
+3 -3
View File
@@ -302,7 +302,7 @@ public abstract class LazyJavaMemberScope(
nameFilter: (Name) -> Boolean): List<DeclarationDescriptor> { nameFilter: (Name) -> Boolean): List<DeclarationDescriptor> {
val result = LinkedHashSet<DeclarationDescriptor>() val result = LinkedHashSet<DeclarationDescriptor>()
if (kindFilter.acceptsKind(DescriptorKindFilter.CLASSIFIERS_MASK)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.CLASSIFIERS_MASK)) {
for (name in getClassNames(kindFilter, nameFilter)) { for (name in getClassNames(kindFilter, nameFilter)) {
if (nameFilter(name)) { if (nameFilter(name)) {
// Null signifies that a class found in Java is not present in Kotlin (e.g. package class) // Null signifies that a class found in Java is not present in Kotlin (e.g. package class)
@@ -311,7 +311,7 @@ public abstract class LazyJavaMemberScope(
} }
} }
if (kindFilter.acceptsKind(DescriptorKindFilter.FUNCTIONS_MASK) && !kindFilter.excludes.contains(NonExtensions)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK) && !kindFilter.excludes.contains(NonExtensions)) {
for (name in getFunctionNames(kindFilter, nameFilter)) { for (name in getFunctionNames(kindFilter, nameFilter)) {
if (nameFilter(name)) { if (nameFilter(name)) {
result.addAll(getFunctions(name)) result.addAll(getFunctions(name))
@@ -319,7 +319,7 @@ public abstract class LazyJavaMemberScope(
} }
} }
if (kindFilter.acceptsKind(DescriptorKindFilter.VARIABLES_MASK) && !kindFilter.excludes.contains(NonExtensions)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.VARIABLES_MASK) && !kindFilter.excludes.contains(NonExtensions)) {
for (name in getAllPropertyNames()) { for (name in getAllPropertyNames()) {
if (nameFilter(name)) { if (nameFilter(name)) {
result.addAll(getProperties(name)) result.addAll(getProperties(name))
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt
+1 -1
View File
@@ -82,7 +82,7 @@ public class LazyPackageFragmentScopeForJavaPackage(
override fun getClassNames(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<Name> { override fun getClassNames(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<Name> {
// neither objects nor enum members can be in java package // neither objects nor enum members can be in java package
if (!kindFilter.acceptsKind(DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK)) return listOf() if (!kindFilter.acceptsKinds(DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK)) return listOf()
return jPackage.getClasses(nameFilter).stream() return jPackage.getClasses(nameFilter).stream()
.filter { c -> c.getOriginKind() != JavaClass.OriginKind.KOTLIN_LIGHT_CLASS } .filter { c -> c.getOriginKind() != JavaClass.OriginKind.KOTLIN_LIGHT_CLASS }
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SubpackagesScope.kt
+1 -1
View File
@@ -37,7 +37,7 @@ public class SubpackagesScope(private val containingDeclaration: PackageViewDesc
override fun getDescriptors(kindFilter: DescriptorKindFilter, override fun getDescriptors(kindFilter: DescriptorKindFilter,
nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> { nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
if (!kindFilter.acceptsKind(DescriptorKindFilter.PACKAGES_MASK)) return listOf() if (!kindFilter.acceptsKinds(DescriptorKindFilter.PACKAGES_MASK)) return listOf()
val subFqNames = containingDeclaration.getModule().getPackageFragmentProvider().getSubPackagesOf(containingDeclaration.getFqName(), nameFilter) val subFqNames = containingDeclaration.getModule().getPackageFragmentProvider().getSubPackagesOf(containingDeclaration.getFqName(), nameFilter)
val result = ArrayList<DeclarationDescriptor>(subFqNames.size()) val result = ArrayList<DeclarationDescriptor>(subFqNames.size())
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt
+2 -2
View File
@@ -99,13 +99,13 @@ 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.matches(descriptor) }
public fun acceptsKind(kinds: Int): Boolean public fun acceptsKinds(kinds: Int): Boolean
= kindMask and kinds != 0 = kindMask and kinds != 0
public fun exclude(exclude: DescriptorKindExclude): DescriptorKindFilter public fun exclude(exclude: DescriptorKindExclude): DescriptorKindFilter
= DescriptorKindFilter(kindMask, excludes + listOf(exclude)) = DescriptorKindFilter(kindMask, excludes + listOf(exclude))
public fun withoutKind(kinds: Int): DescriptorKindFilter public fun withoutKinds(kinds: Int): DescriptorKindFilter
= DescriptorKindFilter(kindMask and kinds.inv(), excludes) = DescriptorKindFilter(kindMask and kinds.inv(), excludes)
public fun restrictedToKinds(kinds: Int): DescriptorKindFilter? { public fun restrictedToKinds(kinds: Int): DescriptorKindFilter? {
core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.kt
+3 -3
View File
@@ -108,10 +108,10 @@ public abstract class DeserializedMemberScope protected(
for (name in membersProtos().keySet()) { for (name in membersProtos().keySet()) {
if (nameFilter(name)) { if (nameFilter(name)) {
if (kindFilter.acceptsKind(DescriptorKindFilter.FUNCTIONS_MASK)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) {
result.addAll(getFunctions(name)) result.addAll(getFunctions(name))
} }
if (kindFilter.acceptsKind(DescriptorKindFilter.VARIABLES_MASK)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.VARIABLES_MASK)) {
result.addAll(getProperties(name)) result.addAll(getProperties(name))
} }
} }
@@ -119,7 +119,7 @@ public abstract class DeserializedMemberScope protected(
addNonDeclaredDescriptors(result) addNonDeclaredDescriptors(result)
if (kindFilter.acceptsKind(DescriptorKindFilter.CLASSIFIERS_MASK)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.CLASSIFIERS_MASK)) {
addClassDescriptors(result, nameFilter) addClassDescriptors(result, nameFilter)
} }
idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt
+3 -3
View File
@@ -42,15 +42,15 @@ public class StubBasedPackageMemberDeclarationProvider(
override fun getDeclarations(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): List<JetDeclaration> { override fun getDeclarations(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): List<JetDeclaration> {
val result = ArrayList<JetDeclaration>() val result = ArrayList<JetDeclaration>()
if (kindFilter.acceptsKind(DescriptorKindFilter.CLASSIFIERS_MASK)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.CLASSIFIERS_MASK)) {
result.addDeclarations(JetFullClassNameIndex.getInstance(), nameFilter) result.addDeclarations(JetFullClassNameIndex.getInstance(), nameFilter)
} }
if (kindFilter.acceptsKind(DescriptorKindFilter.FUNCTIONS_MASK)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) {
result.addDeclarations(JetTopLevelFunctionsFqnNameIndex.getInstance(), nameFilter) result.addDeclarations(JetTopLevelFunctionsFqnNameIndex.getInstance(), nameFilter)
} }
if (kindFilter.acceptsKind(DescriptorKindFilter.VARIABLES_MASK)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.VARIABLES_MASK)) {
result.addDeclarations(JetTopLevelPropertiesFqnNameIndex.getInstance(), nameFilter) result.addDeclarations(JetTopLevelPropertiesFqnNameIndex.getInstance(), nameFilter)
} }
idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt
+1 -1
View File
@@ -75,7 +75,7 @@ public object TipsManager{
val receiverValue = ExpressionReceiver(receiverExpression, expressionType) val receiverValue = ExpressionReceiver(receiverExpression, expressionType)
val dataFlowInfo = context.getDataFlowInfo(expression) val dataFlowInfo = context.getDataFlowInfo(expression)
val mask = kindFilter.withoutKind(DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK).exclude(DescriptorKindExclude.Extensions) val mask = kindFilter.withoutKinds(DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK).exclude(DescriptorKindExclude.Extensions)
for (variant in SmartCastUtils.getSmartCastVariants(receiverValue, context, dataFlowInfo)) { for (variant in SmartCastUtils.getSmartCastVariants(receiverValue, context, dataFlowInfo)) {
variant.getMemberScope().getDescriptorsFiltered(mask, nameFilter).filterTo(descriptors, ::filterIfInfix) variant.getMemberScope().getDescriptorsFiltered(mask, nameFilter).filterTo(descriptors, ::filterIfInfix)
} }