volar-service-prettyhtml 0.0.30 → 0.0.32

package/index.d.ts

@@ -1,4 +1,9 @@
-import type { ServicePlugin } from '@volar/language-service';
 import * as prettyhtml from '@starptech/prettyhtml';
-export declare function create(configs: NonNullable<Parameters<typeof prettyhtml>[1]>): ServicePlugin;
+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, options: FormattingOptions, context: ServiceContext): Result<PrettyhtmlFormattingOptions>;
+}): ServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -2,20 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const prettyhtml = require("@starptech/prettyhtml");
-function create(configs) {
+function create({ documentSelector = ['html'], isFormattingEnabled = () => true, getFormattingOptions = (_document, options) => {
+    return {
+        tabWidth: options.tabSize,
+        useTabs: !options.insertSpaces,
+    };
+}, } = {}) {
     return {
         name: 'prettyhtml',
-        create() {
+        create(context) {
             return {
-                provideDocumentFormattingEdits(document, range, options) {
-                    if (document.languageId !== 'html')
+                async provideDocumentFormattingEdits(document, range, options) {
+                    if (!matchDocument(documentSelector, document))
+                        return;
+                    if (!await isFormattingEnabled(document, context))
                         return;
                     const oldRangeText = document.getText(range);
-                    const newRangeText = prettyhtml(oldRangeText, {
-                        ...configs,
-                        tabWidth: options.tabSize,
-                        useTabs: !options.insertSpaces,
-                    }).contents;
+                    const newRangeText = prettyhtml(oldRangeText, await getFormattingOptions(document, options, context)).contents;
                     if (newRangeText === oldRangeText)
                         return [];
                     const newText = document.getText({
@@ -40,4 +43,12 @@ function create(configs) {
     };
 }
 exports.create = create;
+function matchDocument(selector, document) {
+    for (const sel of selector) {
+        if (sel === document.languageId || (typeof sel === 'object' && sel.language === document.languageId)) {
+            return true;
+        }
+    }
+    return false;
+}
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-prettyhtml",
-	"version": "0.0.30",
+	"version": "0.0.32",
 	"description": "Integrate prettyhtml into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/prettyhtml",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -27,12 +27,12 @@
 		"@starptech/prettyhtml": "^0.10.0"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.0.1"
+		"@volar/language-service": "~2.1.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "30c3cc3c76e90f75f14fe0c2fa4fd33b7ff06507"
+	"gitHead": "717049e7dcd5c30f451f6db8eb71eaba43f74c83"
 }