@marko/language-server 2.1.29 → 2.1.30

package/dist/index.mjs

@@ -21,7 +21,7 @@ Project.setDefaultCompilerMeta(defaultCompiler, {
 });
 
 // src/index.ts
-import { Project as Project7 } from "@marko/language-tools";
+import { Project as Project6 } from "@marko/language-tools";
 import { inspect as inspect2, isDeepStrictEqual } from "util";
 import {
   createConnection,
@@ -1675,7 +1675,6 @@ function extractDocumentSymbols({
 }
 
 // src/service/marko/format.ts
-import { Project as Project3 } from "@marko/language-tools";
 import * as prettier from "prettier";
 import * as markoPrettier from "prettier-plugin-marko";
 import { TextEdit as TextEdit6 } from "vscode-languageserver";
@@ -1708,7 +1707,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 = {
@@ -1722,7 +1720,6 @@ async function formatDocument(doc, formatOptions, cancel) {
         editorconfig: true
       }).catch(() => null) : null
     };
-    markoPrettier.setCompiler(Project3.getCompiler(dir), Project3.getConfig(dir));
     if (cancel?.isCancellationRequested) return;
     return [
       TextEdit6.replace(
@@ -1785,7 +1782,7 @@ var doHover = async (doc, params) => {
 
 // src/service/marko/validate.ts
 import { DiagnosticType } from "@marko/compiler/babel-utils";
-import { Project as Project4 } from "@marko/language-tools";
+import { Project as Project3 } from "@marko/language-tools";
 import path6 from "path";
 import { DiagnosticSeverity } from "vscode-languageserver";
 var markoErrorRegExp = /^(.+?)\.marko(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
@@ -1811,7 +1808,7 @@ var doValidate = (doc) => {
   const filename = getFSPath(doc);
   const diagnostics = [];
   try {
-    const { meta } = Project4.getCompiler(
+    const { meta } = Project3.getCompiler(
       filename && path6.dirname(filename)
     ).compileSync(doc.getText(), filename || "untitled.marko", compilerConfig);
     if (meta.diagnostics) {
@@ -1951,7 +1948,7 @@ var marko_default = {
 import {
   extractScript,
   NodeType as NodeType10,
-  Project as Project6,
+  Project as Project5,
   ScriptLang
 } from "@marko/language-tools";
 import path8 from "path";
@@ -1972,7 +1969,7 @@ import {
   getExt,
   isDefinitionFile,
   Processors,
-  Project as Project5
+  Project as Project4
 } from "@marko/language-tools";
 import path7 from "path";
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
@@ -2059,7 +2056,7 @@ function patch(ts2, configFile, extractCache3, resolutionCache, host, ps) {
         const tagNameMatch = importTagReg3.exec(moduleName);
         if (tagNameMatch) {
           const [, tagName] = tagNameMatch;
-          const tagDef = Project5.getTagLookup(
+          const tagDef = Project4.getTagLookup(
             path7.dirname(containingFile)
           ).getTag(tagName);
           const tagFileName = tagDef && (tagDef.template || tagDef.renderer);
@@ -2388,7 +2385,7 @@ var ScriptService = {
       if (!filename) return;
       const tsProject = getTSProject(filename);
       const extracted = processScript(doc, tsProject);
-      const lang = Project6.getScriptLang(
+      const lang = Project5.getScriptLang(
         filename,
         tsProject.markoScriptLang,
         ts,
@@ -2742,9 +2739,9 @@ function processScript(doc, tsProject) {
       ts,
       parsed,
       lookup,
-      translator: Project6.getConfig(dirname).translator,
-      scriptLang: filename ? Project6.getScriptLang(filename, markoScriptLang, ts, host) : markoScriptLang,
-      runtimeTypesCode: Project6.getTypeLibs(tsProject.rootDir, ts, host)?.markoTypesCode
+      translator: Project5.getConfig(dirname).translator,
+      scriptLang: filename ? Project5.getScriptLang(filename, markoScriptLang, ts, host) : markoScriptLang,
+      runtimeTypesCode: Project5.getTypeLibs(tsProject.rootDir, ts, host)?.markoTypesCode
     });
   });
 }
@@ -2797,7 +2794,7 @@ function docLocationAtTextSpan(doc, { start, length }) {
 function getTSConfigFile(fileName) {
   let configFile;
   const docFsDir = path8.dirname(fileName);
-  const cache = Project6.getCache(docFsDir);
+  const cache = Project5.getCache(docFsDir);
   let configFileCache = cache.get(getTSConfigFile);
   if (configFileCache) {
     configFile = configFileCache.get(docFsDir);
@@ -2821,7 +2818,7 @@ function getTSProject(docFsPath) {
     }
   }
   const basePath = configFile && path8.dirname(configFile) || process.cwd();
-  const cache = Project6.getCache(configFile && basePath);
+  const cache = Project5.getCache(configFile && basePath);
   let projectCache = cache.get(getTSProject);
   let cached;
   if (projectCache) {
@@ -3942,7 +3939,7 @@ for (const command in service.commands) {
 }
 function validateDocs() {
   queueDiagnostic();
-  Project7.clearCaches();
+  Project6.clearCaches();
 }
 function queueDiagnostic() {
   clearTimeout(diagnosticTimeout);