1 files changed, 10 insertions, 11 deletions
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/XmlZenCodingGenerator.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/XmlZenCodingGenerator.java
index b0165652173e..0ecbaafd8b89 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/XmlZenCodingGenerator.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/generators/XmlZenCodingGenerator.java
@@ -101,18 +101,17 @@ public abstract class XmlZenCodingGenerator extends ZenCodingGenerator {
     while (prevVisibleLeaf != null) {
       TextRange textRange = prevVisibleLeaf.getTextRange();
       final int endOffset = textRange.getEndOffset();
-      if (endOffset > currentOffset) {
-        continue;
+      if (endOffset <= currentOffset) {
+        if (endOffset <= startOffset) {
+          break;
+        }
+        IElementType prevType = prevVisibleLeaf.getNode().getElementType();
+        if (prevType == XmlTokenType.XML_TAG_END || prevType == XmlTokenType.XML_EMPTY_ELEMENT_END) {
+          startOffset = endOffset;
+          break;
+        }
       }
-      if (endOffset <= startOffset) {
-        break;
-      }
-      IElementType prevType = prevVisibleLeaf.getNode().getElementType();
-      if (prevType == XmlTokenType.XML_TAG_END || prevType == XmlTokenType.XML_EMPTY_ELEMENT_END) {
-        startOffset = endOffset;
-        break;
-      }
-      prevVisibleLeaf = PsiTreeUtil.prevVisibleLeaf(prevVisibleLeaf);
+      prevVisibleLeaf = PsiTreeUtil.prevVisibleLeaf(prevVisibleLeaf); 
     }
 
     if (startOffset < 0 || currentOffset > documentText.length() || currentOffset < startOffset) {