@marko/language-server 2.1.28 → 2.1.30

package/dist/index.js

@@ -38,7 +38,7 @@ import_language_tools.Project.setDefaultCompilerMeta(defaultCompiler, {
 });
 
 // src/index.ts
-var import_language_tools20 = require("@marko/language-tools");
+var import_language_tools19 = require("@marko/language-tools");
 var import_util2 = require("util");
 var import_node = require("vscode-languageserver/node");
 
@@ -1664,7 +1664,6 @@ function extractDocumentSymbols({
 }
 
 // src/service/marko/format.ts
-var import_language_tools14 = require("@marko/language-tools");
 var prettier = __toESM(require("prettier"));
 var markoPrettier = __toESM(require("prettier-plugin-marko"));
 var import_vscode_languageserver8 = require("vscode-languageserver");
@@ -1697,7 +1696,6 @@ function display(type, data) {
 // src/service/marko/format.ts
 async function formatDocument(doc, formatOptions, cancel) {
   try {
-    const dir = getFSDir(doc);
     const filepath = getFSPath(doc);
     const text = doc.getText();
     const options = {
@@ -1711,7 +1709,6 @@ async function formatDocument(doc, formatOptions, cancel) {
         editorconfig: true
       }).catch(() => null) : null
     };
-    markoPrettier.setCompiler(import_language_tools14.Project.getCompiler(dir), import_language_tools14.Project.getConfig(dir));
     if (cancel?.isCancellationRequested) return;
     return [
       import_vscode_languageserver8.TextEdit.replace(
@@ -1731,7 +1728,7 @@ var format2 = async (doc, params, cancel) => {
 };
 
 // src/service/marko/hover/index.ts
-var import_language_tools15 = require("@marko/language-tools");
+var import_language_tools14 = require("@marko/language-tools");
 
 // src/service/marko/hover/OpenTagName.ts
 function OpenTagName3({
@@ -1764,7 +1761,7 @@ var doHover = async (doc, params) => {
   const file = getMarkoFile(doc);
   const offset = doc.offsetAt(params.position);
   const node = file.parsed.nodeAt(offset);
-  return await handlers3[import_language_tools15.NodeType[node.type]]?.({
+  return await handlers3[import_language_tools14.NodeType[node.type]]?.({
     file,
     params,
     offset,
@@ -1774,7 +1771,7 @@ var doHover = async (doc, params) => {
 
 // src/service/marko/validate.ts
 var import_babel_utils = require("@marko/compiler/babel-utils");
-var import_language_tools16 = require("@marko/language-tools");
+var import_language_tools15 = require("@marko/language-tools");
 var import_path6 = __toESM(require("path"));
 var import_vscode_languageserver9 = require("vscode-languageserver");
 var markoErrorRegExp = /^(.+?)\.marko(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
@@ -1800,7 +1797,7 @@ var doValidate = (doc) => {
   const filename = getFSPath(doc);
   const diagnostics = [];
   try {
-    const { meta } = import_language_tools16.Project.getCompiler(
+    const { meta } = import_language_tools15.Project.getCompiler(
       filename && import_path6.default.dirname(filename)
     ).compileSync(doc.getText(), filename || "untitled.marko", compilerConfig);
     if (meta.diagnostics) {
@@ -1937,7 +1934,7 @@ var marko_default = {
 };
 
 // src/service/script/index.ts
-var import_language_tools18 = require("@marko/language-tools");
+var import_language_tools17 = require("@marko/language-tools");
 var import_path8 = __toESM(require("path"));
 var prettier2 = __toESM(require("prettier"));
 var import_relative_import_path = require("relative-import-path");
@@ -1946,13 +1943,13 @@ var import_vscode_languageserver10 = require("vscode-languageserver");
 var import_vscode_uri6 = require("vscode-uri");
 
 // src/ts-plugin/host.ts
-var import_language_tools17 = require("@marko/language-tools");
+var import_language_tools16 = require("@marko/language-tools");
 var import_path7 = __toESM(require("path"));
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
 var importTagReg3 = /^<([^>]+)>$/;
 function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
-  const processors = import_language_tools17.Processors.create({
+  const processors = import_language_tools16.Processors.create({
     ts: ts2,
     host,
     configFile
@@ -2014,7 +2011,7 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
     host.readDirectory = (path9, extensions, exclude, include, depth) => {
       return readDirectory2(
         path9,
-        extensions?.concat(import_language_tools17.Processors.extensions),
+        extensions?.concat(import_language_tools16.Processors.extensions),
         exclude,
         include,
         depth
@@ -2032,7 +2029,7 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
         const tagNameMatch = importTagReg3.exec(moduleName);
         if (tagNameMatch) {
           const [, tagName] = tagNameMatch;
-          const tagDef = import_language_tools17.Project.getTagLookup(
+          const tagDef = import_language_tools16.Project.getTagLookup(
             import_path7.default.dirname(containingFile)
           ).getTag(tagName);
           const tagFileName = tagDef && (tagDef.template || tagDef.renderer);
@@ -2072,12 +2069,12 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
             }
           }
           if (resolvedFileName) {
-            if ((0, import_language_tools17.isDefinitionFile)(resolvedFileName)) {
+            if ((0, import_language_tools16.isDefinitionFile)(resolvedFileName)) {
               if (!host.fileExists(resolvedFileName)) {
                 resolvedFileName = void 0;
               }
             } else {
-              const ext = (0, import_language_tools17.getExt)(resolvedFileName);
+              const ext = (0, import_language_tools16.getExt)(resolvedFileName);
               const definitionFile = `${resolvedFileName.slice(
                 0,
                 -ext.length
@@ -2125,7 +2122,7 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
   }
   return host;
   function getProcessor(fileName) {
-    const ext = (0, import_language_tools17.getExt)(fileName);
+    const ext = (0, import_language_tools16.getExt)(fileName);
     return ext ? processors[ext] : void 0;
   }
 }
@@ -2361,7 +2358,7 @@ var ScriptService = {
       if (!filename) return;
       const tsProject = getTSProject(filename);
       const extracted = processScript(doc, tsProject);
-      const lang = import_language_tools18.Project.getScriptLang(
+      const lang = import_language_tools17.Project.getScriptLang(
         filename,
         tsProject.markoScriptLang,
         import_tsserverlibrary.default,
@@ -2369,10 +2366,10 @@ var ScriptService = {
       );
       const generated = extracted.toString();
       const content = await prettier2.format(generated, {
-        parser: lang === import_language_tools18.ScriptLang.ts ? "typescript" : "babel"
+        parser: lang === import_language_tools17.ScriptLang.ts ? "typescript" : "babel"
       }).catch(() => generated);
       return {
-        language: lang === import_language_tools18.ScriptLang.ts ? "typescript" : "javascript",
+        language: lang === import_language_tools17.ScriptLang.ts ? "typescript" : "javascript",
         content
       };
     }
@@ -2711,13 +2708,13 @@ ${documentation}`;
 function processScript(doc, tsProject) {
   return processDoc(doc, ({ filename, parsed, lookup, dirname }) => {
     const { host, markoScriptLang } = tsProject;
-    return (0, import_language_tools18.extractScript)({
+    return (0, import_language_tools17.extractScript)({
       ts: import_tsserverlibrary.default,
       parsed,
       lookup,
-      translator: import_language_tools18.Project.getConfig(dirname).translator,
-      scriptLang: filename ? import_language_tools18.Project.getScriptLang(filename, markoScriptLang, import_tsserverlibrary.default, host) : markoScriptLang,
-      runtimeTypesCode: import_language_tools18.Project.getTypeLibs(tsProject.rootDir, import_tsserverlibrary.default, host)?.markoTypesCode
+      translator: import_language_tools17.Project.getConfig(dirname).translator,
+      scriptLang: filename ? import_language_tools17.Project.getScriptLang(filename, markoScriptLang, import_tsserverlibrary.default, host) : markoScriptLang,
+      runtimeTypesCode: import_language_tools17.Project.getTypeLibs(tsProject.rootDir, import_tsserverlibrary.default, host)?.markoTypesCode
     });
   });
 }
@@ -2728,9 +2725,9 @@ function getInsertModuleStatementOffset(parsed) {
     let lastImport;
     for (const node of program.static) {
       switch (node.type) {
-        case import_language_tools18.NodeType.Export:
+        case import_language_tools17.NodeType.Export:
           return node.start;
-        case import_language_tools18.NodeType.Import:
+        case import_language_tools17.NodeType.Import:
           lastImport = node;
           break;
       }
@@ -2770,7 +2767,7 @@ function docLocationAtTextSpan(doc, { start, length }) {
 function getTSConfigFile(fileName) {
   let configFile;
   const docFsDir = import_path8.default.dirname(fileName);
-  const cache = import_language_tools18.Project.getCache(docFsDir);
+  const cache = import_language_tools17.Project.getCache(docFsDir);
   let configFileCache = cache.get(getTSConfigFile);
   if (configFileCache) {
     configFile = configFileCache.get(docFsDir);
@@ -2786,15 +2783,15 @@ function getTSConfigFile(fileName) {
 }
 function getTSProject(docFsPath) {
   let configFile;
-  let markoScriptLang = import_language_tools18.ScriptLang.js;
+  let markoScriptLang = import_language_tools17.ScriptLang.js;
   if (docFsPath) {
     configFile = getTSConfigFile(docFsPath);
     if (configFile?.endsWith("tsconfig.json")) {
-      markoScriptLang = import_language_tools18.ScriptLang.ts;
+      markoScriptLang = import_language_tools17.ScriptLang.ts;
     }
   }
   const basePath = configFile && import_path8.default.dirname(configFile) || process.cwd();
-  const cache = import_language_tools18.Project.getCache(configFile && basePath);
+  const cache = import_language_tools17.Project.getCache(configFile && basePath);
   let projectCache = cache.get(getTSProject);
   let cached;
   if (projectCache) {
@@ -2930,7 +2927,7 @@ function filenameToURI(filename) {
   return import_vscode_uri6.URI.file(filename).toString();
 }
 async function getPreferences(scriptLang) {
-  const configName = scriptLang === import_language_tools18.ScriptLang.js ? "javascript" : "typescript";
+  const configName = scriptLang === import_language_tools17.ScriptLang.js ? "javascript" : "typescript";
   const [preferencesConfig, suggestConfig, inlayHintsConfig] = await Promise.all([
     getConfig(`${configName}.preferences`),
     getConfig(`${configName}.suggest`),
@@ -3079,7 +3076,7 @@ function getTSTriggerChar(char) {
 }
 
 // src/service/style/index.ts
-var import_language_tools19 = require("@marko/language-tools");
+var import_language_tools18 = require("@marko/language-tools");
 var import_vscode_css_languageservice2 = require("vscode-css-languageservice");
 var import_vscode_languageserver11 = require("vscode-languageserver");
 var import_vscode_languageserver_textdocument2 = require("vscode-languageserver-textdocument");
@@ -3379,7 +3376,7 @@ var StyleSheetService = {
 function processStyle(doc) {
   return processDoc(doc, ({ uri, version, parsed, lookup }) => {
     const result = [];
-    for (const [ext, extracted] of (0, import_language_tools19.extractStyle)({
+    for (const [ext, extracted] of (0, import_language_tools18.extractStyle)({
       parsed,
       lookup
     })) {
@@ -3909,7 +3906,7 @@ for (const command in service.commands) {
 }
 function validateDocs() {
   queueDiagnostic();
-  import_language_tools20.Project.clearCaches();
+  import_language_tools19.Project.clearCaches();
 }
 function queueDiagnostic() {
   clearTimeout(diagnosticTimeout);