Merge remote-tracking branch 'refs/remotes/origin/master' into techdebt

This commit is contained in:
Josh Johnson 2017-06-23 20:50:59 -04:00
commit ce6a965959
2 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@
"name": "xml",
"displayName": "XML Tools",
"description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code",
"version": "1.9.1",
"version": "1.9.2",
"publisher": "DotJoshJohnson",
"author": {
"name": "Josh Johnson",

View File

@ -34,7 +34,7 @@ export class XmlFormatter {
}
let parts: string[] = xml.split('~::~');
console.log(parts);
let inComment: boolean = false;
let level: number = 0;
let output: string = '';
@ -96,7 +96,7 @@ export class XmlFormatter {
}
// xmlns
else if (parts[i].search(/xmlns\:/) > -1 || parts[i].search(/xmlns\=/) > -1) {
else if (this.splitNamespaces && (parts[i].search(/xmlns\:/) > -1 || parts[i].search(/xmlns\=/) > -1)) {
output += this._getIndent(level, parts[i]);
}