@marko/language-server 1.1.0 → 1.1.2

package/dist/index.mjs

@@ -13,13 +13,17 @@ import {
   TextDocumentSyncKind,
   createConnection
 } from "vscode-languageserver/node";
-import { Project as Project5 } from "@marko/language-tools";
+import { Project as Project6 } from "@marko/language-tools";
 
 // src/utils/file.ts
 import path from "path";
 import { Project, parse } from "@marko/language-tools";
 import { URI } from "vscode-uri";
 var processorCaches = /* @__PURE__ */ new WeakMap();
+function getFSDir(doc) {
+  const filename = getFSPath(doc);
+  return filename ? path.dirname(filename) : void 0;
+}
 function getFSPath(doc) {
   return URI.parse(doc.uri).fsPath;
 }
@@ -1089,7 +1093,7 @@ function AttrName({
     let label = attr.name;
     let snippet = attr.name;
     if (attr.enum) {
-      snippet += `="\${1|${attr.enum.join()}|}"$0`;
+      snippet += `="$1"$0`;
     } else {
       switch (type) {
         case "string":
@@ -1962,13 +1966,17 @@ function extractDocumentSymbols({
 import { TextEdit as TextEdit6 } from "vscode-languageserver";
 import * as prettier from "prettier";
 import * as markoPrettier from "prettier-plugin-marko";
+import { Project as Project3 } from "@marko/language-tools";
 var format2 = async (doc, params, cancel) => {
   try {
+    const dir = getFSDir(doc);
     const filepath = getFSPath(doc);
     const text = doc.getText();
     const options = {
       parser: "marko",
       filepath,
+      markoCompiler: Project3.getCompiler(dir),
+      markoCompilerConfig: Project3.getConfig(dir),
       plugins: [markoPrettier],
       tabWidth: params.options.tabSize,
       useTabs: params.options.insertSpaces === false,
@@ -2019,7 +2027,7 @@ import { URI as URI6 } from "vscode-uri";
 import * as prettier2 from "prettier";
 import {
   NodeType as NodeType9,
-  Project as Project4,
+  Project as Project5,
   ScriptLang,
   extractScript
 } from "@marko/language-tools";
@@ -2028,13 +2036,13 @@ import {
 import path6 from "path";
 import {
   Processors,
-  Project as Project3,
+  Project as Project4,
   getExt,
   isDefinitionFile
 } from "@marko/language-tools";
 var fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 var modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
-Project3.setDefaultTypePaths({
+Project4.setDefaultTypePaths({
   internalTypesFile: path6.join(__dirname, "marko.internal.d.ts"),
   markoTypesFile: path6.join(__dirname, "marko.runtime.d.ts")
 });
@@ -2413,7 +2421,7 @@ var ScriptService = {
         return;
       const tsProject = getTSProject(filename);
       const extracted = processScript(doc, tsProject);
-      const lang = Project4.getScriptLang(
+      const lang = Project5.getScriptLang(
         filename,
         tsProject.markoScriptLang,
         ts,
@@ -2797,8 +2805,8 @@ function processScript(doc, tsProject) {
       ts,
       parsed,
       lookup,
-      scriptLang: Project4.getScriptLang(filename, markoScriptLang, ts, host),
-      runtimeTypesCode: (_a = Project4.getTypeLibs(tsProject.rootDir, ts, host)) == null ? void 0 : _a.markoTypesCode
+      scriptLang: Project5.getScriptLang(filename, markoScriptLang, ts, host),
+      runtimeTypesCode: (_a = Project5.getTypeLibs(tsProject.rootDir, ts, host)) == null ? void 0 : _a.markoTypesCode
     });
   });
 }
@@ -2870,7 +2878,7 @@ function getTSProject(docFsPath) {
     }
   }
   const rootDir = configFile && path7.dirname(configFile) || process.cwd();
-  const cache = Project4.getCache(configFile && rootDir);
+  const cache = Project5.getCache(configFile && rootDir);
   let projectCache = cache.get(getTSProject);
   let cached;
   if (projectCache) {
@@ -3575,7 +3583,6 @@ var service = {
     );
   },
   async doComplete(doc, params, cancel) {
-    let isIncomplete = false;
     const itemsByLabel = /* @__PURE__ */ new Map();
     await Promise.allSettled(
       plugins.map(async (plugin) => {
@@ -3589,7 +3596,6 @@ var service = {
             curItems = cur;
           } else {
             curItems = cur.items;
-            isIncomplete ||= cur.isIncomplete;
           }
           for (const item of curItems) {
             const { label } = item;
@@ -3608,7 +3614,7 @@ var service = {
     if (cancel.isCancellationRequested)
       return;
     if (itemsByLabel.size) {
-      return { items: [...itemsByLabel.values()], isIncomplete };
+      return { items: [...itemsByLabel.values()], isIncomplete: true };
     }
   },
   async doCompletionResolve(item, cancel) {
@@ -4065,7 +4071,7 @@ for (const command in service.commands) {
 }
 function validateDocs() {
   queueDiagnostic();
-  Project5.clearCaches();
+  Project6.clearCaches();
 }
 function queueDiagnostic() {
   clearTimeout(diagnosticTimeout);