changed closingBracketNewLine indent to match splitAttributeIndentSize

eclipse · Jul 15, 2021 · 69720e8 · 69720e8
1 parent c09eed8
commit 69720e8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/services/XMLFormatter.java b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/services/XMLFormatter.java
@@ -559,7 +559,9 @@ private void formatAttributes(DOMElement element) throws BadLocationException {
 			}
 			if ((this.sharedSettings.getFormattingSettings().getClosingBracketNewLine() && this.sharedSettings.getFormattingSettings().isSplitAttributes()) && !isSingleAttribute) {
 				xmlBuilder.linefeed();
-				xmlBuilder.indent(this.indentLevel);
+				// Indent by tag + splitAttributesIndentSize to match with attribute indent level
+				int totalIndent = this.indentLevel + this.sharedSettings.getFormattingSettings().getSplitAttributesIndentSize();
+				xmlBuilder.indent(totalIndent);
 			}
 		}
 

diff --git a/org.eclipse.lemminx/src/test/java/org/eclipse/lemminx/services/XMLFormatterTest.java b/org.eclipse.lemminx/src/test/java/org/eclipse/lemminx/services/XMLFormatterTest.java
@@ -2937,6 +2937,20 @@ public void testClosingBracketNewLine() throws BadLocationException {
 		assertFormat(content, expected, settings);
 	}
 
+	@Test
+	public void testClosingBracketNewLineWithDefaultIndentSize() throws BadLocationException {
+		SharedSettings settings = new SharedSettings();
+		settings.getFormattingSettings().setSplitAttributes(true);
+		settings.getFormattingSettings().setClosingBracketNewLine(true);
+		settings.getFormattingSettings().setPreserveAttrLineBreaks(true);
+		String content = "<a b='b' c='c'/>";
+		String expected = "<a\n" +
+		"    b='b'\n" +
+		"    c='c'\n" +
+		"    />";
+		assertFormat(content, expected, settings);
+	}
+
 	@Test
 	public void testClosingBracketNewLineWithoutSplitAttributes() throws BadLocationException {
 		SharedSettings settings = new SharedSettings();