From 0abe2e144093e1029a913a76a429266308488b4c Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 13 May 2014 13:03:13 +0200 Subject: [PATCH] fix tests --- .../intellij/codeInsight/template/impl/TemplateState.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java index 9a0b20d96718..ef35a213346d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java @@ -579,7 +579,7 @@ public class TemplateState implements Disposable { return myTemplate.getExpressionAt(myCurrentVariableNumber); } - private void runLookup(final List lookupItems, String advertisingText) { + private void runLookup(final List lookupItems, @Nullable String advertisingText) { if (myEditor == null) return; final LookupManager lookupManager = LookupManager.getInstance(myProject); @@ -591,7 +591,9 @@ public class TemplateState implements Disposable { lookup.setStartCompletionWhenNothingMatches(true); } - lookup.addAdvertisement(advertisingText, null); + if (advertisingText != null) { + lookup.addAdvertisement(advertisingText, null); + } lookup.refreshUi(true, true); ourLookupShown = true; lookup.addLookupListener(new LookupAdapter() {