volar-service-prettier 0.0.46 → 0.0.48

package/index.d.ts

@@ -1,10 +1,10 @@
-import type { DocumentSelector, FormattingOptions, ProviderResult, ServiceContext, LanguageServicePlugin, TextDocument } from '@volar/language-service';
+import type { DocumentSelector, FormattingOptions, ProviderResult, LanguageServiceContext, LanguageServicePlugin, TextDocument } from '@volar/language-service';
 import type { Options } from 'prettier';
 export declare function create(
 /**
  * Prettier instance or getter to use.
  */
-prettierInstanceOrGetter: typeof import('prettier') | ((context: ServiceContext) => ProviderResult<typeof import('prettier') | undefined>), { html, documentSelector, isFormattingEnabled, getFormattingOptions, }?: {
+prettierInstanceOrGetter: typeof import('prettier') | ((context: LanguageServiceContext) => ProviderResult<typeof import('prettier') | undefined>), { html, documentSelector, isFormattingEnabled, getFormattingOptions, }?: {
     html?: {
         /**
          * Preprocessing to break "contents" from "HTML tags".
@@ -20,7 +20,7 @@ prettierInstanceOrGetter: typeof import('prettier') | ((context: ServiceContext)
      * ['html', 'css', 'scss', 'typescript', 'javascript']
      */
     documentSelector?: DocumentSelector;
-    isFormattingEnabled?(prettier: typeof import('prettier'), document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
-    getFormattingOptions?(prettier: typeof import('prettier'), document: TextDocument, formatOptions: FormattingOptions, context: ServiceContext): ProviderResult<Options>;
+    isFormattingEnabled?(prettier: typeof import('prettier'), document: TextDocument, context: LanguageServiceContext): ProviderResult<boolean>;
+    getFormattingOptions?(prettier: typeof import('prettier'), document: TextDocument, formatOptions: FormattingOptions, context: LanguageServiceContext): ProviderResult<Options>;
 }): LanguageServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -7,8 +7,8 @@ function create(
  * Prettier instance or getter to use.
  */
 prettierInstanceOrGetter, { html, documentSelector = ['html', 'css', 'scss', 'typescript', 'javascript'], isFormattingEnabled = async (prettier, document, context) => {
-    const documentUri = context.decodeEmbeddedDocumentUri(document.uri)?.[0] ?? document.uri;
-    const uri = vscode_uri_1.URI.parse(documentUri);
+    const parsed = vscode_uri_1.URI.parse(document.uri);
+    const uri = context.decodeEmbeddedDocumentUri(parsed)?.[0] ?? parsed;
     if (uri.scheme === 'file') {
         const fileInfo = await prettier.getFileInfo(uri.fsPath, { ignorePath: '.prettierignore', resolveConfig: false });
         if (fileInfo.ignored) {
@@ -17,12 +17,12 @@ prettierInstanceOrGetter, { html, documentSelector = ['html', 'css', 'scss', 'ty
     }
     return true;
 }, getFormattingOptions = async (prettier, document, formatOptions, context) => {
-    const documentUri = context.decodeEmbeddedDocumentUri(document.uri)?.[0] ?? document.uri;
-    const uri = vscode_uri_1.URI.parse(documentUri);
+    const parsed = vscode_uri_1.URI.parse(document.uri);
+    const uri = context.decodeEmbeddedDocumentUri(parsed)?.[0] ?? parsed;
     const configOptions = uri.scheme === 'file'
         ? await prettier.resolveConfig(uri.fsPath)
         : null;
-    const editorOptions = await context.env.getConfiguration?.('prettier', documentUri);
+    const editorOptions = await context.env.getConfiguration?.('prettier', uri.toString());
     return {
         filepath: uri.scheme === 'file'
             ? uri.fsPath
@@ -35,6 +35,9 @@ prettierInstanceOrGetter, { html, documentSelector = ['html', 'css', 'scss', 'ty
 }, } = {}) {
     return {
         name: 'prettier',
+        capabilities: {
+            documentFormattingProvider: true,
+        },
         create(context) {
             let prettierInstanceOrPromise;
             return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-prettier",
-	"version": "0.0.46",
+	"version": "0.0.48",
 	"description": "Integrate Prettier into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/prettier",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -32,7 +32,7 @@
 		"prettier": "^3.0.3"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.2.3",
+		"@volar/language-service": "~2.3.0-alpha.0",
 		"prettier": "^2.2 || ^3.0"
 	},
 	"peerDependenciesMeta": {
@@ -43,5 +43,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "a5bc7172ea25a43dd403a1b7c926a297f70750ec"
+	"gitHead": "6a80c92133e154907a79eefa05603f63994214c3"
 }