From 88ac5d9a084a6c6cdc39abe64fbec8d8c8c97a2b Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 17 May 2016 21:00:03 -0400 Subject: [PATCH 1/6] chore: add *.vsix to .vscodeignore --- .vscodeignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscodeignore b/.vscodeignore index f1c4548..425d15c 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -4,4 +4,5 @@ CONTRIBUTING.md .vscode resources/wiki-images typings -**/*.ts \ No newline at end of file +**/*.ts +**/*.vsix \ No newline at end of file From b55c314aa4c2cf15d2588c8f144090dbdb0a0c90 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 17 May 2016 22:36:14 -0400 Subject: [PATCH 2/6] fix: correct line break minification fixes #54 --- src/services/XmlFormatter.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/services/XmlFormatter.ts b/src/services/XmlFormatter.ts index 37b8eb3..a1aac00 100644 --- a/src/services/XmlFormatter.ts +++ b/src/services/XmlFormatter.ts @@ -62,7 +62,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('/', '')) { - + output += parts[i]; if (!inComment) level--; } @@ -157,7 +157,11 @@ export class XmlFormatter { inCdata = true; } - else if (char == ']' && (xml.substr(i, 3) == ']]>' || xml.substr(i, 3) == '-->')) { + else if (char == ']' && (xml.substr(i, 3) == ']]>')) { + inCdata = false; + } + + else if (char == '-' && (xml.substr(i, 3) == '-->')) { inCdata = false; } From 51d14fcd1c789bcbe559e978d9a60ad7e977de30 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 17 May 2016 22:42:12 -0400 Subject: [PATCH 3/6] feat: add xsl formatting support fixes #55 --- package.json | 1 + src/Extension.ts | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 24ad42e..9c9feea 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,7 @@ }, "activationEvents": [ "onLanguage:xml", + "onLanguage:xsl", "onLanguage:xquery", "onCommand:xmlTools.minifyXml", "onCommand:xmlTools.evaluateXPath", diff --git a/src/Extension.ts b/src/Extension.ts index 9d4c562..fd23a79 100644 --- a/src/Extension.ts +++ b/src/Extension.ts @@ -11,6 +11,7 @@ export var GlobalState: vsc.Memento; export var WorkspaceState: vsc.Memento; const LANG_XML: string = 'xml'; +const LANG_XSL: string = 'xsl'; const LANG_XQUERY: string = 'xquery;' const MEM_QUERY_HISTORY: string = 'xpathQueryHistory'; @@ -30,8 +31,8 @@ export function activate(ctx: vsc.ExtensionContext) { // register language feature providers ctx.subscriptions.push( - vsc.languages.registerDocumentFormattingEditProvider(LANG_XML, new XmlFormattingEditProvider()), - vsc.languages.registerDocumentRangeFormattingEditProvider(LANG_XML, new XmlFormattingEditProvider()), + vsc.languages.registerDocumentFormattingEditProvider([LANG_XML, LANG_XSL], new XmlFormattingEditProvider()), + vsc.languages.registerDocumentRangeFormattingEditProvider([LANG_XML, LANG_XSL], new XmlFormattingEditProvider()), vsc.languages.registerCompletionItemProvider(LANG_XQUERY, new XQueryCompletionItemProvider(), ':', '$') ); From f4ca14cd2acbaeb705e4d7dc6c127d07a5c0a92b Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 17 May 2016 22:55:57 -0400 Subject: [PATCH 4/6] chore: ignore VSIX --- .gitignore | 3 ++- .vscode/settings.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0abbed5..b1265b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -src/**/*.js \ No newline at end of file +src/**/*.js +**/*.vsix \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index f8edaaa..4d3cc92 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,7 @@ "files.exclude": { "**/.git": true, "**/.DS_Store": true, + "**/*/vsix": true, "**/*.js": {"when": "$(basename).ts"} } } \ No newline at end of file From eb5ac764ced447f01b5ca6e58fae9682c3d40b58 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 17 May 2016 22:56:16 -0400 Subject: [PATCH 5/6] chore: v1.6.0-preview.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c9feea..d2a87b0 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.5.2", + "version": "1.6.0-preview.1", "publisher": "DotJoshJohnson", "author": { "name": "TrueCommerce", From e5af28105ea64c0da263c95687740bfd73f3b1b2 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 7 Jun 2016 17:14:39 -0400 Subject: [PATCH 6/6] chore: v1.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d2a87b0..fdc1f85 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.6.0-preview.1", + "version": "1.6.0", "publisher": "DotJoshJohnson", "author": { "name": "TrueCommerce",