@marko/language-server 0.12.11 → 0.12.12

package/dist/index.mjs

@@ -674,76 +674,113 @@ ${closingTagStr}`
   }
 }
 
-// src/service/marko/complete/OpenTagName.ts
+// src/service/marko/util/get-tag-name-completion.ts
 import path2 from "path";
-import { URI as URI2 } from "vscode-uri";
 import {
   CompletionItemKind as CompletionItemKind2,
+  CompletionItemTag,
   InsertTextFormat as InsertTextFormat2,
   MarkupKind,
   TextEdit as TextEdit2
 } from "vscode-languageserver";
+import { URI as URI2 } from "vscode-uri";
+var deprecated = [CompletionItemTag.Deprecated];
+function getTagNameCompletion({
+  tag,
+  range,
+  showAutoComplete,
+  importer
+}) {
+  var _a;
+  let label = tag.isNestedTag ? `@${tag.name}` : tag.name;
+  const fileForTag = tag.template || tag.renderer || tag.filePath;
+  const fileURIForTag = URI2.file(fileForTag).toString();
+  const nodeModuleMatch = /\/node_modules\/((?:@[^/]+\/)?[^/]+)/.exec(fileForTag);
+  const nodeModuleName = nodeModuleMatch && nodeModuleMatch[1];
+  const isCoreTag = nodeModuleName === "marko";
+  const documentation = {
+    kind: MarkupKind.Markdown,
+    value: tag.html ? `Built in [<${tag.name}>](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/${tag.name}) HTML tag.` : nodeModuleName ? isCoreTag ? `Core Marko [<${tag.name}>](${fileURIForTag}) tag.` : `Custom Marko tag discovered from the ["${nodeModuleName}"](${fileURIForTag}) npm package.` : `Custom Marko tag discovered from:
+
+[${importer ? path2.relative(importer, fileForTag) : fileForTag}](${fileURIForTag})`
+  };
+  if (tag.description) {
+    documentation.value += `
+
+${tag.description}`;
+  }
+  const autocomplete = showAutoComplete ? (_a = tag.autocomplete) == null ? void 0 : _a[0] : void 0;
+  if (autocomplete) {
+    if (autocomplete.displayText) {
+      label = autocomplete.displayText;
+    }
+    if (autocomplete.description) {
+      documentation.value += `
+
+${autocomplete.description}`;
+    }
+    if (autocomplete.descriptionMoreURL) {
+      documentation.value += `
+
+[More Info](${autocomplete.descriptionMoreURL})`;
+    }
+  }
+  return {
+    label,
+    documentation,
+    tags: tag.deprecated ? deprecated : void 0,
+    insertTextFormat: autocomplete ? InsertTextFormat2.Snippet : void 0,
+    kind: tag.html ? CompletionItemKind2.Property : CompletionItemKind2.Class,
+    textEdit: range && TextEdit2.replace(range, (autocomplete == null ? void 0 : autocomplete.snippet) || label)
+  };
+}
+
+// src/service/marko/complete/OpenTagName.ts
 function OpenTagName({
   document,
   lookup,
   parsed,
   node
 }) {
-  const currentTemplateFilePath = getDocFile(document);
+  var _a;
+  const importer = getDocFile(document);
   const tag = node.parent;
-  const tagNameLocation = parsed.locationAt(node);
-  let tags;
-  if (tag.type === 14 /* AttrTag */) {
+  const range = parsed.locationAt(node);
+  const isAttrTag = tag.type === 14 /* AttrTag */;
+  const result = [];
+  if (isAttrTag) {
     let parentTag = tag.owner;
     while ((parentTag == null ? void 0 : parentTag.type) === 14 /* AttrTag */)
       parentTag = parentTag.owner;
     const parentTagDef = parentTag && parentTag.nameText && lookup.getTag(parentTag.nameText);
-    tags = parentTagDef && parentTagDef.nestedTags && Object.values(parentTagDef.nestedTags) || [];
-  } else {
-    tags = lookup.getTagsSorted().filter((it) => !it.isNestedTag);
-  }
-  return tags.filter((it) => !it.deprecated).filter((it) => it.name !== "*").filter((it) => /^[^_]/.test(it.name) || !/\/node_modules\//.test(it.filePath)).map((it) => {
-    let label = it.isNestedTag ? `@${it.name}` : it.name;
-    const fileForTag = it.template || it.renderer || it.filePath;
-    const fileURIForTag = URI2.file(fileForTag).toString();
-    const nodeModuleMatch = /\/node_modules\/((?:@[^/]+\/)?[^/]+)/.exec(fileForTag);
-    const nodeModuleName = nodeModuleMatch && nodeModuleMatch[1];
-    const isCoreTag = nodeModuleName === "marko";
-    const documentation = {
-      kind: MarkupKind.Markdown,
-      value: it.html ? `Built in [<${it.name}>](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/${it.name}) HTML tag.` : nodeModuleName ? isCoreTag ? `Core Marko [<${it.name}>](${fileURIForTag}) tag.` : `Custom Marko tag discovered from the ["${nodeModuleName}"](${fileURIForTag}) npm package.` : `Custom Marko tag discovered from:
-
-[${currentTemplateFilePath ? path2.relative(currentTemplateFilePath, fileForTag) : currentTemplateFilePath}](${fileURIForTag})`
-    };
-    if (it.description) {
-      documentation.value += `
-
-${it.description}`;
-    }
-    const autocomplete = it.autocomplete && it.autocomplete[0];
-    if (autocomplete) {
-      if (autocomplete.displayText) {
-        label = autocomplete.displayText;
-      }
-      if (autocomplete.description) {
-        documentation.value += `
-
-${autocomplete.description}`;
+    if (parentTagDef) {
+      const { nestedTags } = parentTagDef;
+      for (const key in nestedTags) {
+        if (key !== "*") {
+          const tag2 = nestedTags[key];
+          result.push(getTagNameCompletion({
+            tag: tag2,
+            range,
+            importer,
+            showAutoComplete: true
+          }));
+        }
       }
-      if (autocomplete.descriptionMoreURL) {
-        documentation.value += `
-
-[More Info](${autocomplete.descriptionMoreURL})`;
+    }
+  } else {
+    const skipStatements = !(tag.concise && tag.parent.type === 0 /* Program */);
+    for (const tag2 of lookup.getTagsSorted()) {
+      if (!(tag2.name === "*" || tag2.isNestedTag || skipStatements && ((_a = tag2.parseOptions) == null ? void 0 : _a.statement) || tag2.name[0] === "_" && /^@?marko[/-]|[\\/]node_modules[\\/]/.test(tag2.filePath))) {
+        result.push(getTagNameCompletion({
+          tag: tag2,
+          range,
+          importer,
+          showAutoComplete: true
+        }));
       }
     }
-    return {
-      label,
-      documentation,
-      kind: CompletionItemKind2.Class,
-      insertTextFormat: InsertTextFormat2.Snippet,
-      textEdit: TextEdit2.replace(tagNameLocation, autocomplete && autocomplete.snippet || label)
-    };
-  });
+  }
+  return result;
 }
 
 // src/service/marko/complete/AttrName.ts
@@ -991,12 +1028,52 @@ async function AttrValue({
   }
 }
 
+// src/service/marko/complete/Statement.ts
+import { TextEdit as TextEdit5 } from "vscode-languageserver";
+var importTagReg = /(['"])<((?:[^\1\\>]+|\\.)*)>?\1/g;
+function Statement({
+  code,
+  node,
+  parsed,
+  lookup,
+  document
+}) {
+  var _a;
+  if (code[node.start] === "i") {
+    importTagReg.lastIndex = 0;
+    const value = parsed.read(node);
+    const match = importTagReg.exec(value);
+    if (match) {
+      const importer = getDocFile(document);
+      const [{ length }] = match;
+      const range = parsed.locationAt({
+        start: node.start + match.index + 1,
+        end: node.start + match.index + length - 1
+      });
+      const result = [];
+      for (const tag of lookup.getTagsSorted()) {
+        if ((tag.template || tag.renderer) && !(tag.html || tag.parser || tag.translator || tag.isNestedTag || tag.name === "*" || ((_a = tag.parseOptions) == null ? void 0 : _a.statement) || /^@?marko[/-]/.test(tag.taglibId) || tag.name[0] === "_" && /[\\/]node_modules[\\/]/.test(tag.filePath))) {
+          const completion = getTagNameCompletion({
+            tag,
+            importer
+          });
+          completion.label = `<${completion.label}>`;
+          completion.textEdit = TextEdit5.replace(range, completion.label);
+          result.push(completion);
+        }
+      }
+      return result;
+    }
+  }
+}
+
 // src/service/marko/complete/index.ts
 var handlers = {
   Tag,
   OpenTagName,
   AttrName,
-  AttrValue
+  AttrValue,
+  Statement
 };
 var doComplete = async (doc, params) => {
   var _a;
@@ -1176,7 +1253,7 @@ var findDefinition = async (doc, params) => {
 // src/service/marko/document-links/extract.ts
 import { DocumentLink } from "vscode-languageserver";
 import { URI as URI6 } from "vscode-uri";
-var importTagReg = /(['"])<((?:[^\1\\>]+|\\.)*)>?\1/g;
+var importTagReg2 = /(['"])<((?:[^\1\\>]+|\\.)*)>?\1/g;
 function extractDocumentLinks(doc, parsed, lookup) {
   if (URI6.parse(doc.uri).scheme === "untitled") {
     return [];
@@ -1208,9 +1285,9 @@ function extractDocumentLinks(doc, parsed, lookup) {
   };
   for (const item of program.static) {
     if (item.type === 20 /* Statement */ && code[item.start] === "i") {
-      importTagReg.lastIndex = 0;
+      importTagReg2.lastIndex = 0;
       const value = parsed.read(item);
-      const match = importTagReg.exec(value);
+      const match = importTagReg2.exec(value);
       if (match) {
         const [{ length }, , tagName] = match;
         const tagDef = lookup.getTag(tagName);
@@ -1243,7 +1320,7 @@ var findDocumentLinks = async (doc) => {
 };
 
 // src/service/marko/format.ts
-import { Range as Range7, TextEdit as TextEdit5 } from "vscode-languageserver";
+import { Range as Range7, TextEdit as TextEdit6 } from "vscode-languageserver";
 import { URI as URI7 } from "vscode-uri";
 import * as prettier from "prettier";
 import * as markoPrettier from "prettier-plugin-marko";
@@ -1264,7 +1341,7 @@ var format2 = async (doc, params, cancel) => {
     if (cancel.isCancellationRequested)
       return;
     return [
-      TextEdit5.replace(Range7.create(doc.positionAt(0), doc.positionAt(text.length)), prettier.format(text, options))
+      TextEdit6.replace(Range7.create(doc.positionAt(0), doc.positionAt(text.length)), prettier.format(text, options))
     ];
   } catch (e) {
     displayError(e);
@@ -1817,51 +1894,47 @@ var service = {
     }));
   },
   async doComplete(doc, params, cancel) {
-    const result = CompletionList3.create([], false);
+    let items;
+    let isIncomplete = false;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.doComplete) == null ? void 0 : _a.call(plugin, doc, params, cancel);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
           return;
         if (cur) {
-          let items;
+          let curItems;
           if (Array.isArray(cur)) {
-            items = cur;
+            curItems = cur;
           } else {
-            items = cur.items;
-            result.isIncomplete || (result.isIncomplete = cur.isIncomplete);
+            curItems = cur.items;
+            isIncomplete || (isIncomplete = cur.isIncomplete);
           }
-          result.items.push(...items);
+          items = items ? items.concat(curItems) : curItems;
         }
       }
     } catch (err) {
-      result.isIncomplete = true;
+      isIncomplete = true;
       displayError(err);
     }
-    return result;
+    if (items) {
+      return CompletionList3.create(items, isIncomplete);
+    }
   },
   async findDefinition(doc, params, cancel) {
-    const result = [];
+    let result;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.findDefinition) == null ? void 0 : _a.call(plugin, doc, params, cancel);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
           return;
-        if (cur) {
-          if (Array.isArray(cur)) {
-            result.push(...cur);
-          } else {
-            result.push(cur);
-          }
-        }
+        if (cur)
+          result = (result || []).concat(cur);
       }
     } catch (err) {
       displayError(err);
@@ -1871,21 +1944,15 @@ var service = {
   async findReferences(doc, params, cancel) {
     let result;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.findReferences) == null ? void 0 : _a.call(plugin, doc, params, cancel);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
           return;
-        if (cur) {
-          if (result) {
-            result.push(...cur);
-          } else {
-            result = cur;
-          }
-        }
+        if (cur)
+          result = result ? result.concat(cur) : cur;
       }
     } catch (err) {
       displayError(err);
@@ -1895,21 +1962,15 @@ var service = {
   async findDocumentLinks(doc, params, cancel) {
     let result;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.findDocumentLinks) == null ? void 0 : _a.call(plugin, doc, params, cancel);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
           return;
-        if (cur) {
-          if (result) {
-            result.push(...cur);
-          } else {
-            result = cur;
-          }
-        }
+        if (cur)
+          result = result ? result.concat(cur) : cur;
       }
     } catch (err) {
       displayError(err);
@@ -1919,21 +1980,15 @@ var service = {
   async findDocumentHighlights(doc, params, cancel) {
     let result;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.findDocumentHighlights) == null ? void 0 : _a.call(plugin, doc, params, cancel);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
           return;
-        if (cur) {
-          if (result) {
-            result.push(...cur);
-          } else {
-            result = cur;
-          }
-        }
+        if (cur)
+          result = result ? result.concat(cur) : cur;
       }
     } catch (err) {
       displayError(err);
@@ -1943,21 +1998,15 @@ var service = {
   async findDocumentColors(doc, params, cancel) {
     let result;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.findDocumentColors) == null ? void 0 : _a.call(plugin, doc, params, cancel);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
           return;
-        if (cur) {
-          if (result) {
-            result.push(...cur);
-          } else {
-            result = cur;
-          }
-        }
+        if (cur)
+          result = result ? result.concat(cur) : cur;
       }
     } catch (err) {
       displayError(err);
@@ -1967,21 +2016,15 @@ var service = {
   async getColorPresentations(doc, params, cancel) {
     let result;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.getColorPresentations) == null ? void 0 : _a.call(plugin, doc, params, cancel);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
           return;
-        if (cur) {
-          if (result) {
-            result.push(...cur);
-          } else {
-            result = cur;
-          }
-        }
+        if (cur)
+          result = result ? result.concat(cur) : cur;
       }
     } catch (err) {
       displayError(err);
@@ -2007,41 +2050,32 @@ var service = {
     let changeAnnotations;
     let documentChanges;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.doRename) == null ? void 0 : _a.call(plugin, doc, params, cancel);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
           return;
         if (cur) {
           if (cur.changes) {
             if (changes) {
+              changes = { ...changes };
               for (const uri in cur.changes) {
-                if (changes[uri]) {
-                  changes[uri].push(...cur.changes[uri]);
-                } else {
-                  changes[uri] = cur.changes[uri];
-                }
+                changes[uri] = changes[uri] ? changes[uri].concat(cur.changes[uri]) : cur.changes[uri];
               }
             } else {
               changes = cur.changes;
             }
           }
           if (cur.changeAnnotations) {
-            if (changeAnnotations) {
-              Object.assign(changeAnnotations, cur.changeAnnotations);
-            } else {
-              changeAnnotations = cur.changeAnnotations;
-            }
+            changeAnnotations = changeAnnotations ? {
+              ...changeAnnotations,
+              ...cur.changeAnnotations
+            } : cur.changeAnnotations;
           }
           if (cur.documentChanges) {
-            if (documentChanges) {
-              documentChanges.push(...cur.documentChanges);
-            } else {
-              documentChanges = cur.documentChanges;
-            }
+            documentChanges = documentChanges ? documentChanges.concat(cur.documentChanges) : cur.documentChanges;
           }
         }
       }
@@ -2057,19 +2091,17 @@ var service = {
     }
   },
   async doCodeActions(doc, params, cancel) {
-    const result = [];
+    let result;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.doCodeActions) == null ? void 0 : _a.call(plugin, doc, params, cancel);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cancel.isCancellationRequested)
           return;
-        if (cur) {
-          result.push(...cur);
-        }
+        if (cur)
+          result = result ? result.concat(cur) : cur;
       }
     } catch (err) {
       displayError(err);
@@ -2077,16 +2109,15 @@ var service = {
     return result;
   },
   async doValidate(doc) {
-    const result = [];
+    let result;
     try {
-      const requests = plugins.map((plugin) => {
+      for (const pending of plugins.map((plugin) => {
         var _a;
         return (_a = plugin.doValidate) == null ? void 0 : _a.call(plugin, doc);
-      });
-      for (const pending of requests) {
+      })) {
         const cur = await pending;
         if (cur)
-          result.push(...cur);
+          result = result ? result.concat(cur) : cur;
       }
     } catch (err) {
       displayError(err);