From 9bf386fa86a86c1f658c69155a66f6ff25704a38 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Mon, 28 Oct 2013 14:01:33 +0400 Subject: [PATCH] IDEA-115474 Maven Dependency template broken in latest Idea Cardea --- .../MavenPomXmlCompletionTagListenerContributor.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java index f62c67c1d649..1ddef0a5d4cb 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.actions.ReformatCodeProcessor; import com.intellij.codeInsight.completion.*; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementDecorator; +import com.intellij.codeInsight.template.TemplateManager; import com.intellij.openapi.editor.CaretModel; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -31,6 +32,10 @@ public class MavenPomXmlCompletionTagListenerContributor extends CompletionContr @Override public void fillCompletionVariants(CompletionParameters parameters, final CompletionResultSet result) { + if (TemplateManager.getInstance(parameters.getOriginalFile().getProject()).getActiveTemplate(parameters.getEditor()) != null) { + return; // Don't brake the template. + } + PsiFile psiFile = parameters.getOriginalFile(); if (!(psiFile instanceof XmlFile)) return;