Merge branch 'master' of git.labs.intellij.net:idea/community

diff --git a/platform/lang-impl/src/com/intellij/formatting/templateLanguages/BlockUtil.java b/platform/lang-impl/src/com/intellij/formatting/templateLanguages/BlockUtil.java
index 1a67ea08ae7007b4c1dfeba8c486bf731bbec3e7..d6079a7dfb8b3b32f30441d9ed05ddd189ada259 100644 (file)
--- a/platform/lang-impl/src/com/intellij/formatting/templateLanguages/BlockUtil.java
+++ b/platform/lang-impl/src/com/intellij/formatting/templateLanguages/BlockUtil.java
@@ -73,10 +73,11 @@ class BlockUtil {
       if (bounds.contains(textRange)) {
         createAndAddBlock(before, block, null);
       }
-      else if (bounds.getEndOffset() < textRange.getStartOffset()) {
+      else if (bounds.getEndOffset() <= textRange.getStartOffset()) {
         createAndAddBlock(after, block, null);
       }
       else {
+        //assert block.getSubBlocks().size() != 0 : "Block " + block.getTextRange() + " doesn't contain subblocks!";
         splitByRightBoundAndCollectBlocks(block.getSubBlocks(), before, after, bounds);
       }
     }