fix(prompts): notification about common branch can't be shown in dialog

Author: Blarc

CHANGELOG.md

@@ -15,6 +15,7 @@
 
 - Open AI configuration setting `organizationId` is not used when verifying configuration.
 - Gemini configuration settings `projectId` and `location` are not used when verifying configuration.
+- Notification about common branch is shown after the prompt dialog is closed.
 
 ## [2.4.1] - 2024-09-19
 

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/AICommitsUtils.kt

@@ -73,14 +73,17 @@ object AICommitsUtils {
         return promptContent.replace("{hint}", hint.orEmpty())
     }
 
-    fun commonBranch(changes: List<Change>, project: Project): String {
+    fun commonBranch(changes: List<Change>, project: Project, showNotification: Boolean = true): String {
         val repositoryManager = GitRepositoryManager.getInstance(project)
         var branch = changes.map {
             repositoryManager.getRepositoryForFileQuick(it.virtualFile)?.currentBranchName
         }.groupingBy { it }.eachCount().maxByOrNull { it.value }?.key
 
         if (branch == null) {
-            sendNotification(Notification.noCommonBranch())
+            // Can't show notification in edit prompt dialog
+            if (showNotification) {
+                sendNotification(Notification.noCommonBranch())
+            }
             // hardcoded fallback branch
             branch = "main"
         }

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/prompts/PromptTable.kt

@@ -203,13 +203,14 @@ class PromptTable(private val cs: CoroutineScope) {
                 .flatMap { r -> r.stream() }
                 .toList()
 
-            branch = commonBranch(changes, project)
+            branch = commonBranch(changes, project, false)
             diff = computeDiff(changes, true, project)
 
             withContext(Dispatchers.EDT) {
                 setPreview(prompt.content, promptHintTextField.text)
             }
         }
+
         private fun setPreview(promptContent: String, hint: String) {
             val constructPrompt = AICommitsUtils.constructPrompt(promptContent, diff, branch, hint, project)
             promptPreviewTextArea.text = constructPrompt.substring(0, constructPrompt.length.coerceAtMost(10000))