From 7d0ce91c2a979e2e0e0e0db896f5ae4a88d3a23e Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Fri, 1 Feb 2019 12:09:27 +0300 Subject: [PATCH] produce named folding elements to keep proper text (IDEA-201570) --- .../src/com/intellij/lang/XmlCodeFoldingBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java b/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java index a529370fdcbb..5ac25a25682c 100644 --- a/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java +++ b/xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java @@ -203,7 +203,11 @@ public abstract class XmlCodeFoldingBuilder extends CustomFoldingBuilder impleme final boolean entity = isEntity(elementToFold); if (startLine < endLine || elementToFold instanceof XmlAttribute || entity) { if (range.getStartOffset() + MIN_TEXT_RANGE_LENGTH < range.getEndOffset() || entity) { - foldings.add(new FoldingDescriptor(elementToFold.getNode(), range)); + ASTNode node = elementToFold.getNode(); + String placeholder = getLanguagePlaceholderText(node, range); + foldings.add(placeholder != null ? + new NamedFoldingDescriptor(node, range, null, placeholder) : + new FoldingDescriptor(node, range)); return true; } }