From f247ebba0202e282dc7be62b5241ec49f3e19a80 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 26 Feb 2013 23:20:57 +0400 Subject: [PATCH] Fix emmet wrapping --- .../intellij/codeInsight/template/emmet/XmlEmmetParser.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java index 4b770f103bd1..b8c5367e8fdf 100644 --- a/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java +++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java @@ -26,6 +26,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlTag; +import com.intellij.psi.xml.XmlTokenType; import com.intellij.util.containers.Stack; import com.intellij.xml.util.HtmlUtil; import org.jetbrains.annotations.NonNls; @@ -79,7 +80,7 @@ public class XmlEmmetParser extends EmmetParser { super(tokens, callback, generator); PsiElement context = callback.getContext(); XmlTag parentTag = PsiTreeUtil.getParentOfType(context, XmlTag.class); - if (surroundWithTemplate && parentTag != null) { + if (surroundWithTemplate && parentTag != null && context.getNode().getElementType() == XmlTokenType.XML_START_TAG_START) { parentTag = PsiTreeUtil.getParentOfType(parentTag, XmlTag.class); } if (parentTag != null) {