From bec29612ac1e363586033655d3f08dfd0fcf0ba8 Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <Alexander.Zolotov@jetbrains.com>
Date: Wed, 4 Feb 2015 18:52:21 +0300
Subject: [PATCH] Combobox in table: popup shouldn't lose focus while opening

---
 .../JBComboBoxTableCellEditorComponent.java     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java b/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
index bb2972caaf51..8056a6fdc12e 100644
--- a/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
+++ b/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
@@ -16,7 +16,9 @@
 package com.intellij.ui.components.editors;
 
 import com.intellij.openapi.ui.popup.JBPopup;
+import com.intellij.openapi.ui.popup.JBPopupAdapter;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
+import com.intellij.openapi.ui.popup.LightweightWindowEvent;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.TableUtil;
@@ -24,6 +26,7 @@ import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.components.JBComboBoxLabel;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.ui.components.JBList;
+import com.intellij.ui.table.JBTable;
 import com.intellij.util.Function;
 import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
@@ -138,6 +141,7 @@ public class JBComboBoxTableCellEditorComponent extends JBLabel {
     if (myRenderer != null) {
       myList.setCellRenderer(myRenderer);
     }
+    final boolean surrendersFocusOnKeystrokeOldValue = myTable instanceof JBTable ? ((JBTable)myTable).surrendersFocusOnKeyStroke() : myTable.getSurrendersFocusOnKeystroke();
     final JBPopup popup = JBPopupFactory.getInstance()
       .createListPopupBuilder(myList)
       .setItemChoosenCallback(new Runnable() {
@@ -161,6 +165,19 @@ public class JBComboBoxTableCellEditorComponent extends JBLabel {
           return true;
         }
       })
+      .addListener(new JBPopupAdapter() {
+        @Override
+        public void beforeShown(LightweightWindowEvent event) {
+          super.beforeShown(event);
+          myTable.setSurrendersFocusOnKeystroke(false);
+        }
+
+        @Override
+        public void onClosed(LightweightWindowEvent event) {
+          myTable.setSurrendersFocusOnKeystroke(surrendersFocusOnKeystrokeOldValue);
+          super.onClosed(event);
+        }
+      })
       .createPopup();
     final Rectangle rect = myTable.getCellRect(myRow, myColumn, true);
     Point point = new Point(rect.x, rect.y);