@marko/language-server 0.12.4 → 0.12.7

package/dist/index.js

@@ -30,7 +30,8 @@ var builtinTranslator = __toESM(require("@marko/translator-default"));
 var import_path = __toESM(require("path"));
 var import_vscode_uri = require("vscode-uri");
 function getDocDir(doc) {
-  return import_path.default.dirname(getDocFile(doc));
+  const filename = getDocFile(doc);
+  return filename ? import_path.default.dirname(filename) : void 0;
 }
 function getDocFile(doc) {
   return import_vscode_uri.URI.parse(doc.uri).fsPath;
@@ -533,6 +534,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);
@@ -545,6 +552,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);
@@ -552,25 +561,14 @@ function getCompilerInfo(doc) {
   }
   return info;
 }
-function setup(connection3, documents2) {
-  connection3.onDidChangeWatchedFiles(() => {
-    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);
-      } else if (/[./\\]marko(?:-tag)?\.json$/.test(document.uri)) {
-        clearAllCaches();
-      }
+function clearCompilerCache(doc) {
+  if (doc) {
+    getCompilerInfo(doc).cache.delete(doc);
+  } else {
+    for (const [, info] of compilerInfoByDir) {
+      info.cache.clear();
+      info.compiler.taglib.clearCaches();
     }
-  });
-}
-function clearAllCaches() {
-  for (const [, info] of compilerInfoByDir) {
-    info.cache.clear();
-    info.compiler.taglib.clearCaches();
   }
 }
 function loadCompilerInfo(dir) {
@@ -601,7 +599,7 @@ function loadCompilerInfo(dir) {
         try {
           lookup = compiler.taglib.buildLookup(dir, translator);
         } catch {
-          lookup = null;
+          lookup = builtinInfo.lookup;
         }
         cache2.set(lookupKey, lookup);
       }
@@ -615,7 +613,7 @@ function loadCompilerInfo(dir) {
 // src/utils/messages.ts
 var import_util = require("util");
 var connection;
-function setup2(_) {
+function setup(_) {
   connection = _;
 }
 function displayError(data) {
@@ -682,8 +680,6 @@ function OpenTagName({
   parsed,
   node
 }) {
-  if (!lookup)
-    return;
   const currentTemplateFilePath = getDocFile(document);
   const tag = node.parent;
   const tagNameLocation = parsed.locationAt(node);
@@ -708,7 +704,7 @@ function OpenTagName({
       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:
 
-[${import_path2.default.relative(currentTemplateFilePath, fileForTag)}](${fileURIForTag})`
+[${currentTemplateFilePath ? import_path2.default.relative(currentTemplateFilePath, fileForTag) : currentTemplateFilePath}](${fileURIForTag})`
     };
     if (it.description) {
       documentation.value += `
@@ -772,8 +768,6 @@ function AttrName({
       name = name.slice(0, modifierIndex);
     }
   }
-  if (!lookup)
-    return;
   const completions = [];
   const attrNameLoc = parsed.locationAt(hasModifier ? {
     start: node.start,
@@ -871,31 +865,27 @@ var doComplete = async (doc, params) => {
 };
 
 // src/service/marko/validate.ts
-var import_vscode_uri3 = require("vscode-uri");
 var import_vscode_languageserver5 = require("vscode-languageserver");
 var markoErrorRegExp = /^(.+?)(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
 var doValidate = (doc) => {
-  const { fsPath, scheme } = import_vscode_uri3.URI.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(import_vscode_languageserver5.Diagnostic.create(import_vscode_languageserver5.Range.create(line, col, line, col), msg, import_vscode_languageserver5.DiagnosticSeverity.Error, void 0, fileName));
-        }
-      }
+  const { compiler, translator, cache: cache2 } = getCompilerInfo(doc);
+  try {
+    compiler.compileSync(doc.getText(), fsPath || "untitled.marko", {
+      cache: cache2,
+      translator,
+      code: false,
+      output: "source",
+      sourceMaps: false
+    });
+  } 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(import_vscode_languageserver5.Diagnostic.create(import_vscode_languageserver5.Range.create(line, col, line, col), msg, import_vscode_languageserver5.DiagnosticSeverity.Error, void 0, fileName));
     }
   }
   return diagnostics;
@@ -903,7 +893,7 @@ var doValidate = (doc) => {
 
 // src/service/marko/definition/OpenTagName.ts
 var import_path3 = __toESM(require("path"));
-var import_vscode_uri5 = require("vscode-uri");
+var import_vscode_uri4 = require("vscode-uri");
 var import_vscode_languageserver7 = require("vscode-languageserver");
 
 // src/utils/regexp-builder.ts
@@ -932,12 +922,12 @@ function escape(val) {
 
 // src/utils/utils.ts
 var import_fs = __toESM(require("fs"));
-var import_vscode_uri4 = require("vscode-uri");
+var import_vscode_uri3 = require("vscode-uri");
 var import_vscode_languageserver6 = require("vscode-languageserver");
 var import_vscode_languageserver_textdocument = require("vscode-languageserver-textdocument");
 var START_OF_FILE = import_vscode_languageserver6.Range.create(import_vscode_languageserver6.Position.create(0, 0), import_vscode_languageserver6.Position.create(0, 0));
 function createTextDocument(filename) {
-  const uri = import_vscode_uri4.URI.file(filename).toString();
+  const uri = import_vscode_uri3.URI.file(filename).toString();
   const content = import_fs.default.readFileSync(filename, "utf-8");
   return import_vscode_languageserver_textdocument.TextDocument.create(uri, "plaintext", 0, content);
 }
@@ -948,8 +938,6 @@ function OpenTagName2({
   parsed,
   node
 }) {
-  if (!lookup)
-    return;
   const tag = node.parent;
   let tagDef;
   let range = START_OF_FILE;
@@ -976,20 +964,18 @@ function OpenTagName2({
     }
   }
   return [
-    import_vscode_languageserver7.LocationLink.create(import_vscode_uri5.URI.file(tagEntryFile).toString(), range, range, parsed.locationAt(node))
+    import_vscode_languageserver7.LocationLink.create(import_vscode_uri4.URI.file(tagEntryFile).toString(), range, range, parsed.locationAt(node))
   ];
 }
 
 // src/service/marko/definition/AttrName.ts
-var import_vscode_uri6 = require("vscode-uri");
+var import_vscode_uri5 = require("vscode-uri");
 var import_vscode_languageserver8 = require("vscode-languageserver");
 function AttrName2({
   lookup,
   parsed,
   node
 }) {
-  if (!lookup)
-    return;
   const tagName = node.parent.parent.nameText;
   const attrName = parsed.read(node);
   if (attrName[0] === "{")
@@ -1012,7 +998,7 @@ function AttrName2({
     }
   }
   return [
-    import_vscode_languageserver8.LocationLink.create(import_vscode_uri6.URI.file(attrEntryFile).toString(), range, range, parsed.locationAt(node))
+    import_vscode_languageserver8.LocationLink.create(import_vscode_uri5.URI.file(attrEntryFile).toString(), range, range, parsed.locationAt(node))
   ];
 }
 
@@ -1039,7 +1025,7 @@ var findDefinition = async (doc, params) => {
 
 // src/service/marko/format.ts
 var import_vscode_languageserver9 = require("vscode-languageserver");
-var import_vscode_uri7 = require("vscode-uri");
+var import_vscode_uri6 = require("vscode-uri");
 var prettier = __toESM(require("prettier"));
 var markoPrettier = __toESM(require("prettier-plugin-marko"));
 var NO_EDIT = [
@@ -1047,7 +1033,7 @@ var NO_EDIT = [
 ];
 var format2 = async (doc, params, token) => {
   try {
-    const { fsPath, scheme } = import_vscode_uri7.URI.parse(doc.uri);
+    const { fsPath, scheme } = import_vscode_uri6.URI.parse(doc.uri);
     const text = doc.getText();
     const options = {
       parser: "marko",
@@ -1255,7 +1241,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) {
@@ -1294,13 +1280,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 = [];
@@ -1406,6 +1407,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 {
@@ -1432,8 +1447,9 @@ if (typeof require !== "undefined" && require.extensions && !(".ts" in require.e
 }
 var documents = new import_node.TextDocuments(import_vscode_languageserver_textdocument3.TextDocument);
 var connection2 = (0, import_node.createConnection)(import_node.ProposedFeatures.all);
-var prevDiagnostics = /* @__PURE__ */ new WeakMap();
-var diagnosticTimeouts = /* @__PURE__ */ new WeakMap();
+var prevDiags = /* @__PURE__ */ new WeakMap();
+var pendingDiags = /* @__PURE__ */ new WeakSet();
+var diagnosticTimeout;
 console.log = (...args) => {
   connection2.console.log(args.map((v) => (0, import_util2.inspect)(v)).join(" "));
 };
@@ -1443,13 +1459,13 @@ console.error = (...args) => {
 process.on("uncaughtException", console.error);
 process.on("unhandledRejection", console.error);
 connection2.onInitialize(() => {
-  setup2(connection2);
-  setup(connection2, documents);
+  setup(connection2);
   return {
     capabilities: {
       textDocumentSync: import_node.TextDocumentSyncKind.Incremental,
       documentFormattingProvider: true,
       definitionProvider: true,
+      hoverProvider: true,
       completionProvider: {
         triggerCharacters: [
           ".",
@@ -1476,11 +1492,12 @@ connection2.onInitialize(() => {
     }
   };
 });
-connection2.onInitialized(() => {
-  documents.all().forEach((doc) => queueValidation(doc));
-});
-documents.onDidChangeContent((change) => {
-  queueValidation(change.document);
+connection2.onDidChangeConfiguration(validateDocs);
+connection2.onDidChangeWatchedFiles(validateDocs);
+documents.onDidChangeContent(({ document }) => {
+  queueDiagnostic();
+  pendingDiags.add(document);
+  clearCompilerCache(document);
 });
 connection2.onCompletion(async (params, cancel) => {
   return await service.doComplete(documents.get(params.textDocument.uri), params, cancel) || null;
@@ -1488,24 +1505,44 @@ 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;
 });
-function queueValidation(doc) {
-  clearTimeout(diagnosticTimeouts.get(doc));
-  const id = setTimeout(async () => {
-    const prevDiag = prevDiagnostics.get(doc);
-    const nextDiag = await service.doValidate(doc) || [];
-    if (diagnosticTimeouts.get(doc) !== id || prevDiag && (0, import_util2.isDeepStrictEqual)(prevDiag, nextDiag)) {
-      return;
+function validateDocs() {
+  queueDiagnostic();
+  clearCompilerCache();
+  for (const doc of documents.all()) {
+    pendingDiags.add(doc);
+  }
+}
+function queueDiagnostic() {
+  clearTimeout(diagnosticTimeout);
+  const id = diagnosticTimeout = setTimeout(async () => {
+    const results = await Promise.all(documents.all().map(async (doc) => {
+      if (!pendingDiags.delete(doc))
+        return;
+      const prevDiag = prevDiags.get(doc) || [];
+      const nextDiag = await service.doValidate(doc) || [];
+      if ((0, import_util2.isDeepStrictEqual)(prevDiag, nextDiag))
+        return;
+      return [doc, nextDiag];
+    }));
+    if (id === diagnosticTimeout) {
+      for (const result of results) {
+        if (result) {
+          const [doc, diag] = result;
+          prevDiags.set(doc, diag);
+          connection2.sendDiagnostics({
+            uri: doc.uri,
+            diagnostics: diag
+          });
+        }
+      }
     }
-    prevDiagnostics.set(doc, nextDiag);
-    connection2.sendDiagnostics({
-      uri: doc.uri,
-      diagnostics: nextDiag
-    });
   }, 400);
-  diagnosticTimeouts.set(doc, id);
 }
 documents.listen(connection2);
 connection2.listen();