volar-service-prettier 0.0.31-patch.2 → 0.0.32

package/index.d.ts

@@ -4,7 +4,7 @@ export declare function create(
 /**
  * Prettier instance or getter to use.
  */
-prettierInstanceOrGetter: typeof import('prettier') | ((context: ServiceContext) => typeof import('prettier') | undefined), { html, documentSelector, isFormattingEnabled, getFormattingOptions, }?: {
+prettierInstanceOrGetter: typeof import('prettier') | ((context: ServiceContext) => Result<typeof import('prettier') | undefined>), { html, documentSelector, isFormattingEnabled, getFormattingOptions, }?: {
     html?: {
         /**
          * Preprocessing to break "contents" from "HTML tags".

package/index.js

@@ -9,14 +9,9 @@ function create(
 prettierInstanceOrGetter, { html, documentSelector = ['html', 'css', 'scss', 'typescript', 'javascript'], isFormattingEnabled = async (prettier, document) => {
     const uri = vscode_uri_1.URI.parse(document.uri);
     if (uri.scheme === 'file') {
-        try {
-            const fileInfo = await prettier.getFileInfo(uri.fsPath, { ignorePath: '.prettierignore', resolveConfig: false });
-            if (fileInfo.ignored) {
-                return false;
-            }
-        }
-        catch (err) {
-            console.warn(err);
+        const fileInfo = await prettier.getFileInfo(uri.fsPath, { ignorePath: '.prettierignore', resolveConfig: false });
+        if (fileInfo.ignored) {
+            return false;
         }
     }
     return true;
@@ -35,17 +30,19 @@ prettierInstanceOrGetter, { html, documentSelector = ['html', 'css', 'scss', 'ty
     return {
         name: 'prettier',
         create(context) {
-            const prettier = typeof prettierInstanceOrGetter === 'function'
-                ? prettierInstanceOrGetter(context)
-                : prettierInstanceOrGetter;
-            if (!prettier) {
-                return {};
-            }
+            let prettierInstanceOrPromise;
             return {
                 async provideDocumentFormattingEdits(document, _, formatOptions) {
                     if (!matchDocument(documentSelector, document)) {
                         return;
                     }
+                    prettierInstanceOrPromise ??= typeof prettierInstanceOrGetter === 'function'
+                        ? prettierInstanceOrGetter(context)
+                        : prettierInstanceOrGetter;
+                    const prettier = await prettierInstanceOrPromise;
+                    if (!prettier) {
+                        return;
+                    }
                     if (!isFormattingEnabled(prettier, document, context)) {
                         return;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-prettier",
-	"version": "0.0.31-patch.2",
+	"version": "0.0.32",
 	"description": "Integrate Prettier into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/prettier",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -42,5 +42,6 @@
 		"@volar/language-service": {
 			"optional": true
 		}
-	}
+	},
+	"gitHead": "717049e7dcd5c30f451f6db8eb71eaba43f74c83"
 }

package/sample/README.md

@@ -1 +0,0 @@
-Copy from `*.vue.html` to `*.vue` and `Format Document With Volar` (or simply save in Visual Studio Code) to see the differences.