@marko/language-server 0.12.4 → 0.12.5

package/dist/index.mjs

@@ -18,6 +18,7 @@ import { TextDocument as TextDocument3 } from "vscode-languageserver-textdocumen
 import { inspect as inspect2, isDeepStrictEqual } from "util";
 
 // src/utils/compiler.ts
+import { URI as URI2 } from "vscode-uri";
 import resolveFrom from "resolve-from";
 import lassoPackageRoot from "lasso-package-root";
 import * as builtinCompiler from "@marko/compiler";
@@ -27,7 +28,8 @@ import * as builtinTranslator from "@marko/translator-default";
 import path from "path";
 import { URI } from "vscode-uri";
 function getDocDir(doc) {
-  return path.dirname(getDocFile(doc));
+  const filename = getDocFile(doc);
+  return filename ? path.dirname(filename) : void 0;
 }
 function getDocFile(doc) {
   return URI.parse(doc.uri).fsPath;
@@ -530,6 +532,12 @@ function isTransparentTag(node) {
 // src/utils/compiler.ts
 var lookupKey = Symbol("lookup");
 var compilerInfoByDir = /* @__PURE__ */ new Map();
+var builtinInfo = {
+  cache: /* @__PURE__ */ new Map(),
+  lookup: builtinCompiler.taglib.buildLookup(__dirname, builtinTranslator),
+  compiler: builtinCompiler,
+  translator: builtinTranslator
+};
 builtinCompiler.configure({ translator: builtinTranslator });
 function parse2(doc) {
   const compilerInfo = getCompilerInfo(doc);
@@ -542,6 +550,8 @@ function parse2(doc) {
 }
 function getCompilerInfo(doc) {
   const dir = getDocDir(doc);
+  if (!dir)
+    return builtinInfo;
   let info = compilerInfoByDir.get(dir);
   if (!info) {
     info = loadCompilerInfo(dir);
@@ -554,15 +564,19 @@ function setup(connection3, documents2) {
     clearAllCaches();
   });
   documents2.onDidChangeContent(({ document }) => {
-    var _a;
     if (document.version > 1) {
-      if (document.uri.endsWith(".marko")) {
-        (_a = getCompilerInfo(document)) == null ? void 0 : _a.cache.delete(document);
+      if (document.languageId === "marko") {
+        getCompilerInfo(document).cache.delete(document);
       } else if (/[./\\]marko(?:-tag)?\.json$/.test(document.uri)) {
         clearAllCaches();
       }
     }
   });
+  documents2.onDidClose(({ document }) => {
+    if (document.languageId === "marko" && URI2.parse(document.uri).scheme !== "file") {
+      getCompilerInfo(document).cache.delete(document);
+    }
+  });
 }
 function clearAllCaches() {
   for (const [, info] of compilerInfoByDir) {
@@ -598,7 +612,7 @@ function loadCompilerInfo(dir) {
         try {
           lookup = compiler.taglib.buildLookup(dir, translator);
         } catch {
-          lookup = null;
+          lookup = builtinInfo.lookup;
         }
         cache2.set(lookupKey, lookup);
       }
@@ -679,7 +693,7 @@ ${closingTagStr}`
 
 // src/service/marko/complete/OpenTagName.ts
 import path2 from "path";
-import { URI as URI2 } from "vscode-uri";
+import { URI as URI3 } from "vscode-uri";
 import {
   CompletionItemKind as CompletionItemKind2,
   InsertTextFormat as InsertTextFormat2,
@@ -692,8 +706,6 @@ function OpenTagName({
   parsed,
   node
 }) {
-  if (!lookup)
-    return;
   const currentTemplateFilePath = getDocFile(document);
   const tag = node.parent;
   const tagNameLocation = parsed.locationAt(node);
@@ -710,7 +722,7 @@ function OpenTagName({
   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 fileURIForTag = URI3.file(fileForTag).toString();
     const nodeModuleMatch = /\/node_modules\/((?:@[^/]+\/)?[^/]+)/.exec(fileForTag);
     const nodeModuleName = nodeModuleMatch && nodeModuleMatch[1];
     const isCoreTag = nodeModuleName === "marko";
@@ -718,7 +730,7 @@ function OpenTagName({
       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:
 
-[${path2.relative(currentTemplateFilePath, fileForTag)}](${fileURIForTag})`
+[${currentTemplateFilePath ? path2.relative(currentTemplateFilePath, fileForTag) : currentTemplateFilePath}](${fileURIForTag})`
     };
     if (it.description) {
       documentation.value += `
@@ -787,8 +799,6 @@ function AttrName({
       name = name.slice(0, modifierIndex);
     }
   }
-  if (!lookup)
-    return;
   const completions = [];
   const attrNameLoc = parsed.locationAt(hasModifier ? {
     start: node.start,
@@ -886,31 +896,26 @@ var doComplete = async (doc, params) => {
 };
 
 // src/service/marko/validate.ts
-import { URI as URI3 } from "vscode-uri";
 import { Diagnostic, DiagnosticSeverity, Range as Range2 } from "vscode-languageserver";
 var markoErrorRegExp = /^(.+?)(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
 var doValidate = (doc) => {
-  const { fsPath, scheme } = URI3.parse(doc.uri);
+  const fsPath = getDocFile(doc);
   const diagnostics = [];
-  if (scheme === "file") {
-    const { compiler, translator, cache: cache2, lookup } = getCompilerInfo(doc);
-    if (lookup) {
-      try {
-        compiler.compileSync(doc.getText(), fsPath, {
-          cache: cache2,
-          output: "source",
-          code: false,
-          translator
-        });
-      } catch (e) {
-        let match;
-        while (match = markoErrorRegExp.exec(e.message)) {
-          const [, fileName, rawLine, rawCol, msg] = match;
-          const line = (parseInt(rawLine, 10) || 1) - 1;
-          const col = (parseInt(rawCol, 10) || 1) - 1;
-          diagnostics.push(Diagnostic.create(Range2.create(line, col, line, col), msg, DiagnosticSeverity.Error, void 0, fileName));
-        }
-      }
+  const { compiler, translator, cache: cache2 } = getCompilerInfo(doc);
+  try {
+    compiler.compileSync(doc.getText(), fsPath || "untitled.marko", {
+      cache: cache2,
+      output: "source",
+      code: false,
+      translator
+    });
+  } catch (e) {
+    let match;
+    while (match = markoErrorRegExp.exec(e.message)) {
+      const [, fileName, rawLine, rawCol, msg] = match;
+      const line = (parseInt(rawLine, 10) || 1) - 1;
+      const col = (parseInt(rawCol, 10) || 1) - 1;
+      diagnostics.push(Diagnostic.create(Range2.create(line, col, line, col), msg, DiagnosticSeverity.Error, void 0, fileName));
     }
   }
   return diagnostics;
@@ -963,8 +968,6 @@ function OpenTagName2({
   parsed,
   node
 }) {
-  if (!lookup)
-    return;
   const tag = node.parent;
   let tagDef;
   let range = START_OF_FILE;
@@ -1003,8 +1006,6 @@ function AttrName2({
   parsed,
   node
 }) {
-  if (!lookup)
-    return;
   const tagName = node.parent.parent.nameText;
   const attrName = parsed.read(node);
   if (attrName[0] === "{")
@@ -1276,7 +1277,7 @@ var stylesheet_default = {
       if (generatedOffset === void 0)
         continue;
       const { service: service2, virtualDoc } = info;
-      const result = service2.doComplete(virtualDoc, virtualDoc.positionAt(generatedOffset), service2.parseStylesheet(virtualDoc));
+      const result = service2.doComplete(virtualDoc, virtualDoc.positionAt(generatedOffset), info.parsed);
       for (const item of result.items) {
         if (item.additionalTextEdits) {
           for (const edit of item.additionalTextEdits) {
@@ -1315,13 +1316,28 @@ var stylesheet_default = {
       if (generatedOffset === void 0)
         continue;
       const { service: service2, virtualDoc } = info;
-      const result = service2.findDefinition(virtualDoc, virtualDoc.positionAt(generatedOffset), service2.parseStylesheet(virtualDoc));
+      const result = service2.findDefinition(virtualDoc, virtualDoc.positionAt(generatedOffset), info.parsed);
       if (result && updateRange(doc, info, result.range)) {
         return result;
       }
       break;
     }
   },
+  async doHover(doc, params) {
+    const infoByExt = getStyleSheetInfo(doc);
+    const sourceOffset = doc.offsetAt(params.position);
+    for (const ext in infoByExt) {
+      const info = infoByExt[ext];
+      const generatedOffset = info.generatedOffsetAt(sourceOffset);
+      if (generatedOffset === void 0)
+        continue;
+      const { service: service2, virtualDoc } = info;
+      const result = service2.doHover(virtualDoc, virtualDoc.positionAt(generatedOffset), service2.parseStylesheet(virtualDoc));
+      if (result && (!result.range || updateRange(doc, info, result.range))) {
+        return result;
+      }
+    }
+  },
   async doValidate(doc) {
     const infoByExt = getStyleSheetInfo(doc);
     const result = [];
@@ -1427,6 +1443,20 @@ var service = {
     }
     return result;
   },
+  async doHover(doc, params, cancel) {
+    var _a;
+    try {
+      for (const plugin of plugins) {
+        const result = await ((_a = plugin.doHover) == null ? void 0 : _a.call(plugin, doc, params, cancel));
+        if (cancel.isCancellationRequested)
+          return;
+        if (result)
+          return result;
+      }
+    } catch (err) {
+      displayError(err);
+    }
+  },
   async doValidate(doc) {
     const result = [];
     try {
@@ -1471,6 +1501,7 @@ connection2.onInitialize(() => {
       textDocumentSync: TextDocumentSyncKind.Incremental,
       documentFormattingProvider: true,
       definitionProvider: true,
+      hoverProvider: true,
       completionProvider: {
         triggerCharacters: [
           ".",
@@ -1509,6 +1540,9 @@ connection2.onCompletion(async (params, cancel) => {
 connection2.onDefinition(async (params, cancel) => {
   return await service.findDefinition(documents.get(params.textDocument.uri), params, cancel) || null;
 });
+connection2.onHover(async (params, cancel) => {
+  return await service.doHover(documents.get(params.textDocument.uri), params, cancel) || null;
+});
 connection2.onDocumentFormatting(async (params, cancel) => {
   return await service.format(documents.get(params.textDocument.uri), params, cancel) || null;
 });