addded grammar association wrapper

Author: Alexander Chen

src/commands/registerCommands.ts

@@ -139,49 +139,59 @@ for (const label of bindingTypes.keys()) {
 }
 
 /**
- * Register commands used for associating grammar file (XSD,DTD) to a given XML file
+ * The function passed to context subscriptions for grammar association
  *
- * @param context the extension context
+ * @param uriString the string representing the XML file path
+ * @param languageClient the language server client
  */
-function registerCodeLensAssociationCommands(context: ExtensionContext, languageClient: LanguageClient) {
-  context.subscriptions.push(commands.registerCommand(ClientCommandConstants.OPEN_BINDING_WIZARD, async (uriString: string) => {
-    // A click on Bind to grammar/schema... has been processed in the XML document which is not bound to a grammar
-    const documentURI = Uri.parse(uriString);
-
-    // Step 1 : open a combo to select the binding type ("standard", "xml-model")
-    const pickedBindingTypeOption = await window.showQuickPick(bindingTypeOptions, { placeHolder: "Binding type" });
-    if(!pickedBindingTypeOption) {
-      return;
+async function grammarAssociationCommand (uriString: string, languageClient: LanguageClient) {
+  // A click on Bind to grammar/schema... has been processed in the XML document which is not bound to a grammar
+  const documentURI = Uri.parse(uriString);
+
+  // Step 1 : open a combo to select the binding type ("standard", "xml-model")
+  const pickedBindingTypeOption = await window.showQuickPick(bindingTypeOptions, { placeHolder: "Binding type" });
+  if(!pickedBindingTypeOption) {
+    return;
+  }
+  const bindingType = bindingTypes.get(pickedBindingTypeOption.label);
+
+  // Open a dialog to select the XSD, DTD to bind.
+  const options: OpenDialogOptions = {
+    canSelectMany: false,
+    openLabel: 'Select XSD or DTD file',
+    filters: {
+      'Grammar files': ['xsd', 'dtd']
     }
-    const bindingType = bindingTypes.get(pickedBindingTypeOption.label);
-
-    // Open a dialog to select the XSD, DTD to bind.
-    const options: OpenDialogOptions = {
-      canSelectMany: false,
-      openLabel: 'Select XSD or DTD file',
-      filters: {
-        'Grammar files': ['xsd', 'dtd']
+  };
+
+  const fileUri = await window.showOpenDialog(options);
+  if (fileUri && fileUri[0]) {
+    // The XSD, DTD has been selected, get the proper syntax for binding this grammar file in the XML document.
+    const identifier = TextDocumentIdentifier.create(documentURI.toString());
+    const grammarURI = fileUri[0];
+    try {
+      const result = await commands.executeCommand(ServerCommandConstants.ASSOCIATE_GRAMMAR_INSERT, identifier, grammarURI.toString(), bindingType);
+      // Insert the proper syntax for binding
+      const lspTextDocumentEdit = <TextDocumentEdit>result;
+      const workEdits = new WorkspaceEdit();
+      for (const edit of lspTextDocumentEdit.edits) {
+        workEdits.replace(documentURI, languageClient.protocol2CodeConverter.asRange(edit.range), edit.newText);
       }
+      workspace.applyEdit(workEdits); // apply the edits
+    } catch (error) {
+      window.showErrorMessage('Error during grammar binding: ' + error.message);
     };
+  }
+}
 
-    const fileUri = await window.showOpenDialog(options);
-    if (fileUri && fileUri[0]) {
-      // The XSD, DTD has been selected, get the proper syntax for binding this grammar file in the XML document.
-      const identifier = TextDocumentIdentifier.create(documentURI.toString());
-      const grammarURI = fileUri[0];
-      try {
-        const result = await commands.executeCommand(ServerCommandConstants.ASSOCIATE_GRAMMAR_INSERT, identifier, grammarURI.toString(), bindingType);
-        // Insert the proper syntax for binding
-        const lspTextDocumentEdit = <TextDocumentEdit>result;
-        const workEdits = new WorkspaceEdit();
-        for (const edit of lspTextDocumentEdit.edits) {
-          workEdits.replace(documentURI, languageClient.protocol2CodeConverter.asRange(edit.range), edit.newText);
-        }
-        workspace.applyEdit(workEdits); // apply the edits
-      } catch (error) {
-        window.showErrorMessage('Error during grammar binding: ' + error.message);
-      };
-    }
+/**
+ * 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)
   }));
-
-}
+}