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

[github] Load PR merge base after fetch

Browse Source 
Fixes IDEA-240197

GitOrigin-RevId: b024dcb21b15266bfc5483df4ae448c6d48e2a4e
This commit is contained in:
Ivan Semenov
2020-05-08 10:22:27 +00:00
committed by intellij-monorepo-bot
parent 2771b0eeb4
commit bcfe6b1888
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRChangesDataProviderImpl.kt
+11 -12
View File
@@ -2,9 +2,11 @@
package org.jetbrains.plugins.github.pullrequest.data.provider
import com.intellij.openapi.Disposable
import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequest
import org.jetbrains.plugins.github.pullrequest.data.GHPRIdentifier
import org.jetbrains.plugins.github.pullrequest.data.service.GHPRChangesService
import org.jetbrains.plugins.github.util.LazyCancellableBackgroundProcessValue
import java.util.concurrent.CompletableFuture
import java.util.function.BiFunction
class GHPRChangesDataProviderImpl(private val changesService: GHPRChangesService,
@@ -44,20 +46,17 @@ class GHPRChangesDataProviderImpl(private val changesService: GHPRChangesService
private val changesProviderValue = LazyCancellableBackgroundProcessValue.create { indicator ->
val commitsRequest = apiCommitsRequestValue.value
val baseFetch = baseBranchFetchRequestValue.value
val headFetch = headBranchFetchRequestValue.value
val fetchFuture = CompletableFuture.allOf(baseBranchFetchRequestValue.value, headBranchFetchRequestValue.value)
detailsData.loadDetails().thenCompose {
changesService.loadMergeBaseOid(indicator, it.baseRefOid, it.headRefOid)
}.thenCombine<Unit, String>(baseFetch, BiFunction { mergeBase, _ ->
mergeBase
}).thenCombine<Unit, String>(headFetch, BiFunction { mergeBase, _ ->
mergeBase
}).thenCompose { mergeBase ->
commitsRequest.thenCompose {
changesService.createChangesProvider(indicator, mergeBase, it)
detailsData.loadDetails()
.thenCombine<Void, GHPullRequest>(fetchFuture, BiFunction { details, _ -> details })
.thenCompose {
changesService.loadMergeBaseOid(indicator, it.baseRefOid, it.headRefOid)
}.thenCompose { mergeBase ->
commitsRequest.thenCompose {
changesService.createChangesProvider(indicator, mergeBase, it)
}
}
}
}
override fun loadChanges() = changesProviderValue.value