Move VK_ENTER Key Listener to Editor Component

Fixes: 239585729
Test: Updated
Change-Id: I1fea9c9254ea967e5a109a79ea8587165f29363d

2 files changed, 12 insertions, 10 deletions

diff --git a/logcat/src/com/android/tools/idea/logcat/filters/FilterTextField.kt b/logcat/src/com/android/tools/idea/logcat/filters/FilterTextField.kt
index 0e1ad5461c6..19aa598e902 100644
--- a/logcat/src/com/android/tools/idea/logcat/filters/FilterTextField.kt
+++ b/logcat/src/com/android/tools/idea/logcat/filters/FilterTextField.kt
@@ -204,14 +204,6 @@ internal class FilterTextField(
           buttonPanel.isVisible = textField.text.isNotEmpty()
         }
       })
-      addKeyListener(object : KeyAdapter() {
-        override fun keyPressed(e: KeyEvent) {
-          if (e.keyCode == KeyEvent.VK_ENTER) {
-            e.consume()
-            addToHistory()
-          }
-        }
-      })
       addFocusListener(object : FocusAdapter() {
         override fun focusGained(e: FocusEvent?) {
           GotItTooltip(GOT_IT_ID, LogcatBundle.message("logcat.filter.hint"), project)
@@ -327,6 +319,15 @@ internal class FilterTextField(
         putUserData(PROCESS_NAMES_PROVIDER_KEY, logcatPresenter)
         putUserData(AndroidProjectDetector.KEY, androidProjectDetector)
         setBorder(EDITOR_BORDER)
+
+        contentComponent.addKeyListener(object : KeyAdapter() {
+          override fun keyPressed(e: KeyEvent) {
+            if (e.keyCode == KeyEvent.VK_ENTER) {
+              e.consume()
+              addToHistory()
+            }
+          }
+        })
       }
     }
 
diff --git a/logcat/testSrc/com/android/tools/idea/logcat/filters/FilterTextFieldTest.kt b/logcat/testSrc/com/android/tools/idea/logcat/filters/FilterTextFieldTest.kt
index ade9374d864..1a286e5737b 100644
--- a/logcat/testSrc/com/android/tools/idea/logcat/filters/FilterTextFieldTest.kt
+++ b/logcat/testSrc/com/android/tools/idea/logcat/filters/FilterTextFieldTest.kt
@@ -141,8 +141,9 @@ class FilterTextFieldTest {
     val textField = TreeWalker(filterTextField).descendants().filterIsInstance<EditorTextField>()[0]
     filterTextField.text = "bar"
 
-    val keyEvent = KeyEvent(textField, 0, 0L, 0, VK_ENTER, '\n')
-    textField.keyListeners.forEach { it.keyPressed(keyEvent) }
+    val fakeUi = FakeUi(filterTextField)
+    fakeUi.keyboard.setFocus(textField.editor!!.contentComponent)
+    fakeUi.keyboard.pressAndRelease(VK_ENTER)
 
     assertThat(getHistoryNonFavorites()).containsExactly("bar").inOrder()
   }