@marko/language-server 0.12.11 → 0.12.12

package/dist/index.js

@@ -625,10 +625,10 @@ function display(type, data) {
 }
 
 // src/service/index.ts
-var import_vscode_languageserver13 = require("vscode-languageserver");
+var import_vscode_languageserver14 = require("vscode-languageserver");
 
 // src/service/marko/complete/index.ts
-var import_vscode_languageserver5 = require("vscode-languageserver");
+var import_vscode_languageserver6 = require("vscode-languageserver");
 
 // src/service/marko/complete/Tag.ts
 var import_vscode_languageserver = require("vscode-languageserver");
@@ -670,71 +670,107 @@ ${closingTagStr}`
   }
 }
 
-// src/service/marko/complete/OpenTagName.ts
+// src/service/marko/util/get-tag-name-completion.ts
 var import_path2 = __toESM(require("path"));
-var import_vscode_uri2 = require("vscode-uri");
 var import_vscode_languageserver2 = require("vscode-languageserver");
+var import_vscode_uri2 = require("vscode-uri");
+var deprecated = [import_vscode_languageserver2.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 = import_vscode_uri2.URI.file(fileForTag).toString();
+  const nodeModuleMatch = /\/node_modules\/((?:@[^/]+\/)?[^/]+)/.exec(fileForTag);
+  const nodeModuleName = nodeModuleMatch && nodeModuleMatch[1];
+  const isCoreTag = nodeModuleName === "marko";
+  const documentation = {
+    kind: import_vscode_languageserver2.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 ? import_path2.default.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 ? import_vscode_languageserver2.InsertTextFormat.Snippet : void 0,
+    kind: tag.html ? import_vscode_languageserver2.CompletionItemKind.Property : import_vscode_languageserver2.CompletionItemKind.Class,
+    textEdit: range && import_vscode_languageserver2.TextEdit.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 = import_vscode_uri2.URI.file(fileForTag).toString();
-    const nodeModuleMatch = /\/node_modules\/((?:@[^/]+\/)?[^/]+)/.exec(fileForTag);
-    const nodeModuleName = nodeModuleMatch && nodeModuleMatch[1];
-    const isCoreTag = nodeModuleName === "marko";
-    const documentation = {
-      kind: import_vscode_languageserver2.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 ? import_path2.default.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: import_vscode_languageserver2.CompletionItemKind.Class,
-      insertTextFormat: import_vscode_languageserver2.InsertTextFormat.Snippet,
-      textEdit: import_vscode_languageserver2.TextEdit.replace(tagNameLocation, autocomplete && autocomplete.snippet || label)
-    };
-  });
+  }
+  return result;
 }
 
 // src/service/marko/complete/AttrName.ts
@@ -973,19 +1009,59 @@ async function AttrValue({
   }
 }
 
+// src/service/marko/complete/Statement.ts
+var import_vscode_languageserver5 = require("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 = import_vscode_languageserver5.TextEdit.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;
   const parsed = parse2(doc);
   const offset = doc.offsetAt(params.position);
   const node = parsed.nodeAt(offset);
-  return import_vscode_languageserver5.CompletionList.create(await ((_a = handlers[NodeType[node.type]]) == null ? void 0 : _a.call(handlers, {
+  return import_vscode_languageserver6.CompletionList.create(await ((_a = handlers[NodeType[node.type]]) == null ? void 0 : _a.call(handlers, {
     document: doc,
     params,
     parsed,
@@ -997,7 +1073,7 @@ var doComplete = async (doc, params) => {
 };
 
 // src/service/marko/validate.ts
-var import_vscode_languageserver6 = require("vscode-languageserver");
+var import_vscode_languageserver7 = require("vscode-languageserver");
 var markoErrorRegExp = /^(.+?)(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
 var doValidate = (doc) => {
   const fsPath = getDocFile(doc);
@@ -1017,7 +1093,7 @@ var doValidate = (doc) => {
       const [, fileName, rawLine, rawCol, msg] = match;
       const line = (parseInt(rawLine, 10) || 1) - 1;
       const col = (parseInt(rawCol, 10) || 1) - 1;
-      diagnostics.push(import_vscode_languageserver6.Diagnostic.create(import_vscode_languageserver6.Range.create(line, col, line, col), msg, import_vscode_languageserver6.DiagnosticSeverity.Error, void 0, fileName));
+      diagnostics.push(import_vscode_languageserver7.Diagnostic.create(import_vscode_languageserver7.Range.create(line, col, line, col), msg, import_vscode_languageserver7.DiagnosticSeverity.Error, void 0, fileName));
     }
   }
   return diagnostics;
@@ -1026,7 +1102,7 @@ var doValidate = (doc) => {
 // src/service/marko/definition/OpenTagName.ts
 var import_path4 = __toESM(require("path"));
 var import_vscode_uri4 = require("vscode-uri");
-var import_vscode_languageserver8 = require("vscode-languageserver");
+var import_vscode_languageserver9 = require("vscode-languageserver");
 
 // src/utils/regexp-builder.ts
 function RegExpBuilder(strings, ...expressions) {
@@ -1055,9 +1131,9 @@ function escape(val) {
 // src/utils/utils.ts
 var import_fs = __toESM(require("fs"));
 var import_vscode_uri3 = require("vscode-uri");
-var import_vscode_languageserver7 = require("vscode-languageserver");
+var import_vscode_languageserver8 = require("vscode-languageserver");
 var import_vscode_languageserver_textdocument = require("vscode-languageserver-textdocument");
-var START_OF_FILE = import_vscode_languageserver7.Range.create(import_vscode_languageserver7.Position.create(0, 0), import_vscode_languageserver7.Position.create(0, 0));
+var START_OF_FILE = import_vscode_languageserver8.Range.create(import_vscode_languageserver8.Position.create(0, 0), import_vscode_languageserver8.Position.create(0, 0));
 function createTextDocument(filename) {
   const uri = import_vscode_uri3.URI.file(filename).toString();
   const content = import_fs.default.readFileSync(filename, "utf-8");
@@ -1092,17 +1168,17 @@ function OpenTagName2({
     const tagDefDoc = createTextDocument(tagEntryFile);
     const match = RegExpBuilder`/"(?:<${tag.nameText}>|${tag.nameText})"\s*:\s*[^\r\n,]+/g`.exec(tagDefDoc.getText());
     if (match && match.index) {
-      range = import_vscode_languageserver8.Range.create(tagDefDoc.positionAt(match.index), tagDefDoc.positionAt(match.index + match[0].length));
+      range = import_vscode_languageserver9.Range.create(tagDefDoc.positionAt(match.index), tagDefDoc.positionAt(match.index + match[0].length));
     }
   }
   return [
-    import_vscode_languageserver8.LocationLink.create(import_vscode_uri4.URI.file(tagEntryFile).toString(), range, range, parsed.locationAt(node))
+    import_vscode_languageserver9.LocationLink.create(import_vscode_uri4.URI.file(tagEntryFile).toString(), range, range, parsed.locationAt(node))
   ];
 }
 
 // src/service/marko/definition/AttrName.ts
 var import_vscode_uri5 = require("vscode-uri");
-var import_vscode_languageserver9 = require("vscode-languageserver");
+var import_vscode_languageserver10 = require("vscode-languageserver");
 function AttrName2({
   lookup,
   parsed,
@@ -1126,11 +1202,11 @@ function AttrName2({
     const tagDefDoc = createTextDocument(attrEntryFile);
     const match = RegExpBuilder`/"@${attrName}"\s*:\s*[^\r\n,]+/g`.exec(tagDefDoc.getText());
     if (match && match.index) {
-      range = import_vscode_languageserver9.Range.create(tagDefDoc.positionAt(match.index), tagDefDoc.positionAt(match.index + match[0].length));
+      range = import_vscode_languageserver10.Range.create(tagDefDoc.positionAt(match.index), tagDefDoc.positionAt(match.index + match[0].length));
     }
   }
   return [
-    import_vscode_languageserver9.LocationLink.create(import_vscode_uri5.URI.file(attrEntryFile).toString(), range, range, parsed.locationAt(node))
+    import_vscode_languageserver10.LocationLink.create(import_vscode_uri5.URI.file(attrEntryFile).toString(), range, range, parsed.locationAt(node))
   ];
 }
 
@@ -1156,9 +1232,9 @@ var findDefinition = async (doc, params) => {
 };
 
 // src/service/marko/document-links/extract.ts
-var import_vscode_languageserver10 = require("vscode-languageserver");
+var import_vscode_languageserver11 = require("vscode-languageserver");
 var import_vscode_uri6 = require("vscode-uri");
-var importTagReg = /(['"])<((?:[^\1\\>]+|\\.)*)>?\1/g;
+var importTagReg2 = /(['"])<((?:[^\1\\>]+|\\.)*)>?\1/g;
 function extractDocumentLinks(doc, parsed, lookup) {
   if (import_vscode_uri6.URI.parse(doc.uri).scheme === "untitled") {
     return [];
@@ -1173,7 +1249,7 @@ function extractDocumentLinks(doc, parsed, lookup) {
         if (node.attrs && node.nameText) {
           for (const attr of node.attrs) {
             if (isDocumentLinkAttr(doc, node, attr)) {
-              links.push(import_vscode_languageserver10.DocumentLink.create({
+              links.push(import_vscode_languageserver11.DocumentLink.create({
                 start: parsed.positionAt(attr.value.value.start),
                 end: parsed.positionAt(attr.value.value.end)
               }, resolveUrl(read(attr.value.value).slice(1, -1), doc.uri)));
@@ -1190,15 +1266,15 @@ 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);
         const fileForTag = tagDef && (tagDef.template || tagDef.renderer);
         if (fileForTag) {
-          links.push(import_vscode_languageserver10.DocumentLink.create({
+          links.push(import_vscode_languageserver11.DocumentLink.create({
             start: parsed.positionAt(item.start + match.index),
             end: parsed.positionAt(item.start + match.index + length)
           }, fileForTag));
@@ -1225,7 +1301,7 @@ var findDocumentLinks = async (doc) => {
 };
 
 // src/service/marko/format.ts
-var import_vscode_languageserver11 = require("vscode-languageserver");
+var import_vscode_languageserver12 = require("vscode-languageserver");
 var import_vscode_uri7 = require("vscode-uri");
 var prettier = __toESM(require("prettier"));
 var markoPrettier = __toESM(require("prettier-plugin-marko"));
@@ -1246,7 +1322,7 @@ var format2 = async (doc, params, cancel) => {
     if (cancel.isCancellationRequested)
       return;
     return [
-      import_vscode_languageserver11.TextEdit.replace(import_vscode_languageserver11.Range.create(doc.positionAt(0), doc.positionAt(text.length)), prettier.format(text, options))
+      import_vscode_languageserver12.TextEdit.replace(import_vscode_languageserver12.Range.create(doc.positionAt(0), doc.positionAt(text.length)), prettier.format(text, options))
     ];
   } catch (e) {
     displayError(e);
@@ -1263,7 +1339,7 @@ var marko_default = {
 };
 
 // src/service/stylesheet/index.ts
-var import_vscode_languageserver12 = require("vscode-languageserver");
+var import_vscode_languageserver13 = require("vscode-languageserver");
 var import_vscode_css_languageservice2 = require("vscode-css-languageservice");
 var import_vscode_languageserver_textdocument2 = require("vscode-languageserver-textdocument");
 
@@ -1467,7 +1543,7 @@ var StyleSheetService = {
       }
       return result;
     }
-    return import_vscode_languageserver12.CompletionList.create([], true);
+    return import_vscode_languageserver13.CompletionList.create([], true);
   },
   findDefinition(doc, params) {
     const infoByExt = getStyleSheetInfo(doc);
@@ -1586,7 +1662,7 @@ var StyleSheetService = {
         continue;
       const { service: service2, virtualDoc } = info;
       const result = [];
-      for (const colorPresentation of service2.getColorPresentations(virtualDoc, info.parsed, params.color, import_vscode_languageserver12.Range.create(virtualDoc.positionAt(generatedOffsetStart), virtualDoc.positionAt(generatedOffsetEnd)))) {
+      for (const colorPresentation of service2.getColorPresentations(virtualDoc, info.parsed, params.color, import_vscode_languageserver13.Range.create(virtualDoc.positionAt(generatedOffsetStart), virtualDoc.positionAt(generatedOffsetEnd)))) {
         const textEdit = colorPresentation.textEdit && getSourceEdit(doc, info, colorPresentation.textEdit);
         const additionalTextEdits = colorPresentation.additionalTextEdits && getSourceEdits(doc, info, colorPresentation.additionalTextEdits);
         if (textEdit || additionalTextEdits) {
@@ -1644,7 +1720,7 @@ var StyleSheetService = {
       }
       if (result.documentChanges) {
         for (const change of result.documentChanges) {
-          if (import_vscode_languageserver12.TextDocumentEdit.is(change)) {
+          if (import_vscode_languageserver13.TextDocumentEdit.is(change)) {
             if (change.textDocument.uri === doc.uri) {
               change.edits = getSourceEdits(doc, info, change.edits) || [];
             }
@@ -1667,7 +1743,7 @@ var StyleSheetService = {
       if (generatedOffsetEnd === void 0)
         continue;
       const { service: service2, virtualDoc } = info;
-      const result = service2.doCodeActions(virtualDoc, import_vscode_languageserver12.Range.create(virtualDoc.positionAt(generatedOffsetStart), virtualDoc.positionAt(generatedOffsetEnd)), params.context, info.parsed);
+      const result = service2.doCodeActions(virtualDoc, import_vscode_languageserver13.Range.create(virtualDoc.positionAt(generatedOffsetStart), virtualDoc.positionAt(generatedOffsetEnd)), params.context, info.parsed);
       for (const command of result) {
         const edits = (_a = command.arguments) == null ? void 0 : _a[2];
         if (edits && Array.isArray(edits) && isTextEdit(edits[0])) {
@@ -1791,51 +1867,47 @@ var service = {
     }));
   },
   async doComplete(doc, params, cancel) {
-    const result = import_vscode_languageserver13.CompletionList.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 import_vscode_languageserver14.CompletionList.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);
@@ -1845,21 +1917,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);
@@ -1869,21 +1935,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);
@@ -1893,21 +1953,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);
@@ -1917,21 +1971,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);
@@ -1941,21 +1989,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);
@@ -1981,41 +2023,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;
           }
         }
       }
@@ -2031,19 +2064,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);
@@ -2051,16 +2082,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);