From 58c08e4d5a7aa0395fbe20ce09bfd08963b0b5bf Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 27 May 2016 12:29:37 +0300
Subject: [PATCH] make converted condition match the previous logic

---
 .../platform-impl/src/com/intellij/ide/IdeEventQueue.java | 2 +-
 .../testSrc/com/intellij/ide/IdeEventQueueTest.java       | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
index fc63e4e8523c..f597d7afbb6d 100644
--- a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
@@ -564,7 +564,7 @@ public class IdeEventQueue extends EventQueue {
       enterSuspendModeIfNeeded(e);
     }
 
-    myKeyboardBusy = myKeyboardEventsInTheQueue.get() != 0;
+    myKeyboardBusy = e instanceof KeyEvent || myKeyboardEventsInTheQueue.get() != 0;
 
     if (e instanceof KeyEvent) {
       if (e.getID() == KeyEvent.KEY_RELEASED && ((KeyEvent)e).getKeyCode() == KeyEvent.VK_SHIFT) {
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java b/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java
index 39ba20e0703c..7dd49faff02a 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java
@@ -26,12 +26,10 @@ public class IdeEventQueueTest extends PlatformTestCase {
   public void testManyEvents() {
     int N = 100000;
     PlatformTestUtil.startPerformanceTest("Event queue dispatch", 10000, () -> {
-      AtomicInteger count = new AtomicInteger();
       UIUtil.dispatchAllInvocationEvents();
-      for (int i=0;i<N;i++) {
-        SwingUtilities.invokeLater(() -> {
-          count.incrementAndGet();
-        });
+      AtomicInteger count = new AtomicInteger();
+      for (int i = 0; i < N; i++) {
+        SwingUtilities.invokeLater(count::incrementAndGet);
       }
       UIUtil.dispatchAllInvocationEvents();
       assertEquals(N, count.get());