From a658faacf59a9b26f9f63ccf4a5ff2dfe423a4a3 Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Mon, 22 Jan 2018 00:31:31 +0300
Subject: [PATCH] Make "show next option button popup" action to skip disabled
 buttons

---
 .../src/com/intellij/openapi/ui/DialogWrapper.java     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index 93edbe2b6499..17b8dddc72d8 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -1336,15 +1336,11 @@ public abstract class DialogWrapper {
   }
 
   private void expandNextOptionButton() {
-    if (myCurrentOptionsButtonIndex > 0) {
+    if (myCurrentOptionsButtonIndex >= 0) {
       myOptionsButtons.get(myCurrentOptionsButtonIndex).closePopup();
-      myCurrentOptionsButtonIndex++;
     }
-    else if (!myOptionsButtons.isEmpty()) {
-      myCurrentOptionsButtonIndex = 0;
-    }
-
-    if (myCurrentOptionsButtonIndex >= 0 && myCurrentOptionsButtonIndex < myOptionsButtons.size()) {
+    myCurrentOptionsButtonIndex = getEnabledIndexCyclic(myOptionsButtons, myCurrentOptionsButtonIndex, true).orElse(-1);
+    if (myCurrentOptionsButtonIndex >= 0) {
       myOptionsButtons.get(myCurrentOptionsButtonIndex).showPopup(null, true);
     }
   }