volar-service-json 0.0.31 → 0.0.32

package/index.d.ts

@@ -1,4 +1,4 @@
-import type { ServicePlugin, DocumentSelector, ServiceContext, Disposable, Result } from '@volar/language-service';
+import type { ServicePlugin, DocumentSelector, ServiceContext, Disposable, Result, FormattingOptions } from '@volar/language-service';
 import * as json from 'vscode-json-languageservice';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 export interface Provide {
@@ -15,7 +15,7 @@ export declare function create({ documentSelector, getWorkspaceContextService, i
     documentSelector?: DocumentSelector;
     getWorkspaceContextService?(context: ServiceContext): json.WorkspaceContextService;
     isFormattingEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
-    getFormattingOptions?(document: TextDocument, context: ServiceContext): Result<json.FormattingOptions | undefined>;
+    getFormattingOptions?(document: TextDocument, options: FormattingOptions, context: ServiceContext): Result<json.FormattingOptions>;
     getLanguageSettings?(context: ServiceContext): Result<json.LanguageSettings>;
     getDocumentLanguageSettings?(document: TextDocument, context: ServiceContext): Result<json.DocumentLanguageSettings | undefined>;
     onDidChangeLanguageSettings?(listener: () => void, context: ServiceContext): Disposable;

package/index.js

@@ -12,8 +12,11 @@ function create({ documentSelector = ['json', 'jsonc'], getWorkspaceContextServi
     };
 }, isFormattingEnabled = async (_document, context) => {
     return await context.env.getConfiguration?.('json.format.enable') ?? true;
-}, getFormattingOptions = async (_document, context) => {
-    return await context.env.getConfiguration?.('json.format');
+}, getFormattingOptions = async (_document, options, context) => {
+    return {
+        ...options,
+        ...await context.env.getConfiguration?.('json.format'),
+    };
 }, getLanguageSettings = async (context) => {
     const languageSettings = {};
     languageSettings.validate = await context.env.getConfiguration?.('json.validate') ?? true;
@@ -122,11 +125,8 @@ function create({ documentSelector = ['json', 'jsonc'], getWorkspaceContextServi
                         if (!await isFormattingEnabled(document, context)) {
                             return;
                         }
-                        const formatOptions = await getFormattingOptions(document, context);
-                        return jsonLs.format(document, range, {
-                            ...options,
-                            ...formatOptions,
-                        });
+                        const formatOptions = await getFormattingOptions(document, options, context);
+                        return jsonLs.format(document, range, formatOptions);
                     });
                 },
             };

package/package.json

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