diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /xml/impl/src/com/intellij/codeInsight/template/emmet/generators/XmlZenCodingGenerator.java | |
parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'xml/impl/src/com/intellij/codeInsight/template/emmet/generators/XmlZenCodingGenerator.java')
-rw-r--r-- | xml/impl/src/com/intellij/codeInsight/template/emmet/generators/XmlZenCodingGenerator.java | 8 |
1 files changed, 6 insertions, 2 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 c1732a306120..b0165652173e 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 @@ -100,12 +100,16 @@ public abstract class XmlZenCodingGenerator extends ZenCodingGenerator { PsiElement prevVisibleLeaf = callback.getContext(); while (prevVisibleLeaf != null) { TextRange textRange = prevVisibleLeaf.getTextRange(); - if (textRange.getEndOffset() <= startOffset) { + final int endOffset = textRange.getEndOffset(); + if (endOffset > currentOffset) { + continue; + } + if (endOffset <= startOffset) { break; } IElementType prevType = prevVisibleLeaf.getNode().getElementType(); if (prevType == XmlTokenType.XML_TAG_END || prevType == XmlTokenType.XML_EMPTY_ELEMENT_END) { - startOffset = textRange.getEndOffset(); + startOffset = endOffset; break; } prevVisibleLeaf = PsiTreeUtil.prevVisibleLeaf(prevVisibleLeaf); |