From 444e97da6499e6536483403be46f0b29138ffe67 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 29 May 2018 18:42:44 +0200 Subject: [PATCH] Focus table after closing merge dialog (IDEA-CR-32596) --- .../intellij/openapi/vcs/merge/MultipleFileMergeDialog2.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog2.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog2.kt index ef70370f83be..d4383f838f84 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog2.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog2.kt @@ -26,6 +26,7 @@ import com.intellij.openapi.vcs.VcsException import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile +import com.intellij.openapi.wm.IdeFocusManager import com.intellij.ui.ColoredTreeCellRenderer import com.intellij.ui.DoubleClickListener import com.intellij.ui.SimpleTextAttributes @@ -101,7 +102,7 @@ open class MultipleFileMergeDialog2( } } - SpeedSearchUtil.applySpeedSearchHighlighting(this@MultipleFileMergeDialog2.table, this, true, selected) + SpeedSearchUtil.applySpeedSearchHighlighting(table, this, true, selected) } override fun calcFocusedState() = table.hasFocus() @@ -455,6 +456,7 @@ open class MultipleFileMergeDialog2( DiffManager.getInstance().showMerge(project, request) } updateModelFromFiles() + IdeFocusManager.getInstance(project).requestFocus(table, false) } private fun getSessionResolution(result: MergeResult): MergeSession.Resolution = when (result) {