Support for multiple Qute template root

Signed-off-by: azerr <[email protected]>

Author: angelozerr

package.json

@@ -117,6 +117,16 @@
           "qute.txt"
         ],
         "configuration": "./language-support/qute/language-configuration.json"
+      },
+      {
+        "id": "qute-md",
+        "aliases": [
+          "Qute MarkDown"
+        ],
+        "extensions": [
+          "qute.md"
+        ],
+        "configuration": "./language-support/qute/language-configuration.json"
       }
     ],
     "htmlLanguageParticipants": [

src/qute/commands/commandConstants.ts

@@ -92,4 +92,6 @@ export namespace QuteJdtLsServerCommandConstants {
    */
   export const JAVA_DEFINTION = 'qute/template/javaDefinition';
 
+  export const IS_IN_TEMPLATE_COMMAND_ID = 'qute/template/isInTemplate';
+
 }

src/qute/commands/registerCommands.ts

@@ -211,7 +211,8 @@ const LANGUAGE_MAP = new Map<string, string>([
   [".txt", "qute-txt"],
   [".yaml", "qute-yaml"],
   [".yml", "qute-yaml"],
-  [".json", "qute-json"]
+  [".json", "qute-json"],
+  [".md", "qute-md"]
 ]);
 
 /**
@@ -244,7 +245,7 @@ async function updateQuteLanguageId(context: ExtensionContext, document: TextDoc
     return;
   }
 
-  if (isInTemplates(document)) {
+  if (await isInTemplates(document)) {
     // The html, txt, yaml, json file is in src/main/resources/templates folder
     // The document must be forced with qute-* language id
     const fileName: string = path.basename(document.fileName);
@@ -253,7 +254,7 @@ async function updateQuteLanguageId(context: ExtensionContext, document: TextDoc
 
 }
 
-function isInTemplates(document: TextDocument): boolean {
+async function isInTemplates(document: TextDocument): Promise<boolean> {
   if (document.fileName.includes(`resources${path.sep}templates${path.sep}`)) {
     // HTML, etc file is included in src/main/resources/templates
     return true;
@@ -262,7 +263,17 @@ function isInTemplates(document: TextDocument): boolean {
     // HTML, etc file is included in a JAR in templates JAR entry
     return true;
   }
-  return false;
+  return isInTemplates2(document.uri.toString());
+}
+
+/**
+   * Returns the label information for the given file URI.
+   * @param uri the file URI
+   * @return the label information for the given file URI.
+   */
+async function isInTemplates2(uri: string): Promise<boolean> {
+  const params = { templateFileUri: uri };
+  return await commands.executeCommand("java.execute.workspaceCommand", QuteJdtLsServerCommandConstants.IS_IN_TEMPLATE_COMMAND_ID, params);
 }
 
 interface TemplateValidationStatus {

src/qute/languageServer/client.ts

@@ -21,6 +21,7 @@ export async function connectToQuteLS(context: ExtensionContext, api: JavaExtens
       { scheme: 'file', language: 'qute-json' },
       { scheme: 'file', language: 'qute-yaml' },
       { scheme: 'file', language: 'qute-txt' },
+      { scheme: 'file', language: 'qute-md' },
       { scheme: 'untitled', language: 'qute-html' },
       { scheme: 'vscode-notebook-cell', language: 'qute-html' },
       { scheme: 'file', language: 'java' }