From cff59322c18bb96359a2fb4cb4efc48a0e868f0e Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 15 Sep 2011 17:26:42 +0200 Subject: [PATCH] if showing live templates in completion, show them in explicit one as well --- .../template/impl/LiveTemplateCompletionContributor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java index d9e73213f24a..c769ba67d874 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java @@ -41,8 +41,6 @@ public class LiveTemplateCompletionContributor extends CompletionContributor { protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) { - if (parameters.getInvocationCount() > 0) return; //only in autopopups for now - final PsiFile file = parameters.getPosition().getContainingFile(); final int offset = parameters.getOffset(); if (Registry.is("show.live.templates.in.completion")) { @@ -52,6 +50,8 @@ public class LiveTemplateCompletionContributor extends CompletionContributor { return; } + if (parameters.getInvocationCount() > 0) return; //only in autopopups for now + final String prefix = result.getPrefixMatcher().getPrefix(); final TemplateImpl template = findApplicableTemplate(file, offset, prefix); if (template != null) {