@marko/language-server 0.12.11 → 0.12.14

package/dist/index.mjs

@@ -571,7 +571,7 @@ function loadCompilerInfo(dir) {
   const rootDir = lassoPackageRoot.getRootDir(dir);
   const pkgPath = rootDir && resolveFrom.silent(rootDir, "@marko/compiler/package.json");
   const pkg = pkgPath && __require(pkgPath);
-  const cache3 = /* @__PURE__ */ new Map();
+  const cache4 = /* @__PURE__ */ new Map();
   let translator = builtinTranslator;
   let compiler = builtinCompiler;
   if (pkg && /^5\./.test(pkg.version)) {
@@ -588,16 +588,16 @@ function loadCompilerInfo(dir) {
     }
   }
   return {
-    cache: cache3,
+    cache: cache4,
     get lookup() {
-      let lookup = cache3.get(lookupKey);
+      let lookup = cache4.get(lookupKey);
       if (lookup === void 0) {
         try {
           lookup = compiler.taglib.buildLookup(dir, translator);
         } catch {
           lookup = builtinInfo.lookup;
         }
-        cache3.set(lookupKey, lookup);
+        cache4.set(lookupKey, lookup);
       }
       return lookup;
     },
@@ -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 = /^@?marko[/-]/.test(tag.taglibId) || 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.` : isCoreTag ? `Core Marko <${tag.name}> tag.` : nodeModuleName ? `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;
@@ -1020,10 +1097,10 @@ var markoErrorRegExp = /^(.+?)(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
 var doValidate = (doc) => {
   const fsPath = getDocFile(doc);
   const diagnostics = [];
-  const { compiler, translator, cache: cache3 } = getCompilerInfo(doc);
+  const { compiler, translator, cache: cache4 } = getCompilerInfo(doc);
   try {
     compiler.compileSync(doc.getText(), fsPath || "untitled.marko", {
-      cache: cache3,
+      cache: cache4,
       translator,
       code: false,
       output: "source",
@@ -1041,6 +1118,62 @@ var doValidate = (doc) => {
   return diagnostics;
 };
 
+// src/utils/utils.ts
+import fs2 from "fs";
+import { URI as URI3 } from "vscode-uri";
+import { Position, Range as Range4 } from "vscode-languageserver";
+import { TextDocument } from "vscode-languageserver-textdocument";
+var START_OF_FILE = Range4.create(Position.create(0, 0), Position.create(0, 0));
+function createTextDocument(filename) {
+  const uri = URI3.file(filename).toString();
+  const content = fs2.readFileSync(filename, "utf-8");
+  return TextDocument.create(uri, "plaintext", 0, content);
+}
+
+// src/service/marko/hover/OpenTagName.ts
+function OpenTagName2({
+  document,
+  lookup,
+  parsed,
+  node
+}) {
+  const importer = getDocFile(document);
+  const tag = node.parent;
+  const range = parsed.locationAt(node);
+  const tagDef = tag.nameText && lookup.getTag(tag.nameText);
+  if (tagDef) {
+    const completion = getTagNameCompletion({
+      tag: tagDef,
+      range: START_OF_FILE,
+      importer
+    });
+    return {
+      range,
+      contents: completion.documentation
+    };
+  }
+}
+
+// src/service/marko/hover/index.ts
+var handlers2 = {
+  OpenTagName: OpenTagName2
+};
+var doHover = async (doc, params) => {
+  var _a;
+  const parsed = parse2(doc);
+  const offset = doc.offsetAt(params.position);
+  const node = parsed.nodeAt(offset);
+  return await ((_a = handlers2[NodeType[node.type]]) == null ? void 0 : _a.call(handlers2, {
+    document: doc,
+    params,
+    parsed,
+    offset,
+    node,
+    code: doc.getText(),
+    ...getCompilerInfo(doc)
+  }));
+};
+
 // src/service/marko/definition/OpenTagName.ts
 import path4 from "path";
 import { URI as URI4 } from "vscode-uri";
@@ -1070,20 +1203,8 @@ function escape(val) {
   return String(val).replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
 }
 
-// src/utils/utils.ts
-import fs2 from "fs";
-import { URI as URI3 } from "vscode-uri";
-import { Position, Range as Range4 } from "vscode-languageserver";
-import { TextDocument } from "vscode-languageserver-textdocument";
-var START_OF_FILE = Range4.create(Position.create(0, 0), Position.create(0, 0));
-function createTextDocument(filename) {
-  const uri = URI3.file(filename).toString();
-  const content = fs2.readFileSync(filename, "utf-8");
-  return TextDocument.create(uri, "plaintext", 0, content);
-}
-
 // src/service/marko/definition/OpenTagName.ts
-function OpenTagName2({
+function OpenTagName3({
   lookup,
   parsed,
   node
@@ -1153,8 +1274,8 @@ function AttrName2({
 }
 
 // src/service/marko/definition/index.ts
-var handlers2 = {
-  OpenTagName: OpenTagName2,
+var handlers3 = {
+  OpenTagName: OpenTagName3,
   AttrName: AttrName2
 };
 var findDefinition = async (doc, params) => {
@@ -1162,7 +1283,7 @@ var findDefinition = async (doc, params) => {
   const parsed = parse2(doc);
   const offset = doc.offsetAt(params.position);
   const node = parsed.nodeAt(offset);
-  return await ((_a = handlers2[NodeType[node.type]]) == null ? void 0 : _a.call(handlers2, {
+  return await ((_a = handlers3[NodeType[node.type]]) == null ? void 0 : _a.call(handlers3, {
     document: doc,
     params,
     parsed,
@@ -1173,10 +1294,20 @@ var findDefinition = async (doc, params) => {
   })) || [];
 };
 
-// src/service/marko/document-links/extract.ts
+// src/service/marko/document-links.ts
 import { DocumentLink } from "vscode-languageserver";
 import { URI as URI6 } from "vscode-uri";
-var importTagReg = /(['"])<((?:[^\1\\>]+|\\.)*)>?\1/g;
+var importTagReg2 = /(['"])<((?:[^\1\\>]+|\\.)*)>?\1/g;
+var cache = /* @__PURE__ */ new WeakMap();
+var findDocumentLinks = async (doc) => {
+  const parsed = parse2(doc);
+  let result = cache.get(parsed);
+  if (!result) {
+    result = extractDocumentLinks(doc, parsed, getCompilerInfo(doc).lookup);
+    cache.set(parsed, result);
+  }
+  return result;
+};
 function extractDocumentLinks(doc, parsed, lookup) {
   if (URI6.parse(doc.uri).scheme === "untitled") {
     return [];
@@ -1187,14 +1318,21 @@ function extractDocumentLinks(doc, parsed, lookup) {
   const read = (range) => code.slice(range.start, range.end);
   const visit = (node) => {
     switch (node.type) {
+      case 14 /* AttrTag */:
+        if (node.body) {
+          for (const child of node.body) {
+            visit(child);
+          }
+        }
+        break;
       case 1 /* Tag */:
         if (node.attrs && node.nameText) {
           for (const attr of node.attrs) {
             if (isDocumentLinkAttr(doc, node, attr)) {
-              links.push(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)));
+              const resolved = resolveUrl(read(attr.value.value).slice(1, -1), doc.uri);
+              if (resolved) {
+                links.push(DocumentLink.create(parsed.locationAt(attr.value.value), resolveUrl(read(attr.value.value).slice(1, -1), doc.uri)));
+              }
             }
           }
         }
@@ -1208,18 +1346,18 @@ 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(DocumentLink.create({
-            start: parsed.positionAt(item.start + match.index),
-            end: parsed.positionAt(item.start + match.index + length)
-          }, fileForTag));
+          links.push(DocumentLink.create(parsed.locationAt({
+            start: item.start + match.index,
+            end: item.start + match.index + length
+          }), fileForTag));
         }
       }
     }
@@ -1230,26 +1368,53 @@ function extractDocumentLinks(doc, parsed, lookup) {
   return links;
 }
 
-// src/service/marko/document-links/index.ts
-var cache = /* @__PURE__ */ new WeakMap();
-var findDocumentLinks = async (doc) => {
+// src/service/marko/document-symbols.ts
+import { URI as URI7 } from "vscode-uri";
+import { SymbolInformation, SymbolKind } from "vscode-languageserver";
+var cache2 = /* @__PURE__ */ new WeakMap();
+var findDocumentSymbols = async (doc) => {
   const parsed = parse2(doc);
-  let result = cache.get(parsed);
+  let result = cache2.get(parsed);
   if (!result) {
-    result = extractDocumentLinks(doc, parsed, getCompilerInfo(doc).lookup);
-    cache.set(parsed, result);
+    result = extractDocumentSymbols(doc, parsed, getCompilerInfo(doc).lookup);
+    cache2.set(parsed, result);
   }
   return result;
 };
+function extractDocumentSymbols(doc, parsed, lookup) {
+  if (URI7.parse(doc.uri).scheme === "untitled") {
+    return [];
+  }
+  const symbols = [];
+  const { program } = parsed;
+  const visit = (node) => {
+    var _a, _b;
+    switch (node.type) {
+      case 1 /* Tag */:
+      case 14 /* AttrTag */:
+        symbols.push(SymbolInformation.create((node.type === 14 /* AttrTag */ ? (_a = node.nameText) == null ? void 0 : _a.slice(node.nameText.indexOf("@")) : node.nameText) || "<${...}>", node.nameText && ((_b = lookup.getTag(node.nameText)) == null ? void 0 : _b.html) && SymbolKind.Property || SymbolKind.Class, parsed.locationAt(node), doc.uri));
+        if (node.body) {
+          for (const child of node.body) {
+            visit(child);
+          }
+        }
+        break;
+    }
+  };
+  for (const item of program.body) {
+    visit(item);
+  }
+  return symbols;
+}
 
 // src/service/marko/format.ts
-import { Range as Range7, TextEdit as TextEdit5 } from "vscode-languageserver";
-import { URI as URI7 } from "vscode-uri";
+import { Range as Range7, TextEdit as TextEdit6 } from "vscode-languageserver";
+import { URI as URI8 } from "vscode-uri";
 import * as prettier from "prettier";
 import * as markoPrettier from "prettier-plugin-marko";
 var format2 = async (doc, params, cancel) => {
   try {
-    const { fsPath, scheme } = URI7.parse(doc.uri);
+    const { fsPath, scheme } = URI8.parse(doc.uri);
     const text = doc.getText();
     const options = {
       parser: "marko",
@@ -1264,7 +1429,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);
@@ -1275,8 +1440,10 @@ var format2 = async (doc, params, cancel) => {
 var marko_default = {
   doComplete,
   doValidate,
+  doHover,
   findDefinition,
   findDocumentLinks,
+  findDocumentSymbols,
   format: format2
 };
 
@@ -1395,6 +1562,13 @@ function extractStyleSheets(code, program, lookup) {
   const visit = (node) => {
     var _a, _b;
     switch (node.type) {
+      case 14 /* AttrTag */:
+        if (node.body) {
+          for (const child of node.body) {
+            visit(child);
+          }
+        }
+        break;
       case 1 /* Tag */:
         if (node.nameText === "style" && node.concise && node.attrs) {
           const block = node.attrs.at(-1);
@@ -1451,7 +1625,7 @@ function extractStyleSheets(code, program, lookup) {
 }
 
 // src/service/stylesheet/index.ts
-var cache2 = /* @__PURE__ */ new WeakMap();
+var cache3 = /* @__PURE__ */ new WeakMap();
 var services = {
   css: getCSSLanguageService,
   less: getLESSLanguageService,
@@ -1539,6 +1713,32 @@ var StyleSheetService = {
       return result.length ? result : void 0;
     }
   },
+  findDocumentSymbols(doc) {
+    const infoByExt = getStyleSheetInfo(doc);
+    const result = [];
+    for (const ext in infoByExt) {
+      const info = infoByExt[ext];
+      const { service: service2, virtualDoc } = info;
+      for (const symbol of service2.findDocumentSymbols(virtualDoc, info.parsed)) {
+        if (symbol.location.uri === doc.uri) {
+          const range = getSourceRange(doc, info, symbol.location.range);
+          if (range) {
+            result.push({
+              kind: symbol.kind,
+              name: symbol.name,
+              tags: symbol.tags,
+              deprecated: symbol.deprecated,
+              containerName: symbol.containerName,
+              location: { uri: doc.uri, range }
+            });
+          }
+        } else {
+          result.push(symbol);
+        }
+      }
+    }
+    return result.length ? result : void 0;
+  },
   async findDocumentLinks(doc) {
     const infoByExt = getStyleSheetInfo(doc);
     const result = [];
@@ -1778,7 +1978,7 @@ function getSourceRange(doc, info, range) {
 function getStyleSheetInfo(doc) {
   var _a;
   const parsed = parse2(doc);
-  let cached = cache2.get(parsed);
+  let cached = cache3.get(parsed);
   if (!cached) {
     const results = extractStyleSheets(doc.getText(), parsed.program, getCompilerInfo(doc).lookup);
     cached = {};
@@ -1799,7 +1999,7 @@ function getStyleSheetInfo(doc) {
         parsed: service2.parseStylesheet(virtualDoc)
       };
     }
-    cache2.set(parsed, cached);
+    cache3.set(parsed, cached);
   }
   return cached;
 }
@@ -1817,51 +2017,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 +2067,33 @@ 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);
+    }
+    return result;
+  },
+  async findDocumentSymbols(doc, params, cancel) {
+    let result;
+    try {
+      for (const pending of plugins.map((plugin) => {
+        var _a;
+        return (_a = plugin.findDocumentSymbols) == null ? void 0 : _a.call(plugin, doc, params, cancel);
+      })) {
+        const cur = await pending;
+        if (cancel.isCancellationRequested)
+          return;
+        if (cur)
+          result = result ? result.concat(cur) : cur;
       }
     } catch (err) {
       displayError(err);
@@ -1895,21 +2103,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 +2121,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 +2139,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 +2157,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 +2191,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 +2232,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 +2250,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);
@@ -2128,6 +2300,7 @@ connection2.onInitialize(async (params) => {
       documentLinkProvider: { resolveProvider: false },
       colorProvider: true,
       documentHighlightProvider: true,
+      documentSymbolProvider: true,
       completionProvider: {
         triggerCharacters: [
           ".",
@@ -2173,6 +2346,9 @@ connection2.onReferences(async (params, cancel) => {
 connection2.onDocumentLinks(async (params, cancel) => {
   return await service.findDocumentLinks(documents.get(params.textDocument.uri), params, cancel) || null;
 });
+connection2.onDocumentSymbol(async (params, cancel) => {
+  return await service.findDocumentSymbols(documents.get(params.textDocument.uri), params, cancel) || null;
+});
 connection2.onDocumentHighlight(async (params, cancel) => {
   return await service.findDocumentHighlights(documents.get(params.textDocument.uri), params, cancel) || null;
 });