From b8ede5fdebbe4db466228988aaa2e0055bb00ba4 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Mon, 23 Jul 2012 18:07:34 +0400 Subject: [PATCH] Groove language injection test. --- ...avenPluginConfigurationLanguageInjector.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenPluginConfigurationLanguageInjector.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenPluginConfigurationLanguageInjector.java index d1fddf9efa1b..6fb4ca793fc2 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenPluginConfigurationLanguageInjector.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenPluginConfigurationLanguageInjector.java @@ -66,13 +66,20 @@ public class MavenPluginConfigurationLanguageInjector implements LanguageInjecto PsiElement configurationTag = sourceTag.getParent(); if (!isTagOfName(configurationTag, "configuration")) return; - PsiElement executionTag = configurationTag.getParent(); - if (!isTagOfName(executionTag, "execution")) return; + PsiElement configurationParent = configurationTag.getParent(); - PsiElement executionsTag = executionTag.getParent(); - if (!isTagOfName(executionsTag, "executions")) return; + PsiElement pluginTag; + + if (isTagOfName(configurationParent, "execution")) { + PsiElement executionsTag = configurationParent.getParent(); + if (!isTagOfName(executionsTag, "executions")) return; + + pluginTag = executionsTag.getParent(); + } + else { + pluginTag = configurationParent; + } - PsiElement pluginTag = executionsTag.getParent(); if (!isTagOfName(pluginTag, "plugin")) return; XmlTag plugin = (XmlTag)pluginTag;