From 0dca49ca6c0cf05ed1720b317908add08354c471 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 15 Dec 2011 14:28:43 +0100
Subject: [PATCH] don't show an autopopup consisting of a single live template
 item

---
 .../codeInsight/completion/JavaAutoPopupTest.groovy         | 6 ++++++
 .../codeInsight/completion/CompletionProgressIndicator.java | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
index f91c7fe5dae8..d90497451c25 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
@@ -634,6 +634,12 @@ public interface Test {
     assert !lookup
   }
 
+  public void testNoSingleTemplateLookup() {
+    myFixture.configureByText 'a.java', 'class Foo {{ ite<caret> }}'
+    type 'r'
+    assert !lookup
+  }
+
   public void testTemplateSelectionByComma() {
     myFixture.configureByText("a.java", """
 class Foo {
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 1d7a85c4c861..89f80018dbb3 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
@@ -25,6 +25,7 @@ import com.intellij.codeInsight.hint.EditorHintListener;
 import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.codeInsight.lookup.*;
 import com.intellij.codeInsight.lookup.impl.LookupImpl;
+import com.intellij.codeInsight.template.impl.LiveTemplateLookupElement;
 import com.intellij.featureStatistics.FeatureUsageTracker;
 import com.intellij.injected.editor.DocumentWindow;
 import com.intellij.injected.editor.EditorWindow;
@@ -511,7 +512,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
           return false;
         }
 
-        if (item.isValid()) {
+        if (item.isValid() && !(item instanceof LiveTemplateLookupElement)) {
           final LookupElementPresentation presentation = new LookupElementPresentation();
           item.renderElement(presentation);
           if (StringUtil.isNotEmpty(presentation.getTailText())) {