From 24f91c2e18dc6b2c5bfd8e5ebed2b93a1b312371 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Wed, 6 Nov 2013 16:28:14 +0400 Subject: [PATCH] IDEA-115474 Maven Dependency template broken in latest Idea Cardea --- .../MavenArtifactCoordinatesArtifactIdConverter.java | 5 +++++ .../converters/MavenArtifactCoordinatesGroupIdConverter.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesArtifactIdConverter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesArtifactIdConverter.java index 62456131d173..24fbf3b3b754 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesArtifactIdConverter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesArtifactIdConverter.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.completion.InsertHandler; import com.intellij.codeInsight.completion.InsertionContext; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; +import com.intellij.codeInsight.template.TemplateManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; @@ -81,6 +82,10 @@ public class MavenArtifactCoordinatesArtifactIdConverter extends MavenArtifactCo @Override public void handleInsert(final InsertionContext context, LookupElement item) { + if (TemplateManager.getInstance(context.getProject()).getActiveTemplate(context.getEditor()) != null) { + return; // Don't brake the template. + } + context.commitDocument(); XmlFile xmlFile = (XmlFile)context.getFile(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesGroupIdConverter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesGroupIdConverter.java index 15b1b2fe853e..3b89a83bf268 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesGroupIdConverter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesGroupIdConverter.java @@ -4,6 +4,7 @@ import com.intellij.codeInsight.completion.InsertHandler; import com.intellij.codeInsight.completion.InsertionContext; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; +import com.intellij.codeInsight.template.TemplateManager; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; @@ -77,6 +78,10 @@ public class MavenArtifactCoordinatesGroupIdConverter extends MavenArtifactCoord @Override public void handleInsert(final InsertionContext context, LookupElement item) { + if (TemplateManager.getInstance(context.getProject()).getActiveTemplate(context.getEditor()) != null) { + return; // Don't brake the template. + } + context.commitDocument(); XmlFile xmlFile = (XmlFile)context.getFile();