volar-service-prettier 0.0.24 → 0.0.26

package/index.d.ts

@@ -1,4 +1,4 @@
-import type { ServicePlugin } from '@volar/language-service';
+import type { ServicePlugin, ServiceEnvironment } from '@volar/language-service';
 import type { Options, ResolveConfigOptions } from 'prettier';
 export declare function create(options?: {
     /**
@@ -40,5 +40,6 @@ export declare function create(options?: {
      * This property is useful whenever you want to load a specific instance of Prettier (for instance, loading the Prettier version installed in the user's project)
      */
     prettier?: typeof import('prettier') | undefined;
+    getPrettier?: (serviceEnv: ServiceEnvironment) => typeof import('prettier') | undefined;
 }, getPrettierConfig?: (filePath: string, prettier: typeof import('prettier'), config?: ResolveConfigOptions) => Promise<Options>): ServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
+const vscode_uri_1 = require("vscode-uri");
 function create(options = {}, getPrettierConfig = async (filePath, prettier, config) => {
     return await prettier.resolveConfig(filePath, config) ?? {};
 }) {
@@ -9,7 +10,9 @@ function create(options = {}, getPrettierConfig = async (filePath, prettier, con
         create(context) {
             let prettier;
             try {
-                prettier = options.prettier ?? require('prettier');
+                prettier = options.prettier
+                    ?? options.getPrettier?.(context.env)
+                    ?? require('prettier');
             }
             catch (e) {
                 throw new Error("Could not load Prettier: " + e);
@@ -20,7 +23,7 @@ function create(options = {}, getPrettierConfig = async (filePath, prettier, con
                     if (!languages.includes(document.languageId)) {
                         return;
                     }
-                    const filePath = context.env.uriToFileName(document.uri);
+                    const filePath = vscode_uri_1.URI.parse(document.uri).fsPath;
                     const fileInfo = await prettier.getFileInfo(filePath, { ignorePath: '.prettierignore', resolveConfig: false });
                     if (fileInfo.ignored) {
                         return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-prettier",
-	"version": "0.0.24",
+	"version": "0.0.26",
 	"description": "Integrate Prettier into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/prettier",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -24,6 +24,9 @@
 		"email": "polv@polv.cc",
 		"url": "https://www.polv.cc"
 	},
+	"dependencies": {
+		"vscode-uri": "^3.0.8"
+	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"prettier": "^3.0.3"
@@ -40,5 +43,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "f0532815ff3cdcf289dc582ddd3b8e3bff0cba26"
+	"gitHead": "876051c97aedf04531033784019b4344cdd48881"
 }