@marko/language-server 0.12.6 → 0.12.7

package/dist/index.mjs

@@ -17,7 +17,6 @@ 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";
@@ -558,29 +557,14 @@ function getCompilerInfo(doc) {
   }
   return info;
 }
-function setup(connection3, documents2) {
-  connection3.onDidChangeWatchedFiles(() => {
-    clearAllCaches();
-  });
-  documents2.onDidChangeContent(({ document }) => {
-    if (document.version > 1) {
-      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 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) {
@@ -625,7 +609,7 @@ function loadCompilerInfo(dir) {
 // src/utils/messages.ts
 import { inspect } from "util";
 var connection;
-function setup2(_) {
+function setup(_) {
   connection = _;
 }
 function displayError(data) {
@@ -692,7 +676,7 @@ ${closingTagStr}`
 
 // src/service/marko/complete/OpenTagName.ts
 import path2 from "path";
-import { URI as URI3 } from "vscode-uri";
+import { URI as URI2 } from "vscode-uri";
 import {
   CompletionItemKind as CompletionItemKind2,
   InsertTextFormat as InsertTextFormat2,
@@ -721,7 +705,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 = URI3.file(fileForTag).toString();
+    const fileURIForTag = URI2.file(fileForTag).toString();
     const nodeModuleMatch = /\/node_modules\/((?:@[^/]+\/)?[^/]+)/.exec(fileForTag);
     const nodeModuleName = nodeModuleMatch && nodeModuleMatch[1];
     const isCoreTag = nodeModuleName === "marko";
@@ -904,9 +888,10 @@ var doValidate = (doc) => {
   try {
     compiler.compileSync(doc.getText(), fsPath || "untitled.marko", {
       cache: cache2,
-      output: "source",
+      translator,
       code: false,
-      translator
+      output: "source",
+      sourceMaps: false
     });
   } catch (e) {
     let match;
@@ -922,7 +907,7 @@ var doValidate = (doc) => {
 
 // src/service/marko/definition/OpenTagName.ts
 import path3 from "path";
-import { URI as URI5 } from "vscode-uri";
+import { URI as URI4 } from "vscode-uri";
 import { Range as Range4, LocationLink } from "vscode-languageserver";
 
 // src/utils/regexp-builder.ts
@@ -951,12 +936,12 @@ function escape(val) {
 
 // src/utils/utils.ts
 import fs from "fs";
-import { URI as URI4 } from "vscode-uri";
+import { URI as URI3 } from "vscode-uri";
 import { Position, Range as Range3 } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
 var START_OF_FILE = Range3.create(Position.create(0, 0), Position.create(0, 0));
 function createTextDocument(filename) {
-  const uri = URI4.file(filename).toString();
+  const uri = URI3.file(filename).toString();
   const content = fs.readFileSync(filename, "utf-8");
   return TextDocument.create(uri, "plaintext", 0, content);
 }
@@ -993,12 +978,12 @@ function OpenTagName2({
     }
   }
   return [
-    LocationLink.create(URI5.file(tagEntryFile).toString(), range, range, parsed.locationAt(node))
+    LocationLink.create(URI4.file(tagEntryFile).toString(), range, range, parsed.locationAt(node))
   ];
 }
 
 // src/service/marko/definition/AttrName.ts
-import { URI as URI6 } from "vscode-uri";
+import { URI as URI5 } from "vscode-uri";
 import { Range as Range5, LocationLink as LocationLink2 } from "vscode-languageserver";
 function AttrName2({
   lookup,
@@ -1027,7 +1012,7 @@ function AttrName2({
     }
   }
   return [
-    LocationLink2.create(URI6.file(attrEntryFile).toString(), range, range, parsed.locationAt(node))
+    LocationLink2.create(URI5.file(attrEntryFile).toString(), range, range, parsed.locationAt(node))
   ];
 }
 
@@ -1054,7 +1039,7 @@ var findDefinition = async (doc, params) => {
 
 // src/service/marko/format.ts
 import { Position as Position2, Range as Range6, TextEdit as TextEdit4 } from "vscode-languageserver";
-import { URI as URI7 } from "vscode-uri";
+import { URI as URI6 } from "vscode-uri";
 import * as prettier from "prettier";
 import * as markoPrettier from "prettier-plugin-marko";
 var NO_EDIT = [
@@ -1062,7 +1047,7 @@ var NO_EDIT = [
 ];
 var format2 = async (doc, params, token) => {
   try {
-    const { fsPath, scheme } = URI7.parse(doc.uri);
+    const { fsPath, scheme } = URI6.parse(doc.uri);
     const text = doc.getText();
     const options = {
       parser: "marko",
@@ -1482,8 +1467,9 @@ if (typeof __require !== "undefined" && __require.extensions && !(".ts" in __req
 }
 var documents = new TextDocuments(TextDocument3);
 var connection2 = createConnection(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) => inspect2(v)).join(" "));
 };
@@ -1493,8 +1479,7 @@ 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: TextDocumentSyncKind.Incremental,
@@ -1527,11 +1512,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;
@@ -1545,21 +1531,38 @@ connection2.onHover(async (params, cancel) => {
 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 && 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 (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();