IDEA-123687 Velocity formatter inserts wrong linebreak

platform/lang-impl/src/com/intellij/formatting/templateLanguages/DataLanguageBlockWrapper.java

@@ -104,6 +104,10 @@ public class DataLanguageBlockWrapper implements ASTBlock, BlockEx, BlockWithPar
 
   @Override
   public Wrap getWrap() {
+    BlockWithParent parent = getParent();
+    if (parent instanceof TemplateLanguageBlock) {
+      return ((TemplateLanguageBlock)parent).substituteTemplateChildWrap(this, myOriginal.getWrap());
+    }
     return myOriginal.getWrap();
   }
 

platform/lang-impl/src/com/intellij/formatting/templateLanguages/TemplateLanguageBlock.java

@@ -137,7 +137,7 @@ public abstract class TemplateLanguageBlock extends AbstractBlock implements Blo
   }
 
   protected Wrap createChildWrap(ASTNode child) {
-    return Wrap.createWrap(Wrap.NONE, false);
+    return Wrap.createWrap(WrapType.NONE, false);
   }
 
   protected Alignment createChildAlignment(ASTNode child) {
@@ -152,5 +152,9 @@ public abstract class TemplateLanguageBlock extends AbstractBlock implements Blo
     return myForeignChildren;
   }
 
+  @Nullable
+  public Wrap substituteTemplateChildWrap(@NotNull DataLanguageBlockWrapper child, @Nullable Wrap childWrap) {
+    return childWrap;
+  }
 }