volar-service-html 0.0.31 → 0.0.32

package/index.d.ts

@@ -1,4 +1,4 @@
-import type { Disposable, DocumentSelector, Result, ServiceContext, ServicePlugin } from '@volar/language-service';
+import type { Disposable, DocumentSelector, FormattingOptions, Result, ServiceContext, ServicePlugin } from '@volar/language-service';
 import * as html from 'vscode-html-languageservice';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 export interface Provide {
@@ -9,12 +9,11 @@ export interface Provide {
 export declare function create({ documentSelector, useDefaultDataProvider, getDocumentContext, isFormattingEnabled, isAutoCreateQuotesEnabled, isAutoClosingTagsEnabled, getFormattingOptions, getCompletionConfiguration, getHoverSettings, getCustomData, onDidChangeCustomData, }?: {
     documentSelector?: DocumentSelector;
     useDefaultDataProvider?: boolean;
-    useCustomDataProviders?: boolean;
     isFormattingEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
     isAutoCreateQuotesEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
     isAutoClosingTagsEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
     getDocumentContext?(context: ServiceContext): html.DocumentContext;
-    getFormattingOptions?(document: TextDocument, context: ServiceContext): Result<html.HTMLFormatConfiguration | undefined>;
+    getFormattingOptions?(document: TextDocument, options: FormattingOptions, context: ServiceContext): Result<html.HTMLFormatConfiguration>;
     getCompletionConfiguration?(document: TextDocument, context: ServiceContext): Result<html.CompletionConfiguration | undefined>;
     getHoverSettings?(document: TextDocument, context: ServiceContext): Result<html.HoverSettings | undefined>;
     getCustomData?(context: ServiceContext): Result<html.IHTMLDataProvider[]>;

package/index.js

@@ -29,8 +29,20 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
     return await context.env.getConfiguration?.('html.autoCreateQuotes') ?? true;
 }, isAutoClosingTagsEnabled = async (_document, context) => {
     return await context.env.getConfiguration?.('html.autoClosingTags') ?? true;
-}, getFormattingOptions = async (_document, context) => {
-    return await context.env.getConfiguration?.('html.format');
+}, getFormattingOptions = async (_document, options, context) => {
+    const formatSettings = {
+        ...options,
+        endWithNewline: options.insertFinalNewline ? true : options.trimFinalNewlines ? false : undefined,
+        ...await context.env.getConfiguration?.('html.format'),
+    };
+    // https://github.com/microsoft/vscode/blob/a8f73340be02966c3816a2f23cb7e446a3a7cb9b/extensions/html-language-features/server/src/modes/htmlMode.ts#L47-L51
+    if (formatSettings.contentUnformatted) {
+        formatSettings.contentUnformatted = formatSettings.contentUnformatted + ',script';
+    }
+    else {
+        formatSettings.contentUnformatted = 'script';
+    }
+    return formatSettings;
 }, getCompletionConfiguration = async (_document, context) => {
     return await context.env.getConfiguration?.('html.completion');
 }, getHoverSettings = async (_document, context) => {
@@ -163,18 +175,7 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                                 end: document.positionAt(endOffset),
                             };
                         }
-                        const formatSettings = {
-                            ...options,
-                            endWithNewline: options.insertFinalNewline ? true : options.trimFinalNewlines ? false : undefined,
-                            ...await getFormattingOptions(document, context),
-                        };
-                        // https://github.com/microsoft/vscode/blob/a8f73340be02966c3816a2f23cb7e446a3a7cb9b/extensions/html-language-features/server/src/modes/htmlMode.ts#L47-L51
-                        if (formatSettings.contentUnformatted) {
-                            formatSettings.contentUnformatted = formatSettings.contentUnformatted + ',script';
-                        }
-                        else {
-                            formatSettings.contentUnformatted = 'script';
-                        }
+                        const formatSettings = await getFormattingOptions(document, options, context);
                         let formatDocument = document;
                         let prefixes = [];
                         let suffixes = [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-html",
-	"version": "0.0.31",
+	"version": "0.0.32",
 	"description": "Integrate vscode-languageservice-html into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/html",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -39,5 +39,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "f7005aef724767786ee9fe943fa976231cc79bf1"
+	"gitHead": "717049e7dcd5c30f451f6db8eb71eaba43f74c83"
 }