From 58b36241c219d0e50f1228f974ba15d016a5456f Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 24 Jan 2017 11:18:05 +0100
Subject: [PATCH] change preselection in goto popups when typing according to
 the matching degree (IDEA-163865)

---
 .../intellij/ide/util/gotoByName/ChooseByNameBase.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index d24f8ca8f006..3448735c524a 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -998,15 +998,10 @@ public abstract class ChooseByNameBase {
     Object[] oldElements = myListModel.getItems().toArray();
     Object[] newElements = elements.toArray();
     List<ModelDiff.Cmd> commands = ModelDiff.createDiffCmds(myListModel, oldElements, newElements);
-    if (commands == null) {
-      return; // Nothing changed
-    }
 
     myTextField.setForeground(UIUtil.getTextFieldForeground());
-    if (commands.isEmpty()) {
-      if (pos <= 0) {
-        pos = calcSelectedIndex(newElements, getTrimmedText());
-      }
+    if (commands == null || commands.isEmpty()) {
+      pos = calcSelectedIndex(newElements, getTrimmedText());
 
       ScrollingUtil.selectItem(myList, Math.min(pos, myListModel.getSize() - 1));
       myList.setVisibleRowCount(Math.min(VISIBLE_LIST_SIZE_LIMIT, myList.getModel().getSize()));