From 5779b89ff0b496de8039a429b2c1d30770219d52 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 25 Jun 2015 20:25:31 +0300 Subject: [PATCH] Deprecations cleanup: sequence -> asSequence --- .../jetbrains/kotlin/resolve/CompositeBindingContext.kt | 7 +++---- .../kotlin/resolve/lazy/descriptors/LazyAnnotations.kt | 2 +- .../tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt | 2 +- .../jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt | 4 ++-- .../src/kotlin/reflect/jvm/internal/KClassImpl.kt | 2 +- .../src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt | 4 ++-- .../idea/actions/internal/CheckPartialBodyResolveAction.kt | 2 +- .../idea/actions/internal/FindImplicitNothingAction.kt | 2 +- .../debugger/PositionManagerLibraryClassFileSearcher.kt | 4 ++-- .../kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt | 6 +++--- js/js.libraries/src/core/regex.kt | 2 +- libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt | 2 +- 12 files changed, 19 insertions(+), 20 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt index 3470b40b4e4..7b0ff6d7685 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt @@ -30,7 +30,7 @@ public class CompositeBindingContext private constructor( private val delegates: List ) : BindingContext { override fun getType(expression: JetExpression): JetType? { - return delegates.sequence().map { it.getType(expression) }.firstOrNull { it != null } + return delegates.asSequence().map { it.getType(expression) }.firstOrNull { it != null } } companion object { @@ -42,7 +42,7 @@ public class CompositeBindingContext private constructor( } override fun get(slice: ReadOnlySlice?, key: K?): V? { - return delegates.sequence().map { it[slice, key] }.firstOrNull { it != null } + return delegates.asSequence().map { it[slice, key] }.firstOrNull { it != null } } override fun getKeys(slice: WritableSlice?): Collection { @@ -65,8 +65,7 @@ public class CompositeBindingContext private constructor( ) : Diagnostics { override fun iterator(): Iterator { - val emptyStream = listOf().sequence() - return delegates.fold(emptyStream, { r, t -> r + t.sequence() }).iterator() + return delegates.fold(emptySequence(), { r, t -> r + t.asSequence() }).iterator() } override val modificationTracker = object : ModificationTracker { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt index 06c2d219dd2..3cb342e5418 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt @@ -77,7 +77,7 @@ public class LazyAnnotations( override fun findExternalAnnotation(fqName: FqName) = null - override fun iterator(): Iterator = annotationEntries.sequence().map(annotation).iterator() + override fun iterator(): Iterator = annotationEntries.asSequence().map(annotation).iterator() override fun forceResolveAllContents() { // To resolve all entries diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt index b6308f8a4c9..a23c9e83f8d 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt @@ -53,7 +53,7 @@ public object InlineTestUtil { val skipParameterChecking = - sourceFiles.sequence().filter { + sourceFiles.asSequence().filter { InTextDirectivesUtils.isDirectiveDefined(it.getText(), "NO_CHECK_LAMBDA_INLINING") }.any() diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt index 169f631dffa..3c5ab696ad9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt @@ -39,7 +39,7 @@ class LazyJavaAnnotations( c.externalAnnotationResolver.findExternalAnnotation(annotationOwner, fqName)?.let(annotationDescriptors) override fun iterator() = - annotationOwner.getAnnotations().sequence().map(annotationDescriptors).filterNotNull().iterator() + annotationOwner.getAnnotations().asSequence().map(annotationDescriptors).filterNotNull().iterator() override fun isEmpty() = !iterator().hasNext() } @@ -56,7 +56,7 @@ class FilteredAnnotations( if (fqNameFilter(fqName)) delegate.findExternalAnnotation(fqName) else null - override fun iterator() = delegate.sequence() + override fun iterator() = delegate.asSequence() .filter { annotation -> val descriptor = annotation.getType().getConstructor().getDeclarationDescriptor() descriptor != null && DescriptorUtils.getFqName(descriptor).let { fqName -> diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt index 43fa0cc67ca..f00a88bd7ed 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt @@ -80,7 +80,7 @@ class KClassImpl(override val jClass: Class) : KCallableContainerImpl(), K } private fun

> getProperties(extension: Boolean, declared: Boolean, create: (PropertyDescriptor) -> P): Collection

= - scope.getAllDescriptors().sequence() + scope.getAllDescriptors().asSequence() .filterIsInstance() .filter { descriptor -> (descriptor.getExtensionReceiverParameter() != null) == extension && diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt index cbf06d82779..d514f844681 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt @@ -53,7 +53,7 @@ public fun CallableDescriptor.substituteExtensionIfCallable( callType: CallType, containingDeclarationOrModule: DeclarationDescriptor ): Collection { - val sequence = receivers.sequence().flatMap { substituteExtensionIfCallable(it, callType, context, dataFlowInfo, containingDeclarationOrModule).sequence() } + val sequence = receivers.asSequence().flatMap { substituteExtensionIfCallable(it, callType, context, dataFlowInfo, containingDeclarationOrModule).asSequence() } if (getTypeParameters().isEmpty()) { // optimization for non-generic callables return sequence.firstOrNull()?.let { listOf(it) } ?: listOf() } @@ -81,7 +81,7 @@ public fun CallableDescriptor.substituteExtensionIfCallable( if (!receiver.exists()) return listOf() if (!callType.canCall(this)) return listOf() - var types = SmartCastUtils.getSmartCastVariants(receiver, bindingContext, containingDeclarationOrModule, dataFlowInfo).sequence() + var types = SmartCastUtils.getSmartCastVariants(receiver, bindingContext, containingDeclarationOrModule, dataFlowInfo).asSequence() if (callType == CallType.SAFE) { types = types.map { it.makeNotNullable() } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt index b9c6836f673..9a477830511 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt @@ -167,7 +167,7 @@ public class CheckPartialBodyResolveAction : AnAction() { private fun allKotlinFiles(filesOrDirs: Array, project: Project): Sequence { val manager = PsiManager.getInstance(project) return allFiles(filesOrDirs) - .sequence() + .asSequence() .map { manager.findFile(it) as? JetFile } .filterNotNull() } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt index 25e7e6f6c77..74830ca2c6f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt @@ -153,7 +153,7 @@ public class FindImplicitNothingAction : AnAction() { private fun allKotlinFiles(filesOrDirs: Array, project: Project): Sequence { val manager = PsiManager.getInstance(project) return allFiles(filesOrDirs) - .sequence() + .asSequence() .map { manager.findFile(it) as? JetFile } .filterNotNull() } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt index dc175d04f04..793b9b1081c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -106,11 +106,11 @@ private fun findPackagePartFileNamesForElement(elementAt: JetElement): List + return (args1.asSequence() zip args2.asSequence()).fold(MATCHED) { s, p -> val (arg1, arg2) = p s and when { arg1 == arg2 -> MATCHED arg1 == null || arg2 == null -> UNMATCHED - else -> (arg1.getArguments().sequence() zip arg2.getArguments().sequence()).fold(MATCHED) { s, p -> + else -> (arg1.getArguments().asSequence() zip arg2.getArguments().asSequence()).fold(MATCHED) { s, p -> s and matchArguments(p.first, p.second) } } @@ -737,7 +737,7 @@ public class JetPsiUnifier( val patternElements = pattern.elements if (targetElements.size() != patternElements.size()) return UNMATCHED - return (targetElements.sequence() zip patternElements.sequence()).fold(MATCHED) { s, p -> + return (targetElements.asSequence() zip patternElements.asSequence()).fold(MATCHED) { s, p -> if (s != UNMATCHED) s and doUnify(p.first, p.second) else s } } diff --git a/js/js.libraries/src/core/regex.kt b/js/js.libraries/src/core/regex.kt index 767a277ba9d..19e8d5677bb 100644 --- a/js/js.libraries/src/core/regex.kt +++ b/js/js.libraries/src/core/regex.kt @@ -183,7 +183,7 @@ private fun RegExp.findNext(input: String, from: Int): MatchResult? { override fun contains(o: Any?): Boolean = this.any { it == o } override fun containsAll(c: Collection): Boolean = c.all({contains(it)}) - override fun iterator(): Iterator = indices.sequence().map { this[it] }.iterator() + override fun iterator(): Iterator = indices.asSequence().map { this[it] }.iterator() override fun get(index: Int): MatchGroup? = match[index]?.let { MatchGroup(it) } } diff --git a/libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt b/libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt index 6b0f1304b47..c5b811697f2 100644 --- a/libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt +++ b/libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt @@ -234,7 +234,7 @@ private fun Matcher.findNext(from: Int): MatchResult? { override fun contains(o: Any?): Boolean = o is MatchGroup? && this.any({ it == o }) override fun containsAll(c: Collection): Boolean = c.all({contains(it)}) - override fun iterator(): Iterator = indices.sequence().map { this[it] }.iterator() + override fun iterator(): Iterator = indices.asSequence().map { this[it] }.iterator() override fun get(index: Int): MatchGroup? { val range = matchResult.range(index) return if (range.start >= 0)