From 8445f6cf92d2512e4504a66b8ccb114a483b1162 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Thu, 6 Sep 2018 16:59:00 +0300 Subject: [PATCH] allow compressing whitespaces in tag headers --- .../src/com/intellij/psi/formatter/xml/SyntheticBlock.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java index 47eaa79f21e4..d6a5bb55b8e1 100644 --- a/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java +++ b/xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java @@ -83,7 +83,9 @@ public class SyntheticBlock extends AbstractSyntheticBlock implements Block, Rea boolean secondIsText = isTextFragment(node2); if (((AbstractXmlBlock)child1).isPreserveSpace() && ((AbstractXmlBlock)child2).isPreserveSpace()) { - return Spacing.getReadOnlySpacing(); + ASTNode parent = node1.getTreeParent(); + boolean inText = parent != null && parent.getTreePrev().getElementType() == XmlTokenType.XML_TAG_END; + if (inText) return Spacing.getReadOnlySpacing(); } if (type1 == XmlTokenType.XML_CDATA_START || type2 == XmlTokenType.XML_CDATA_END) {