From 41bf728061c3a17b5ab8fbaa0c10dc6c9201c0a7 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Mon, 18 Jan 2016 15:59:58 -0500 Subject: [PATCH 1/2] Fix #23 --- package.json | 6 +++++- src/Extension.ts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c468db8..c05cac6 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,11 @@ }, "activationEvents": [ "onLanguage:xml", - "onLanguage:xquery" + "onLanguage:xquery", + "onCommand:xmlTools.formatXml", + "onCommand:xmlTools.minifyXml", + "onCommand:xmlTools.evaluateXPath", + "onCommand:xmlTools.executeXQuery" ], "devDependencies": { "vscode": "^0.10.7", diff --git a/src/Extension.ts b/src/Extension.ts index 379655b..c7ae8e2 100644 --- a/src/Extension.ts +++ b/src/Extension.ts @@ -14,6 +14,7 @@ const LANG_XQUERY: string = 'xquery;' const MEM_QUERY_HISTORY: string = 'xpathQueryHistory'; export function activate(ctx: vsc.ExtensionContext) { + console.log('activate extension'); // expose global and workspace state to the entire extension GlobalState = ctx.globalState; WorkspaceState = ctx.workspaceState; From cc796ed26e993e0ebf9ba6b398b2230508ca6ffd Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Mon, 18 Jan 2016 16:04:50 -0500 Subject: [PATCH 2/2] Remove Format XML Command --- package.json | 5 ----- src/Commands.ts | 5 ----- src/Extension.ts | 1 - 3 files changed, 11 deletions(-) diff --git a/package.json b/package.json index c05cac6..252e860 100644 --- a/package.json +++ b/package.json @@ -33,10 +33,6 @@ "main": "./src/Extension", "contributes": { "commands": [ - { - "command": "xmlTools.formatXml", - "title": "XML Tools: Format XML" - }, { "command": "xmlTools.minifyXml", "title": "XML Tools: Minify XML" @@ -115,7 +111,6 @@ "activationEvents": [ "onLanguage:xml", "onLanguage:xquery", - "onCommand:xmlTools.formatXml", "onCommand:xmlTools.minifyXml", "onCommand:xmlTools.evaluateXPath", "onCommand:xmlTools.executeXQuery" diff --git a/src/Commands.ts b/src/Commands.ts index d39b08d..44980af 100644 --- a/src/Commands.ts +++ b/src/Commands.ts @@ -12,11 +12,6 @@ const CFG_SECTION: string = 'xmlTools'; const CFG_REMOVE_COMMENTS: string = 'removeCommentsOnMinify'; export class TextEditorCommands { - static formatXml(editor: vsc.TextEditor, edit: vsc.TextEditorEdit): void { - // alias for editor.action.format - vsc.commands.executeCommand('editor.action.format'); - } - static minifyXml(editor: vsc.TextEditor, edit: vsc.TextEditorEdit): void { let removeComments: boolean = vsc.workspace.getConfiguration(CFG_SECTION).get(CFG_REMOVE_COMMENTS, false); diff --git a/src/Extension.ts b/src/Extension.ts index c7ae8e2..582a4ce 100644 --- a/src/Extension.ts +++ b/src/Extension.ts @@ -22,7 +22,6 @@ export function activate(ctx: vsc.ExtensionContext) { // register palette commands ctx.subscriptions.push( vsc.commands.registerTextEditorCommand('xmlTools.minifyXml', TextEditorCommands.minifyXml), - vsc.commands.registerTextEditorCommand('xmlTools.formatXml', TextEditorCommands.formatXml), vsc.commands.registerTextEditorCommand('xmlTools.evaluateXPath', TextEditorCommands.evaluateXPath), vsc.commands.registerTextEditorCommand('xmlTools.executeXQuery', TextEditorCommands.executeXQuery)