Snapshot idea/138.1696 from git://git.jetbrains.org/idea/community.git

Change-Id: I50c97b83a815ce635e49a38380ba5b8765e4b16a

3 files changed, 14 insertions, 3 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);
diff --git a/xml/impl/src/org/jetbrains/builtInWebServer/DefaultWebServerRootsProvider.java b/xml/impl/src/org/jetbrains/builtInWebServer/DefaultWebServerRootsProvider.java
index b5621295957d..ca233b417249 100644
--- a/xml/impl/src/org/jetbrains/builtInWebServer/DefaultWebServerRootsProvider.java
+++ b/xml/impl/src/org/jetbrains/builtInWebServer/DefaultWebServerRootsProvider.java
@@ -89,7 +89,7 @@ final class DefaultWebServerRootsProvider extends WebServerRootsProvider {
   public PathInfo getRoot(@NotNull VirtualFile file, @NotNull Project project) {
     AccessToken token = ReadAction.start();
     try {
-      VirtualFile root = null;
+      VirtualFile root;
       ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
       if (fileIndex.isInSourceContent(file)) {
         root = fileIndex.getSourceRootForFile(file);
@@ -100,6 +100,10 @@ final class DefaultWebServerRootsProvider extends WebServerRootsProvider {
       else if (fileIndex.isInLibraryClasses(file)) {
         root = fileIndex.getClassRootForFile(file);
       }
+      else {
+        // excluded
+        return null;
+      }
       assert root != null : file.getPresentableUrl();
       return new PathInfo(file, root, getModuleNameQualifier(project, fileIndex.getModuleForFile(file)));
     }