From 6c60e611215c459e4e8557ecf3901c2ecf0c0999 Mon Sep 17 00:00:00 2001
From: Pavel Gromov <pavel.gromov@jetbrains.com>
Date: Wed, 23 Aug 2023 15:59:02 +0200
Subject: [PATCH] [space] Split commit message on title and description

#IDEA-326754 Fixed

GitOrigin-RevId: 469546af05b5eadea834dc7b5a234b43bcb11b9d
---
 .../ui/codereview/commits/commitsUtil.kt      | 12 ++-
 .../commits/CodeReviewCommitTest.kt           | 76 +++++++++++++++++++
 .../model/impl/GHPRReviewFlowViewModelImpl.kt | 16 +---
 .../plugins/github/GithubUtilTest.kt          |  4 +-
 4 files changed, 85 insertions(+), 23 deletions(-)
 create mode 100644 platform/collaboration-tools/test/com/intellij/collaboration/codereview/commits/CodeReviewCommitTest.kt

diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/commits/commitsUtil.kt b/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/commits/commitsUtil.kt
index c0eed9093f1f..71010f14bc06 100644
--- a/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/commits/commitsUtil.kt
+++ b/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/commits/commitsUtil.kt
@@ -1,21 +1,19 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.collaboration.ui.codereview.commits
 
-import com.intellij.openapi.util.Couple
-
 /**
- * Splits full commit message into subject and description in GitHub style:
+ * Splits full commit message into subject and description:
  * First line becomes subject, everything after first line becomes description
  * Also supports empty line that separates subject and description
  *
  * @param commitMessage full commit message
- * @return couple of subject and description based on full commit message
+ * @return pair of subject and description based on full commit message
  */
-fun getGithubLikeFormattedDescriptionMessage(commitMessage: String?): Couple<String> {
+fun splitCommitMessage(commitMessage: String?): Pair<String, String> {
   //Trim original
   val message = commitMessage?.trim { it <= ' ' } ?: ""
   if (message.isEmpty()) {
-    return Couple.of("", "")
+    return Pair("", "")
   }
   val firstLineEnd = message.indexOf("\n")
   val subject: String
@@ -33,5 +31,5 @@ fun getGithubLikeFormattedDescriptionMessage(commitMessage: String?): Couple<Str
     description = ""
   }
 
-  return Couple.of(subject, description)
+  return Pair(subject, description)
 }
