diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:24:04 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:24:04 -0700 |
commit | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (patch) | |
tree | fc0dcd722b6d445468dbe7dad13b4c11781b1cbe /platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java | |
parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
download | idea-c3d3a90f6b4ead083d63e28e6b9fcea93d675678.tar.gz |
Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git
Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd
Diffstat (limited to 'platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java index e25f050c8d7b..8ca94d80463c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java @@ -193,9 +193,10 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement if (!CodeInsightSettings.getInstance().SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS) { myLookup.setFocusDegree(LookupImpl.FocusDegree.SEMI_FOCUSED); if (FeatureUsageTracker.getInstance().isToBeAdvertisedInLookup(CodeCompletionFeatures.EDITING_COMPLETION_FINISH_BY_CONTROL_DOT, getProject())) { - addAdvertisement("Press " + - CompletionContributor.getActionShortcut(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM_DOT) + - " to choose the selected (or first) suggestion and insert a dot afterwards", null); + String dotShortcut = CompletionContributor.getActionShortcut(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM_DOT); + if (StringUtil.isNotEmpty(dotShortcut)) { + addAdvertisement("Press " + dotShortcut + " to choose the selected (or first) suggestion and insert a dot afterwards", null); + } } } else { myLookup.setFocusDegree(LookupImpl.FocusDegree.FOCUSED); @@ -204,9 +205,11 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement if (!myEditor.isOneLineMode() && FeatureUsageTracker.getInstance() .isToBeAdvertisedInLookup(CodeCompletionFeatures.EDITING_COMPLETION_CONTROL_ARROWS, getProject())) { - addAdvertisement(CompletionContributor.getActionShortcut(IdeActions.ACTION_LOOKUP_DOWN) + " and " + - CompletionContributor.getActionShortcut(IdeActions.ACTION_LOOKUP_UP) + - " will move caret down and up in the editor", null); + String downShortcut = CompletionContributor.getActionShortcut(IdeActions.ACTION_LOOKUP_DOWN); + String upShortcut = CompletionContributor.getActionShortcut(IdeActions.ACTION_LOOKUP_UP); + if (StringUtil.isNotEmpty(downShortcut) && StringUtil.isNotEmpty(upShortcut)) { + addAdvertisement(downShortcut + " and " + upShortcut + " will move caret down and up in the editor", null); + } } } else if (DumbService.isDumb(getProject())) { addAdvertisement("The results might be incomplete while indexing is in progress", MessageType.WARNING.getPopupBackground()); @@ -759,6 +762,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement data.set(calculateItems(initContext, weigher)); } catch (ProcessCanceledException ignore) { + cancel(); // some contributor may just throw PCE; if indicator is not canceled everything will hang } catch (Throwable t) { cancel(); |