volar-service-prettyhtml 0.0.31 → 0.0.33

package/index.d.ts

@@ -1,9 +1,9 @@
 import * as prettyhtml from '@starptech/prettyhtml';
-import type { DocumentSelector, Result, ServiceContext, ServicePlugin, TextDocument } from '@volar/language-service';
-export type FormattingOptions = Parameters<typeof prettyhtml>[1];
+import type { DocumentSelector, FormattingOptions, Result, ServiceContext, ServicePlugin, TextDocument } from '@volar/language-service';
+export type PrettyhtmlFormattingOptions = Parameters<typeof prettyhtml>[1];
 export declare function create({ documentSelector, isFormattingEnabled, getFormattingOptions, }?: {
     documentSelector?: DocumentSelector;
     isFormattingEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
-    getFormattingOptions?(document: TextDocument, context: ServiceContext): Result<FormattingOptions>;
+    getFormattingOptions?(document: TextDocument, options: FormattingOptions, context: ServiceContext): Result<PrettyhtmlFormattingOptions>;
 }): ServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -2,7 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const prettyhtml = require("@starptech/prettyhtml");
-function create({ documentSelector = ['html'], isFormattingEnabled = () => true, getFormattingOptions = () => ({}), } = {}) {
+function create({ documentSelector = ['html'], isFormattingEnabled = () => true, getFormattingOptions = (_document, options) => {
+    return {
+        tabWidth: options.tabSize,
+        useTabs: !options.insertSpaces,
+    };
+}, } = {}) {
     return {
         name: 'prettyhtml',
         create(context) {
@@ -13,11 +18,7 @@ function create({ documentSelector = ['html'], isFormattingEnabled = () => true,
                     if (!await isFormattingEnabled(document, context))
                         return;
                     const oldRangeText = document.getText(range);
-                    const newRangeText = prettyhtml(oldRangeText, {
-                        tabWidth: options.tabSize,
-                        useTabs: !options.insertSpaces,
-                        ...await getFormattingOptions(document, context),
-                    }).contents;
+                    const newRangeText = prettyhtml(oldRangeText, await getFormattingOptions(document, options, context)).contents;
                     if (newRangeText === oldRangeText)
                         return [];
                     const newText = document.getText({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-prettyhtml",
-	"version": "0.0.31",
+	"version": "0.0.33",
 	"description": "Integrate prettyhtml into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/prettyhtml",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "f7005aef724767786ee9fe943fa976231cc79bf1"
+	"gitHead": "d04c9ea5f5b58c5e0b6db9a65a8aba1a5a2ed9ef"
 }