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 3ba6a7956963..ddb4460256bf 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 @@ -155,6 +155,7 @@ public abstract class ChooseByNameBase { private ShortcutSet myCheckBoxShortcut; protected boolean myInitIsDone; static final boolean ourLoadNamesEachTime = FileBasedIndex.ourEnableTracingOfKeyHashToVirtualFileMapping; + private boolean myFixLostTyping = true; public boolean checkDisposed() { if (myDisposedFlag && myPostponedOkAction != null && !myPostponedOkAction.isProcessed()) { @@ -777,8 +778,12 @@ public abstract class ChooseByNameBase { return false; } - protected static boolean isToFixLostTyping() { - return Registry.is("actionSystem.fixLostTyping"); + public void setFixLostTyping(boolean fixLostTyping) { + myFixLostTyping = fixLostTyping; + } + + protected boolean isToFixLostTyping() { + return myFixLostTyping && Registry.is("actionSystem.fixLostTyping"); } private synchronized void ensureNamesLoaded(boolean checkboxState) { @@ -1194,10 +1199,12 @@ public abstract class ChooseByNameBase { } protected List getChosenElements() { - if (myListIsUpToDate) { - List values = new ArrayList(Arrays.asList(myList.getSelectedValues())); - values.remove(EXTRA_ELEM); - values.remove(NON_PREFIX_SEPARATOR); + + List values = new ArrayList(Arrays.asList(myList.getSelectedValues())); + values.remove(EXTRA_ELEM); + values.remove(NON_PREFIX_SEPARATOR); + + if (myListIsUpToDate || !values.isEmpty()) { return values; } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java index 79d6f3781f93..756abdeb526e 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java @@ -83,6 +83,7 @@ public class GotoTaskAction extends GotoActionBase implements DumbAware { popup.setShowListForEmptyPattern(true); popup.setSearchInAnyPlace(true); + popup.setFixLostTyping(false); popup.setAdText("Press SHIFT to merge with current context
" + "Pressing " + KeymapUtil.getFirstKeyboardShortcutText(ActionManager.getInstance().getAction(IdeActions.ACTION_QUICK_JAVADOC)) +