Allow prettier getter async

volarjs · Mar 13, 2024 · ab0b18d · ab0b18d
1 parent 4e54e05
commit ab0b18d
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/packages/prettier/index.ts b/packages/prettier/index.ts
@@ -6,7 +6,7 @@ export function create(
 	/**
 	 * Prettier instance or getter to use.
 	 */
-	prettierInstanceOrGetter: typeof import('prettier') | ((context: ServiceContext) => typeof import('prettier') | undefined),
+	prettierInstanceOrGetter: typeof import('prettier') | ((context: ServiceContext) => Result<typeof import('prettier') | undefined>),
 	{
 		html,
 		documentSelector = ['html', 'css', 'scss', 'typescript', 'javascript'],
@@ -56,20 +56,23 @@ export function create(
 		name: 'prettier',
 		create(context): ServicePluginInstance {
 
-			const prettier = typeof prettierInstanceOrGetter === 'function'
-				? prettierInstanceOrGetter(context)
-				: prettierInstanceOrGetter;
-
-			if (!prettier) {
-				return {};
-			}
+			let prettierInstanceOrPromise: Result<typeof import('prettier') | undefined>;
 
 			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;
 					}