MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Remove TransformingIterator util

Browse Source 
^KTIJ-32260 Fixed

GitOrigin-RevId: 19348a77fe24b7692cad057026d73b90cc5b9763
This commit is contained in:
Roman Efremov
2024-11-26 11:42:26 +00:00
committed by intellij-monorepo-bot
parent 816bcb1c45
commit b690ef2dc1
2 changed files with 32 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/ModuleInfoProvider.kt
+32 -49
View File
@@ -270,15 +270,12 @@ class ModuleInfoProvider(private val project: Project) {
val contextualModuleResult = contextByContextualBinaryModule(collectionRequest)
contextualModuleResult?.let { yield(Result.success(it)) }
yieldAll(object : Iterable<Result<IdeaModuleInfo>> {
override fun iterator(): Iterator<Result<IdeaModuleInfo>> {
val orderEntries = runReadAction { fileIndex.getOrderEntriesForFile(virtualFile) }
val iterator = orderEntries.iterator()
return MappingIterator(iterator) { orderEntry ->
collectByOrderEntry(collectionRequest, orderEntry)?.let(Result.Companion::success)
}
val orderEntries = runReadAction { fileIndex.getOrderEntriesForFile(virtualFile) }
yieldAll(
orderEntries.asSequence().mapNotNull { orderEntry ->
collectByOrderEntry(collectionRequest, orderEntry)?.let(Result.Companion::success)
}
})
)
}
}
@@ -321,28 +318,24 @@ class ModuleInfoProvider(private val project: Project) {
}
private suspend fun SequenceScope<Result<IdeaModuleInfo>>.collectSourceRelatedByFile(virtualFile: VirtualFile, config: Configuration) {
yieldAll(object : Iterable<Result<IdeaModuleInfo>> {
override fun iterator(): Iterator<Result<IdeaModuleInfo>> {
val modules = sequence {
withCallExtensions(
config = config,
extensionBlock = { findContainingModules(project, virtualFile) },
) {
runReadAction { fileIndex.getModuleForFile(virtualFile) }?.let { module ->
yield(module)
}
}
}
val iterator = modules.iterator()
return MappingIterator(iterator) { module ->
if (module.isDisposed) return@MappingIterator null
val projectFileIndex = ProjectFileIndex.getInstance(project)
val sourceRootType: KotlinSourceRootType? = projectFileIndex.getKotlinSourceRootType(virtualFile)
module.asSourceInfo(sourceRootType)?.let(Result.Companion::success)
val modules = sequence {
withCallExtensions(
config = config,
extensionBlock = { findContainingModules(project, virtualFile) },
) {
runReadAction { fileIndex.getModuleForFile(virtualFile) }?.let { module ->
yield(module)
}
}
})
}
yieldAll(
modules.mapNotNull { module ->
if (module.isDisposed) return@mapNotNull null
val projectFileIndex = ProjectFileIndex.getInstance(project)
val sourceRootType: KotlinSourceRootType? = projectFileIndex.getKotlinSourceRootType(virtualFile)
module.asSourceInfo(sourceRootType)?.let(Result.Companion::success)
}
)
val fileOrigin = getOutsiderFileOrigin(project, virtualFile)
if (fileOrigin != null) {
@@ -499,27 +492,17 @@ private sealed class UserDataModuleContainer {
@K1ModeProjectStructureApi
fun Sequence<Result<IdeaModuleInfo>>.unwrap(
errorHandler: (String, Throwable) -> Unit,
): Sequence<IdeaModuleInfo> {
val originalSequence = this
return object : Sequence<IdeaModuleInfo> {
override fun iterator(): Iterator<IdeaModuleInfo> {
return object : TransformingIterator<IdeaModuleInfo>() {
private var iterator: Iterator<Result<IdeaModuleInfo>>? = originalSequence.iterator()
override fun calculateHasNext(): Boolean = iterator?.hasNext() == true
override fun calculateNext(): IdeaModuleInfo? {
val iter = iterator ?: return null
val result = iter.next()
result.getOrNull()?.let { return it }
val error = result.exceptionOrNull()
if (error != null) {
errorHandler("Could not find correct module information", error)
iterator = null
}
return null
}
}
): Sequence<IdeaModuleInfo> = sequence {
for (result in this@unwrap) {
val successResult = result.getOrNull()
if (successResult != null) {
yield(successResult)
continue
}
val error = result.exceptionOrNull()
if (error != null) {
errorHandler("Could not find correct module information", error)
break
}
}
}
plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/util/seq.kt
-44
View File
@@ -1,44 +0,0 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.base.util
abstract class TransformingIterator<T> : Iterator<T> {
protected var next: T? = null
protected abstract fun calculateHasNext(): Boolean
protected abstract fun calculateNext(): T?
override fun hasNext(): Boolean {
while (calculateHasNext()) {
val t = calculateNext()
if (t != null) {
next = t
return true
}
}
next = null
return false
}
override fun next(): T {
val v = next
next = null
if (v != null) return v
hasNext()
val v1 = next
next = null
@Suppress("KotlinConstantConditions")
return v1 ?: throw NoSuchElementException()
}
}
class MappingIterator<K, T>(
private val iterator: Iterator<K>,
private val mapping: (K) -> T?
): TransformingIterator<T>() {
override fun calculateHasNext(): Boolean = iterator.hasNext()
override fun calculateNext(): T? = mapping(iterator.next())
}