diff --git a/package.json b/package.json index 2bea686..fbb6e8b 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/services/XmlFormatter.ts b/src/services/XmlFormatter.ts index 349e1f7..6cf6e72 100644 --- a/src/services/XmlFormatter.ts +++ b/src/services/XmlFormatter.ts @@ -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 = ''; @@ -59,7 +59,7 @@ export class XmlFormatter { // else if (/^<(\w|:)/.test(parts[i - 1]) && /^<\/(\w|:)/.test(parts[i]) - && /^<[\w:\-\.\,\/ ]+/.exec(parts[i - 1])[0] == /^<\/[\w:\-\.\, ]+/.exec(parts[i])[0].replace('/', '')) { + && /^<[\w:\-\.\,\/]+/.exec(parts[i - 1])[0] == /^<\/[\w:\-\.\,]+/.exec(parts[i])[0].replace('/', '')) { output += parts[i]; if (!inComment) level--; @@ -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]); }