Compiler&plugin deprecations cleanup: replace streams with sequences.

This commit is contained in:
Ilya Gorbunov
2015-06-25 21:09:30 +03:00
parent 5779b89ff0
commit 86f4a1b6e4
18 changed files with 34 additions and 34 deletions
@@ -84,7 +84,7 @@ public class LazyPackageFragmentScopeForJavaPackage(
// neither objects nor enum members can be in java package
if (!kindFilter.acceptsKinds(DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK)) return listOf()
return jPackage.getClasses(nameFilter).stream()
return jPackage.getClasses(nameFilter).asSequence()
.filter { c -> c.getOriginKind() != JavaClass.OriginKind.KOTLIN_LIGHT_CLASS }
.map { c -> c.getName() }.toList()
}
@@ -44,8 +44,8 @@ open class ClassMemberIndex(val jClass: JavaClass, val memberFilter: (JavaMember
memberFilter(m) && !DescriptorResolverUtils.isObjectMethodInInterface(m)
}
private val methods = jClass.getMethods().stream().filter(methodFilter).groupBy { m -> m.getName() }
private val fields = jClass.getFields().stream().filter(memberFilter).valuesToMap { m -> m.getName() }
private val methods = jClass.getMethods().asSequence().filter(methodFilter).groupBy { m -> m.getName() }
private val fields = jClass.getFields().asSequence().filter(memberFilter).valuesToMap { m -> m.getName() }
override fun findMethodsByName(name: Name): Collection<JavaMethod> = methods[name] ?: listOf()
override fun getMethodNames(nameFilter: (Name) -> Boolean): Collection<Name> = jClass.getAllMemberNames(methodFilter) { getMethods() }