@marko/language-server 1.1.2 → 1.1.3

package/dist/index.js

@@ -2011,6 +2011,9 @@ var import_language_tools16 = require("@marko/language-tools");
 
 // src/ts-plugin/host.ts
 var import_path6 = __toESM(require("path"));
+var defaultCompiler = __toESM(require("@marko/compiler"));
+var defaultConfig = __toESM(require("@marko/compiler/config"));
+var defaultTranslator = __toESM(require("@marko/translator-default"));
 var import_language_tools15 = require("@marko/language-tools");
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
@@ -2018,6 +2021,10 @@ import_language_tools15.Project.setDefaultTypePaths({
   internalTypesFile: import_path6.default.join(__dirname, "marko.internal.d.ts"),
   markoTypesFile: import_path6.default.join(__dirname, "marko.runtime.d.ts")
 });
+import_language_tools15.Project.setDefaultCompilerMeta(defaultCompiler, {
+  ...defaultConfig,
+  translator: defaultTranslator
+});
 function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
   var _a, _b, _c;
   const processors = import_language_tools15.Processors.create({
@@ -3549,39 +3556,31 @@ var service = {
     );
   },
   async doComplete(doc, params, cancel) {
-    const itemsByLabel = /* @__PURE__ */ new Map();
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doComplete) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur) {
-          let curItems;
-          if (Array.isArray(cur)) {
-            curItems = cur;
-          } else {
-            curItems = cur.items;
-          }
-          for (const item of curItems) {
-            const { label } = item;
-            const existingItem = itemsByLabel.get(label);
-            if (existingItem) {
-              if ((existingItem.sortText || label) < (item.sortText || label)) {
-                itemsByLabel.set(label, item);
-              }
-            } else {
-              itemsByLabel.set(label, item);
-            }
-          }
-        }
+        return (_a = plugin.doComplete) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    if (itemsByLabel.size) {
-      return { items: [...itemsByLabel.values()], isIncomplete: true };
+    const itemsByLabel = /* @__PURE__ */ new Map();
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      for (const item of Array.isArray(result.value) ? result.value : result.value.items) {
+        const { label } = item;
+        const existingItem = itemsByLabel.get(label);
+        if (existingItem) {
+          if ((existingItem.sortText || label) < (item.sortText || label)) {
+            itemsByLabel.set(label, item);
+          }
+        } else {
+          itemsByLabel.set(label, item);
+        }
+      }
     }
+    return { items: [...itemsByLabel.values()], isIncomplete: true };
   },
   async doCompletionResolve(item, cancel) {
     var _a;
@@ -3597,172 +3596,189 @@ var service = {
     }
   },
   async findDefinition(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findDefinition) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findDefinition) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let links;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      links = (links || []).concat(result.value);
+    }
+    return links;
   },
   async findReferences(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findReferences) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findReferences) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let references;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      references = (references || []).concat(result.value);
+    }
+    return references;
   },
   async findDocumentSymbols(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findDocumentSymbols) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findDocumentSymbols) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let symbols;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      symbols = (symbols || []).concat(result.value);
+    }
+    return symbols;
   },
   async findDocumentLinks(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findDocumentLinks) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findDocumentLinks) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let links;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      links = (links || []).concat(result.value);
+    }
+    return links;
   },
   async findDocumentHighlights(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
-        var _a;
-        const cur = await ((_a = plugin.findDocumentHighlights) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
-      })
+    const results = await Promise.allSettled(
+      plugins.map(
+        (plugin) => {
+          var _a;
+          return (_a = plugin.findDocumentHighlights) == null ? void 0 : _a.call(plugin, doc, params, cancel);
+        }
+      )
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let highlights;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      highlights = (highlights || []).concat(result.value);
+    }
+    return highlights;
   },
   async findDocumentColors(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.findDocumentColors) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.findDocumentColors) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let colors;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      colors = (colors || []).concat(result.value);
