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

Prevent Endless Indentation

Browse source 
Issue: #193
This commit is contained in:
Josh Johnson 2018-06-12 21:05:02 -04:00
parent a99ba2ea41
commit 97afac0031
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/formatting/formatters/v2-xml-formatter.ts
View file

@ -95,6 +95,8 @@ export class V2XmlFormatter implements XmlFormatter {
} }
else { else {
// removing trailing non-breaking whitespace here prevents endless indentations (issue #193)
output = this._removeTrailingNonBreakingWhitespace(output);
output += `${this._getIndent(options, indentLevel)}<`; output += `${this._getIndent(options, indentLevel)}<`;
} }
@ -178,6 +180,8 @@ export class V2XmlFormatter implements XmlFormatter {
// if the end tag immediately follows another end tag or a self-closing tag (issue #185), add a line break and indent // if the end tag immediately follows another end tag or a self-closing tag (issue #185), add a line break and indent
// otherwise, this should be treated as a same-line end tag(ex. <element>text</element>) // otherwise, this should be treated as a same-line end tag(ex. <element>text</element>)
if (pc === "\n" || lineBreakSpree) { if (pc === "\n" || lineBreakSpree) {
// removing trailing non-breaking whitespace here prevents endless indentations (issue #193)
output = this._removeTrailingNonBreakingWhitespace(output);
output += `${this._getIndent(options, indentLevel)}<`; output += `${this._getIndent(options, indentLevel)}<`;
lineBreakSpree = false; lineBreakSpree = false;
} }
@ -229,6 +233,10 @@ export class V2XmlFormatter implements XmlFormatter {
return ((options.editorOptions.insertSpaces) ? " ".repeat(options.editorOptions.tabSize) : "\t").repeat(indentLevel); return ((options.editorOptions.insertSpaces) ? " ".repeat(options.editorOptions.tabSize) : "\t").repeat(indentLevel);
} }
private _removeTrailingNonBreakingWhitespace(text: string): string {
return text.replace(/[^\r\n\S]+$/, "");
}
private _sanitizeComments(xml: string): string { private _sanitizeComments(xml: string): string {
let output = ""; let output = "";
let inComment = false; let inComment = false;