\ No newline at end of file
diff --git a/platform/collaboration-tools/test/com/intellij/collaboration/codereview/commits/CodeReviewCommitTest.kt b/platform/collaboration-tools/test/com/intellij/collaboration/codereview/commits/CodeReviewCommitTest.kt
new file mode 100644
index 000000000000..3d32162b8ea8
--- /dev/null
+++ b/platform/collaboration-tools/test/com/intellij/collaboration/codereview/commits/CodeReviewCommitTest.kt
@@ -0,0 +1,76 @@
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.collaboration.codereview.commits
+
+import com.intellij.collaboration.ui.codereview.commits.splitCommitMessage
+import org.junit.Test
+import kotlin.test.assertEquals
+
+internal class CodeReviewCommitTest {
+  @Test
+  fun `parse commit message title without description`() {
+    val expectedTitle = "Commit title"
+    val expectedDescription = ""
+
+    val commitMessage = """
+      $expectedTitle
+    """.trimIndent()
+
+    val (title, description) = splitCommitMessage(commitMessage)
+    assertEquals(expectedTitle, title)
+    assertEquals(expectedDescription, description)
+  }
+
+  @Test
+  fun `parse commit message title with description`() {
+    val expectedTitle = "Commit title"
+    val expectedDescription = """
+      * fixed: commit description
+    """.trimIndent()
+
+    val commitMessage = """
+      $expectedTitle
+
+      $expectedDescription
+    """.trimIndent()
+
+    val (title, description) = splitCommitMessage(commitMessage)
+    assertEquals(expectedTitle, title)
+    assertEquals(expectedDescription, description)
+  }
+
+  @Test
+  fun `parse commit message title with long description`() {
+    val expectedTitle = "Commit title"
+    val expectedDescription = """
+      * fixed1: commit description1
+      * fixed2: commit description2
+      * fixed3: commit description3
+    """.trimIndent()
+
+    val commitMessage = """
+      $expectedTitle
+
+      $expectedDescription
+    """.trimIndent()
+
+    val (title, description) = splitCommitMessage(commitMessage)
+    assertEquals(expectedTitle, title)
+    assertEquals(expectedDescription, description)
+  }
+
+  @Test
+  fun `parse commit message title with empty description`() {
+    val expectedTitle = "Commit title"
+    val customDescription = " "
+
+    val commitMessage = """
+      $expectedTitle
+
+      $customDescription
+    """.trimIndent()
+
+    val (title, description) = splitCommitMessage(commitMessage)
+    assertEquals(expectedTitle, title)
+    assertEquals("", description)
+  }
+}
\ No newline at end of file
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/model/impl/GHPRReviewFlowViewModelImpl.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/model/impl/GHPRReviewFlowViewModelImpl.kt
index 9de56225596c..b49d00bc913e 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/model/impl/GHPRReviewFlowViewModelImpl.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/model/impl/GHPRReviewFlowViewModelImpl.kt
@@ -3,14 +3,12 @@ package org.jetbrains.plugins.github.pullrequest.ui.details.model.impl
 
 import com.intellij.collaboration.async.nestedDisposable
 import com.intellij.collaboration.messages.CollaborationToolsBundle
-import com.intellij.collaboration.ui.SingleValueModel
-import com.intellij.collaboration.ui.asStateFlow
 import com.intellij.collaboration.ui.codereview.action.ReviewMergeCommitMessageDialog
+import com.intellij.collaboration.ui.codereview.commits.splitCommitMessage
 import com.intellij.collaboration.ui.codereview.details.data.ReviewRole
 import com.intellij.collaboration.ui.codereview.details.data.ReviewState
 import com.intellij.collaboration.util.CollectionDelta
 import com.intellij.collaboration.util.SingleCoroutineLauncher
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.progress.EmptyProgressIndicator
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.text.StringUtil
@@ -247,14 +245,4 @@ private fun GHPullRequest.isAuthor(user: GHUser): Boolean =
 private fun GHPullRequest.isReviewer(user: GHUser): Boolean =
   reviewRequests.any { it.requestedReviewer?.id == user.id }
   ||
-  reviews.any { it.author?.id == user.id }
-
-private fun splitCommitMessage(commitMessage: String): Pair<String, String> {
-  val idx = commitMessage.indexOf("\n\n")
-  return if (idx < 0) "" to commitMessage
-  else {
-    val subject = commitMessage.substring(0, idx)
-    if (subject.contains("\n")) "" to commitMessage
-    else subject to commitMessage.substring(idx + 2)
-  }
-}
\ No newline at end of file
+  reviews.any { it.author?.id == user.id }
\ No newline at end of file
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubUtilTest.kt b/plugins/github/test/org/jetbrains/plugins/github/GithubUtilTest.kt
index 108e24402857..bf8ac50c81b3 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubUtilTest.kt
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubUtilTest.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.github
 
-import com.intellij.collaboration.ui.codereview.commits.getGithubLikeFormattedDescriptionMessage
+import com.intellij.collaboration.ui.codereview.commits.splitCommitMessage
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
@@ -37,7 +37,7 @@ class GithubUtilTest {
   }
 
   private fun assertCommitMessage(expectedSubject: String, expectedDescription: String, fullMessage: String?) {
-    val message = getGithubLikeFormattedDescriptionMessage(fullMessage)
+    val message = splitCommitMessage(fullMessage)
     assertEquals(expectedSubject, message.first)
     assertEquals(expectedDescription, message.second)
   }