+    }
+    return colors;
   },
   async getColorPresentations(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
-        var _a;
-        const cur = await ((_a = plugin.getColorPresentations) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
-      })
+    const results = await Promise.allSettled(
+      plugins.map(
+        (plugin) => {
+          var _a;
+          return (_a = plugin.getColorPresentations) == null ? void 0 : _a.call(plugin, doc, params, cancel);
+        }
+      )
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let presentations;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      presentations = (presentations || []).concat(result.value);
+    }
+    return presentations;
   },
   async doHover(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doHover) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur) {
-          if (result) {
-            result.range = maxRange(result.range, cur.range);
-            result.contents = mergeHoverContents(result.contents, cur.contents);
-          } else {
-            result = cur;
-          }
-        }
+        return (_a = plugin.doHover) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
-    return result;
+    if (cancel.isCancellationRequested)
+      return;
+    let hovers;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      if (hovers) {
+        hovers.range = maxRange(hovers.range, result.value.range);
+        hovers.contents = mergeHoverContents(
+          hovers.contents,
+          result.value.contents
+        );
+      } else {
+        hovers = result.value;
+      }
+    }
+    return hovers;
   },
   async doRename(doc, params, cancel) {
-    let changes;
-    let changeAnnotations;
-    let documentChanges;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doRename) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur) {
-          if (cur.changes) {
-            if (changes) {
-              changes = { ...changes };
-              for (const uri in cur.changes) {
-                changes[uri] = changes[uri] ? changes[uri].concat(cur.changes[uri]) : cur.changes[uri];
-              }
-            } else {
-              changes = cur.changes;
-            }
-          }
-          if (cur.changeAnnotations) {
-            changeAnnotations = changeAnnotations ? {
-              ...changeAnnotations,
-              ...cur.changeAnnotations
-            } : cur.changeAnnotations;
-          }
-          if (cur.documentChanges) {
-            documentChanges = documentChanges ? documentChanges.concat(cur.documentChanges) : cur.documentChanges;
-          }
-        }
+        return (_a = plugin.doRename) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
+    let changes;
+    let changeAnnotations;
+    let documentChanges;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      const { value } = result;
+      if (value.changes) {
+        if (changes) {
+          changes = { ...changes };
+          for (const uri in value.changes) {
+            changes[uri] = changes[uri] ? changes[uri].concat(value.changes[uri]) : value.changes[uri];
+          }
+        } else {
+          changes = value.changes;
+        }
+      }
+      if (value.changeAnnotations) {
+        changeAnnotations = changeAnnotations ? {
+          ...changeAnnotations,
+          ...value.changeAnnotations
+        } : value.changeAnnotations;
+      }
+      if (value.documentChanges) {
+        documentChanges = documentChanges ? documentChanges.concat(value.documentChanges) : value.documentChanges;
+      }
+    }
     if (changes || changeAnnotations || documentChanges) {
       return {
         changes,
@@ -3772,32 +3788,36 @@ var service = {
     }
   },
   async doCodeActions(doc, params, cancel) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doCodeActions) == null ? void 0 : _a.call(plugin, doc, params, cancel));
-        if (cancel.isCancellationRequested)
-          return;
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.doCodeActions) == null ? void 0 : _a.call(plugin, doc, params, cancel);
       })
     );
     if (cancel.isCancellationRequested)
       return;
-    return result;
+    let actions;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      actions = (actions || []).concat(result.value);
+    }
+    return actions;
   },
   async doValidate(doc) {
-    let result;
-    await Promise.allSettled(
-      plugins.map(async (plugin) => {
+    const results = await Promise.allSettled(
+      plugins.map((plugin) => {
         var _a;
-        const cur = await ((_a = plugin.doValidate) == null ? void 0 : _a.call(plugin, doc));
-        if (cur)
-          result = (result || []).concat(cur);
+        return (_a = plugin.doValidate) == null ? void 0 : _a.call(plugin, doc);
       })
     );
-    return result;
+    let diagnostics;
+    for (const result of results) {
+      if (result.status !== "fulfilled" || !result.value)
+        continue;
+      diagnostics = (diagnostics || []).concat(result.value);
+    }
+    return diagnostics;
   },
   format: marko_default.format
 };