Fix formatting with multiple line content

eclipse-lemminx · Sep 26, 2022 · 582b523 · 582b523
1 parent f719f13
commit 582b523
Showing 1 changed file with 58 additions and 0 deletions.
diff --git a/.../org/eclipse/lemminx/services/format/experimental/XMLFormatterExperimentalIndentTest.java b/.../org/eclipse/lemminx/services/format/experimental/XMLFormatterExperimentalIndentTest.java
@@ -179,6 +179,64 @@ public void mixedContent2() throws BadLocationException {
 		assertFormat(content, expected);
 	}
 
+	// From issue: https://github.com/redhat-developer/vscode-xml/issues/600
+	@Test
+	public void multipleLineContentIssue600JoinContentLinesTrue() throws BadLocationException {
+		SharedSettings settings = new SharedSettings();
+		settings.getFormattingSettings().setJoinContentLines(true);
+
+		String content = "<a>\r\n" + //
+				"  <b>\r\n" + //
+				"    foo\r\n" + //
+				"    bar\r\n" + //
+				"  </b>\r\n" + //
+				"</a>";
+		String expected = "<a>\r\n" + //
+				"  <b> foo bar </b>\r\n" + //
+				"</a>";
+		assertFormat(content, expected, settings, //
+				te(1, 5, 2, 4, " "),
+				te(2, 7, 3, 4, " "),
+				te(3, 7, 4, 2, " "));
+		assertFormat(expected, expected, settings);
+	}
+
+	// From issue: https://github.com/redhat-developer/vscode-xml/issues/600
+	@Test
+	public void multipleLineContentIssue600JoinContentLinesFalse() throws BadLocationException {
+		SharedSettings settings = new SharedSettings();
+		settings.getFormattingSettings().setJoinContentLines(false);
+		String content = "<a>\r\n" + //
+				"  <b>\r\n" + //
+				"    foo\r\n" + //
+				"    bar\r\n" + //
+				"  </b>\r\n" + //
+				"</a>";
+		String expected = "<a>\r\n" + //
+				"  <b> foo\r\n" + //
+				"    bar </b>\r\n" + //
+				"</a>";
+		assertFormat(content, expected, settings, //
+				te(1, 5, 2, 4, " "),
+				te(3, 7, 4, 2, " "));
+		assertFormat(expected, expected, settings);
+	}
+
+	// From issue: https://github.com/redhat-developer/vscode-xml/issues/600
+	@Test
+	public void multipleLineContentIssue600PreserveSpaces() throws BadLocationException {
+		SharedSettings settings = new SharedSettings();
+		settings.getFormattingSettings().setPreserveEmptyContent(true);
+		String content = "<a>\r\n" + //
+				"  <b>\r\n" + //
+				"    foo\r\n" + //
+				"    bar\r\n" + //
+				"  </b>\r\n" + //
+				"</a>";
+		String expected = content;
+		assertFormat(content, expected, settings);
+	}
+
 	private static void assertFormat(String unformatted, String actual, TextEdit... expectedEdits)
 			throws BadLocationException {
 		assertFormat(unformatted, actual, new SharedSettings(), expectedEdits);