volar-service-css 0.0.31 → 0.0.32

package/index.d.ts

@@ -1,18 +1,18 @@
-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 css from 'vscode-css-languageservice';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 export interface Provide {
     'css/stylesheet': (document: TextDocument, ls: css.LanguageService) => css.Stylesheet;
     'css/languageService': (document: TextDocument) => css.LanguageService | undefined;
 }
-export declare function create({ cssDocumentSelector, scssDocumentSelector, lessDocumentSelector, useDefaultDataProvider, getDocumentContext, isFormattingEnabled, getFormatConfiguration, getLanguageSettings, getCustomData, onDidChangeCustomData, }?: {
+export declare function create({ cssDocumentSelector, scssDocumentSelector, lessDocumentSelector, useDefaultDataProvider, getDocumentContext, isFormattingEnabled, getFormattingOptions, getLanguageSettings, getCustomData, onDidChangeCustomData, }?: {
     cssDocumentSelector?: DocumentSelector;
     scssDocumentSelector?: DocumentSelector;
     lessDocumentSelector?: DocumentSelector;
     useDefaultDataProvider?: boolean;
     getDocumentContext?(context: ServiceContext): css.DocumentContext;
     isFormattingEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
-    getFormatConfiguration?(document: TextDocument, context: ServiceContext): Result<css.CSSFormatConfiguration | undefined>;
+    getFormattingOptions?(document: TextDocument, options: FormattingOptions, context: ServiceContext): Result<css.CSSFormatConfiguration>;
     getLanguageSettings?(document: TextDocument, context: ServiceContext): Result<css.LanguageSettings | undefined>;
     getCustomData?(context: ServiceContext): Result<css.ICSSDataProvider[]>;
     onDidChangeCustomData?(listener: () => void, context: ServiceContext): Disposable;

package/index.js

@@ -25,8 +25,11 @@ function create({ cssDocumentSelector = ['css'], scssDocumentSelector = ['scss']
     };
 }, isFormattingEnabled = async (document, context) => {
     return await context.env.getConfiguration?.(document.languageId + '.format.enable') ?? true;
-}, getFormatConfiguration = async (document, context) => {
-    return await context.env.getConfiguration?.(document.languageId + '.format');
+}, getFormattingOptions = async (document, options, context) => {
+    return {
+        ...options,
+        ...await context.env.getConfiguration?.(document.languageId + '.format'),
+    };
 }, getLanguageSettings = async (document, context) => {
     return await context.env.getConfiguration?.(document.languageId);
 }, getCustomData = async (context) => {
@@ -170,11 +173,7 @@ function create({ cssDocumentSelector = ['css'], scssDocumentSelector = ['scss']
                         if (!await isFormattingEnabled(document, context)) {
                             return;
                         }
-                        const formatSettings = await getFormatConfiguration(document, context);
-                        const formatOptions = {
-                            ...options,
-                            ...formatSettings,
-                        };
+                        const formatOptions = await getFormattingOptions(document, options, context);
                         let formatDocument = document;
                         let prefixes = [];
                         let suffixes = [];

package/package.json

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