From b5255646357bd7e901e689ec6e99d40bd2c36211 Mon Sep 17 00:00:00 2001 From: Chris Lemaire Date: Wed, 5 Nov 2025 15:31:23 +0100 Subject: [PATCH] [gl] fix combine not getting collected in create VM (IJPL-216984) #IJPL-216984 Fixed GitOrigin-RevId: eb1ad54644fc7b283b1d7967f37211b6af574cf5 --- .../ui/create/model/GitLabMergeRequestCreateViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/gitlab/gitlab-core/src/org/jetbrains/plugins/gitlab/mergerequest/ui/create/model/GitLabMergeRequestCreateViewModel.kt b/plugins/gitlab/gitlab-core/src/org/jetbrains/plugins/gitlab/mergerequest/ui/create/model/GitLabMergeRequestCreateViewModel.kt index 602211d328cc..b0fd59e93b33 100644 --- a/plugins/gitlab/gitlab-core/src/org/jetbrains/plugins/gitlab/mergerequest/ui/create/model/GitLabMergeRequestCreateViewModel.kt +++ b/plugins/gitlab/gitlab-core/src/org/jetbrains/plugins/gitlab/mergerequest/ui/create/model/GitLabMergeRequestCreateViewModel.kt @@ -197,13 +197,13 @@ internal class GitLabMergeRequestCreateViewModelImpl( } cs.launch { - combine(commits, branchState) { commitsResult, branchState -> + combineAndCollect(commits, branchState) { commitsResult, branchState -> val commits = commitsResult?.getOrNull() if (commits != null && commits.size == 1 && titleText.value.isEmpty()) { - setTitle(commits.first().subject.lines().firstOrNull() ?: return@combine) + setTitle(commits.first().subject.lines().firstOrNull() ?: return@combineAndCollect) } else if (titleText.value.isEmpty()) { - setTitle(when (val branch = branchState?.headBranch ?: return@combine) { + setTitle(when (val branch = branchState?.headBranch ?: return@combineAndCollect) { is GitRemoteBranch -> branch.nameForRemoteOperations else -> branch.name })