From 769c5d84d4729f5fe238fc82e845633f550652fa Mon Sep 17 00:00:00 2001
From: Ivan Semenov <ivan.semenov@jetbrains.com>
Date: Mon, 19 Jun 2023 13:23:11 +0200
Subject: [PATCH] [gitlab] fix unclosed MR timeline and diff on repo&account
 change

GitOrigin-RevId: 01e9d259f612d07d79c9bc38c17954d47151dda1
---
 .../mergerequest/ui/GitLabProjectUIContext.kt       | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/GitLabProjectUIContext.kt b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/GitLabProjectUIContext.kt
index 9d48a6597b14..649af1b614a6 100644
--- a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/GitLabProjectUIContext.kt
+++ b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/GitLabProjectUIContext.kt
@@ -7,11 +7,9 @@ import com.intellij.collaboration.ui.icon.CachingIconsProvider
 import com.intellij.collaboration.ui.icon.IconsProvider
 import com.intellij.collaboration.ui.toolwindow.ReviewToolwindowProjectContext
 import com.intellij.openapi.project.Project
+import com.intellij.util.awaitCancellationAndInvoke
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.awaitCancellation
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.launch
 import org.jetbrains.annotations.Nls
 import org.jetbrains.plugins.gitlab.api.GitLabProjectConnection
 import org.jetbrains.plugins.gitlab.api.dto.GitLabUserDTO
@@ -50,14 +48,7 @@ private constructor(cs: CoroutineScope, project: Project, connection: GitLabProj
     }
 
   init {
-    cs.launch(start = CoroutineStart.UNDISPATCHED) {
-      try {
-        awaitCancellation()
-      }
-      finally {
-        filesController.closeAllFiles()
-      }
-    }
+    cs.awaitCancellationAndInvoke { filesController.closeAllFiles() }
   }
 
   companion object {