@marko/language-server 0.12.12 → 0.12.13

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;
     },
@@ -697,10 +697,10 @@ function getTagNameCompletion({
   const fileURIForTag = URI2.file(fileForTag).toString();
   const nodeModuleMatch = /\/node_modules\/((?:@[^/]+\/)?[^/]+)/.exec(fileForTag);
   const nodeModuleName = nodeModuleMatch && nodeModuleMatch[1];
-  const isCoreTag = nodeModuleName === "marko";
+  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.` : nodeModuleName ? isCoreTag ? `Core Marko [<${tag.name}>](${fileURIForTag}) tag.` : `Custom Marko tag discovered from the ["${nodeModuleName}"](${fileURIForTag}) npm package.` : `Custom Marko tag discovered from:
+    value: tag.html ? `Built in [&lt;${tag.name}&gt;](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/${tag.name}) HTML tag.` : isCoreTag ? `Core Marko &lt;${tag.name}&gt; tag.` : nodeModuleName ? `Custom Marko tag discovered from the ["${nodeModuleName}"](${fileURIForTag}) npm package.` : `Custom Marko tag discovered from:
 
 [${importer ? path2.relative(importer, fileForTag) : fileForTag}](${fileURIForTag})`
   };
@@ -1097,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",
@@ -1118,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";
@@ -1147,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
@@ -1230,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) => {
@@ -1239,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,
@@ -1264,14 +1308,18 @@ 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)));
+              links.push(DocumentLink.create(parsed.locationAt(attr.value.value), resolveUrl(read(attr.value.value).slice(1, -1), doc.uri)));
             }
           }
         }
@@ -1293,10 +1341,10 @@ function extractDocumentLinks(doc, parsed, lookup) {
         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));
         }
       }
     }
@@ -1319,14 +1367,55 @@ var findDocumentLinks = async (doc) => {
   return result;
 };
 
+// src/service/marko/document-symbols/extract.ts
+import { URI as URI7 } from "vscode-uri";
+import { SymbolInformation, SymbolKind } from "vscode-languageserver";
+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/document-symbols/index.ts
+var cache2 = /* @__PURE__ */ new WeakMap();
+var findDocumentSymbols = async (doc) => {
+  const parsed = parse2(doc);
+  let result = cache2.get(parsed);
+  if (!result) {
+    result = extractDocumentSymbols(doc, parsed, getCompilerInfo(doc).lookup);
+    cache2.set(parsed, result);
+  }
+  return result;
+};
+
 // src/service/marko/format.ts
 import { Range as Range7, TextEdit as TextEdit6 } from "vscode-languageserver";
-import { URI as URI7 } from "vscode-uri";
+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",
@@ -1352,8 +1441,10 @@ var format2 = async (doc, params, cancel) => {
 var marko_default = {
   doComplete,
   doValidate,
+  doHover,
   findDefinition,
   findDocumentLinks,
+  findDocumentSymbols,
   format: format2
 };
 
@@ -1472,6 +1563,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);
@@ -1528,7 +1626,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,
@@ -1616,6 +1714,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 = [];
@@ -1855,7 +1979,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 = {};
@@ -1876,7 +2000,7 @@ function getStyleSheetInfo(doc) {
         parsed: service2.parseStylesheet(virtualDoc)
       };
     }
-    cache2.set(parsed, cached);
+    cache3.set(parsed, cached);
   }
   return cached;
 }
@@ -1959,6 +2083,24 @@ var service = {
     }
     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);
+    }
+    return result;
+  },
   async findDocumentLinks(doc, params, cancel) {
     let result;
     try {
@@ -2159,6 +2301,7 @@ connection2.onInitialize(async (params) => {
       documentLinkProvider: { resolveProvider: false },
       colorProvider: true,
       documentHighlightProvider: true,
+      documentSymbolProvider: true,
       completionProvider: {
         triggerCharacters: [
           ".",
@@ -2204,6 +2347,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;
 });