Merge pull request #134 from netux/feature/xml-formatter-preserve-new…

…line Preserve new lines of documents formatted via the XMLFormatter
iljapostnovs · Oct 10, 2023 · 21a941b · 21a941b
2 parents 2d8f11e + 7ecb8d7
commit 21a941b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.11.0 (10-10-2023)
+
+-   Make XML Formatter preserve newlines
+
 ## 1.10.0 (08-10-2023)
 
 -   `--tagSpaceBeforeSelfClose` option added to XML Formatter

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ui5plugin-linter",
-	"version": "1.10.0",
+	"version": "1.11.0",
 	"description": "UI5 Class linter",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/src/classes/formatter/xml/XMLFormatter.ts b/src/classes/formatter/xml/XMLFormatter.ts
@@ -20,6 +20,12 @@ export class XMLFormatter {
 			return;
 		}
 
+		const documentNewline = document.getText()
+			.match(/\r?\n/)?.[0] ?? "\n";
+		const documentNewlineEnding = document.getText()
+			.slice(-2)
+			.match(/\r?\n$/)?.[0] ?? "";
+
 		let indentationLevel = 0;
 		const formattedTags = allTags
 			.map(currentTag => {
@@ -36,7 +42,7 @@ export class XMLFormatter {
 			})
 			.reduce(this._removeUnnecessaryTags.bind(this), []);
 
-		return formattedTags.join("\n");
+		return formattedTags.join(documentNewline) + documentNewlineEnding;
 	}
 
 	private _removeUnnecessaryTags(accumulator: string[], currentTag: string): string[] {