Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

2 files changed, 9 insertions, 2 deletions

diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java
index f27903a49b5b..4b50a0cbdb01 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java
@@ -548,6 +548,9 @@ public class ZenCodingTemplate extends CustomLiveTemplateBase {
           }
         }
       }
+      else if(result.getPrefixMatcher().getPrefix().isEmpty()) {
+        result.restartCompletionOnPrefixChange(StandardPatterns.string().longerThan(0));
+      }
     }
   }
 }
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);