From 97586f00b7d86d67c31c32a93ec0bdb3640faee3 Mon Sep 17 00:00:00 2001
From: Daniil Tsaryov <daniil.tsaryov@jetbrains.com>
Date: Wed, 16 Dec 2020 18:07:56 +0300
Subject: [PATCH] IDEA-250748 [git] Git merge dialog: re-select field text
 after options update

GitOrigin-RevId: f7aff7507701e8202789ad6c7d6e88acbd2d41f3
---
 plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt         | 1 +
 .../git4idea/src/git4idea/ui/ComboBoxWithAutoCompletion.kt    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
index 058c9aeaa1a9..36c363a5af4e 100644
--- a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
@@ -240,6 +240,7 @@ class GitMergeDialog(private val project: Project,
     }
 
     branchField.item = branchToSelect
+    branchField.selectAll()
   }
 
   private fun splitAndSortBranches(branches: List<@NlsSafe String>): List<@NlsSafe String> {
diff --git a/plugins/git4idea/src/git4idea/ui/ComboBoxWithAutoCompletion.kt b/plugins/git4idea/src/git4idea/ui/ComboBoxWithAutoCompletion.kt
index b4e78ad4c2b1..0b14db113365 100644
--- a/plugins/git4idea/src/git4idea/ui/ComboBoxWithAutoCompletion.kt
+++ b/plugins/git4idea/src/git4idea/ui/ComboBoxWithAutoCompletion.kt
@@ -76,6 +76,10 @@ class ComboBoxWithAutoCompletion<E>(model: ComboBoxModel<E>,
     }
   }
 
+  fun selectAll() {
+    myEditableComponent?.selectAll()
+  }
+
   private fun initEditor() {
     val editableComponent = createEditableComponent()