From 7c15e487022e9cc89bd42c87937414e0140886ff Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 13 Jan 2015 12:34:41 +0100 Subject: [PATCH] DefaultCompletionContributor: check for shortcut emptiness --- .../completion/DefaultCompletionContributor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/DefaultCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/DefaultCompletionContributor.java index fe495d3e6f3a..2eb06833aa23 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/DefaultCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/DefaultCompletionContributor.java @@ -38,7 +38,7 @@ public class DefaultCompletionContributor extends CompletionContributor { if (CompletionUtil.shouldShowFeature(parameters, CodeCompletionFeatures.EDITING_COMPLETION_FINISH_BY_SMART_ENTER)) { final String shortcut = getActionShortcut(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM_COMPLETE_STATEMENT); - if (shortcut != null) { + if (StringUtil.isNotEmpty(shortcut)) { lookup.addAdvertisement(LangBundle.message("completion.smart.enter.ad", shortcut), null); } } @@ -46,7 +46,7 @@ public class DefaultCompletionContributor extends CompletionContributor { if ((CompletionUtil.shouldShowFeature(parameters, ShowQuickDocInfoAction.CODEASSISTS_QUICKJAVADOC_FEATURE) || CompletionUtil.shouldShowFeature(parameters, ShowQuickDocInfoAction.CODEASSISTS_QUICKJAVADOC_LOOKUP_FEATURE))) { final String shortcut = getActionShortcut(IdeActions.ACTION_QUICK_JAVADOC); - if (shortcut != null) { + if (StringUtil.isNotEmpty(shortcut)) { lookup.addAdvertisement(LangBundle.message("completion.quick.javadoc.ad", shortcut), null); } } @@ -54,7 +54,7 @@ public class DefaultCompletionContributor extends CompletionContributor { if (CompletionUtil.shouldShowFeature(parameters, ShowImplementationsAction.CODEASSISTS_QUICKDEFINITION_FEATURE) || CompletionUtil.shouldShowFeature(parameters, ShowImplementationsAction.CODEASSISTS_QUICKDEFINITION_LOOKUP_FEATURE)) { final String shortcut = getActionShortcut(IdeActions.ACTION_QUICK_IMPLEMENTATIONS); - if (shortcut != null) { + if (StringUtil.isNotEmpty(shortcut)) { lookup.addAdvertisement(LangBundle.message("completion.quick.implementations.ad", shortcut), null); } }