diff --git a/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTest.java b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTest.java
index 899d25fb6e2c..08c6f830ed22 100644
--- a/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTest.java
+++ b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTest.java
@@ -363,4 +363,16 @@ public class XmlFormatterTest extends XmlFormatterTestBase {
xmlSettings.XML_TEXT_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP;
doTextTest("aaa\nbbb\nccc\nddd\n", "aaa bbb ccc ddd\n");
}
+
+ public void testXmlCommentLineBreak() throws Exception {
+ XmlCodeStyleSettings xmlSettings = getSettings().getCustomSettings(XmlCodeStyleSettings.class);
+ boolean oldValue = xmlSettings.XML_KEEP_LINE_BREAKS;
+ xmlSettings.XML_KEEP_LINE_BREAKS = false;
+ try {
+ doTest();
+ }
+ finally {
+ xmlSettings.XML_KEEP_LINE_BREAKS = oldValue;
+ }
+ }
}
diff --git a/xml/tests/testData/psi/formatter/xml/xmlCommentLineBreak.xml b/xml/tests/testData/psi/formatter/xml/xmlCommentLineBreak.xml
new file mode 100644
index 000000000000..a25eebf6f718
--- /dev/null
+++ b/xml/tests/testData/psi/formatter/xml/xmlCommentLineBreak.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xml/tests/testData/psi/formatter/xml/xmlCommentLineBreak_after.xml b/xml/tests/testData/psi/formatter/xml/xmlCommentLineBreak_after.xml
new file mode 100644
index 000000000000..daf3c09b2c1f
--- /dev/null
+++ b/xml/tests/testData/psi/formatter/xml/xmlCommentLineBreak_after.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+