combined grammar association wrappers

Author: Alexander Chen

package.json

@@ -526,9 +526,10 @@
         "category": "XML"
       },
       {
-        "command": "xml.command.bind.grammar",
+        "command": "xml.open.binding.wizard",
         "title": "Bind to grammar/schema file",
-        "category": "XML"
+        "category": "XML",
+        "when": "editorLangId == xml && editorIsOpen"
       }
     ],
     "menus": {

src/commands/commandConstants.ts

@@ -62,8 +62,6 @@ export namespace ClientCommandConstants {
    * Client command to execute an XML command on XML Language Server side.
    */
   export const EXECUTE_WORKSPACE_COMMAND = 'xml.workspace.executeCommand';
-
-  export const COMMAND_PALETTE_BINDING_WIZARD = 'xml.command.bind.grammar';
 }
 
 /**

src/commands/registerCommands.ts

@@ -25,7 +25,6 @@ export async function registerClientServerCommands(context: ExtensionContext, la
 
   registerCodeLensReferencesCommands(context, languageClient);
   registerValidationCommands(context);
-  registerCodeLensAssociationCommands(context, languageClient);
   registerAssociationCommands(context, languageClient);
 
   // Register client command to execute custom XML Language Server command
@@ -186,30 +185,14 @@ async function grammarAssociationCommand (uriString: string, languageClient: Lan
 }
 
 /**
- * Register commands used for associating grammar file (XSD,DTD) to a given XML file with CodeLens
- *
- * @param context the extension context
- * @param languageClient the language server client
- */
-function registerCodeLensAssociationCommands(context: ExtensionContext, languageClient: LanguageClient) {
-  context.subscriptions.push(commands.registerCommand(ClientCommandConstants.OPEN_BINDING_WIZARD, async (uriString: string) => {
-    grammarAssociationCommand(uriString, languageClient)
-  }));
-}
-
-/**
- * Register commands used for associating grammar file (XSD,DTD) to a given XML file
+ * Register commands used for associating grammar file (XSD,DTD) to a given XML file for command menu and CodeLens.
  *
  * @param context the extension context
  * @param languageClient the language server client
  */
  function registerAssociationCommands(context: ExtensionContext, languageClient: LanguageClient) {
-  context.subscriptions.push(commands.registerCommand(ClientCommandConstants.COMMAND_PALETTE_BINDING_WIZARD, async () => {
-    // const uriFolder = workspace.workspaceFolders[0].uri.path;
-    // const uriFile = workspace.workspaceFolders[0].uri.fsPath;
+  context.subscriptions.push(commands.registerCommand(ClientCommandConstants.OPEN_BINDING_WIZARD, async () => {
     const uriString = window.activeTextEditor.document.fileName;
-    // const uriString = uriFolder + uriFile;
-    // const uriString = workspace.workspaceFile.toString();
     grammarAssociationCommand(uriString, languageClient)
   }));
  }