apb/vscode-xml
1
0
Fork 0
forked from external/vscode-xml
Code Issues Pull requests Projects Releases Wiki Activity

Fix Eager Line Break Stripping

Browse source 
This change ensures line breaks are not stripped outside of CDATA nodes
if the line break is not preceded or followed by another whitespace
character.

Fixes #92
This commit is contained in:
Josh Johnson 2017-06-20 22:50:21 -04:00
parent 3a89f737a5
commit fd5749a49a
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/services/XmlFormatter.ts
View file

@ -152,6 +152,8 @@ export class XmlFormatter {
for (let i = 0; i < xml.length; i++) {
let char: string = xml.charAt(i);
let prev: string = xml.charAt(i - 1);
let next: string = xml.charAt(i + 1);
if (char == '!' && (xml.substr(i, 8) == '![CDATA[' || xml.substr(i, 3) == '!--')) {
inCdata = true;
@ -166,6 +168,14 @@ export class XmlFormatter {
}
else if (char.search(/[\r\n]/g) > -1 && !inCdata) {
if (/\r/.test(char) && /\S|\r|\n/.test(prev) && /\S|\r|\n/.test(xml.charAt(i + this.newLine.length))) {
output += char;
}
else if (/\n/.test(char) && /\S|\r|\n/.test(xml.charAt(i - this.newLine.length)) && /\S|\r|\n/.test(next)) {
output += char;
}
continue;
}