MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 06:39:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gh] Always expose threads VMs in-order to ensure correct navigation order

Browse Source 
GitOrigin-RevId: 92d9a647f878ec8f7c3bd2eea058c46da5e44a12
This commit is contained in:
Chris Lemaire
2025-06-12 18:28:37 +02:00
committed by intellij-monorepo-bot
parent a49a7af36a
commit be9dec3ae4
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRThreadsViewModels.kt
View File

@@ -71,18 +71,6 @@ internal class GHPRThreadsViewModelsImpl(
}
}.shareIn(cs, SharingStarted.Lazily, 1)
override val compactThreads: StateFlow<Collection<GHPRCompactReviewThreadViewModel>> =
dataProvider.reviewData.threadsComputationFlow
.transformConsecutiveSuccesses(false) {
mapDataToModel(GHPullRequestReviewThread::id,
{ createThread(it) },
{ update(it) })
}.map { it.getOrNull().orEmpty() }
.stateIn(cs, SharingStarted.Lazily, emptyList())
private fun CoroutineScope.createThread(initialData: GHPullRequestReviewThread) =
UpdateableGHPRCompactReviewThreadViewModel(project, this, dataContext, dataProvider, initialData)
private val threadOrder: StateFlow<ComputedResult<TreeSet<ThreadIdAndPosition>>?> =
combine(changesFetchFlow, dataProvider.reviewData.threadsComputationFlow) { allChangesResult, allThreadsResult ->
val allChanges = allChangesResult.getOrNull() ?: return@combine ComputedResult.loading()
@@ -102,6 +90,32 @@ internal class GHPRThreadsViewModelsImpl(
}
}
private val unorderedCompactThreads: StateFlow<Collection<GHPRCompactReviewThreadViewModel>> =
dataProvider.reviewData.threadsComputationFlow
.transformConsecutiveSuccesses(false) {
mapDataToModel(GHPullRequestReviewThread::id,
{ createThread(it) },
{ update(it) })
}.map { it.getOrNull().orEmpty() }
.stateIn(cs, SharingStarted.Lazily, emptyList())
override val compactThreads: StateFlow<Collection<GHPRCompactReviewThreadViewModel>> =
unorderedCompactThreads.combineState(threadOrder) { threads, threadOrder -> threads to threadOrder }
.combineState(threadPositionsById) { (threads, threadOrder), threadPositionsById ->
// if order is not ready, do not expose the list yet
val threadOrder = threadOrder?.getOrNull() ?: return@combineState emptyList()
val threadPositionsById = threadPositionsById?.getOrNull() ?: return@combineState emptyList()
if (threads.size != threadOrder.size || threadOrder.size != threadPositionsById.size) return@combineState emptyList()
threads.sortedBy {
val position = threadPositionsById[it.id] ?: return@sortedBy Int.MAX_VALUE
val index = threadOrder.indexOf(position)
if (index == -1) Int.MAX_VALUE else index
}
}
private fun CoroutineScope.createThread(initialData: GHPullRequestReviewThread) =
UpdateableGHPRCompactReviewThreadViewModel(project, this, dataContext, dataProvider, initialData)
override val threadMappingData: StateFlow<Map<String, GHPRThreadsViewModels.ThreadMappingData>> =
dataProvider.reviewData.threadsComputationFlow
.transformConsecutiveSuccesses(false) {