From c09e484818e8fcd8125df93c3b185da84cedf265 Mon Sep 17 00:00:00 2001
From: Jeremy Morton <jeremy@doccoms.co.uk>
Date: Mon, 5 Sep 2022 14:17:28 +0100
Subject: [PATCH 1/4] Add initial indent setting, and indent for CSS.

---
 .../vscode-vue-language-features/package.json |  5 +++++
 .../vue-language-service/src/plugins/css.ts   | 20 ++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/extensions/vscode-vue-language-features/package.json b/extensions/vscode-vue-language-features/package.json
index 88b46138f..6be2f186d 100644
--- a/extensions/vscode-vue-language-features/package.json
+++ b/extensions/vscode-vue-language-features/package.json
@@ -370,6 +370,11 @@
 					"default": false,
 					"description": "Auto-complete Ref value with `.value`."
 				},
+				"volar.initialIndent": {
+					"type": "boolean",
+					"default": false,
+					"description": "Whether to have initial indent for non-<template> regions."
+				},
 				"volar.takeOverMode.enabled": {
 					"type": [
 						"boolean",
diff --git a/packages/vue-language-service/src/plugins/css.ts b/packages/vue-language-service/src/plugins/css.ts
index a234d2b28..f517bf84e 100644
--- a/packages/vue-language-service/src/plugins/css.ts
+++ b/packages/vue-language-service/src/plugins/css.ts
@@ -191,16 +191,26 @@ export default function (options: {
 			return worker(document, async (stylesheet, cssLs) => {
 
 				const options_2 = await useConfigurationHost()?.getConfiguration<css.CSSFormatConfiguration & { enable: boolean; }>(document.languageId + '.format', document.uri);
+				const initialIndent = await useConfigurationHost()?.getConfiguration<boolean>('volar.initialIndent') ?? false;
 
 				if (options_2?.enable === false) {
 					return;
 				}
 
-				const edits = cssLs.format(document, range, {
+				let indentedDocument = document;
+				if (initialIndent && range.start.line === 0) {
+					const newText =
+						document
+						.getText()
+						.replace(/^[^\S\r\n]*/, options.insertSpaces ? ' '.repeat(options.tabSize) : '\t');
+					indentedDocument = TextDocument.create(document.uri, document.languageId, document.version + 1, newText);
+				}
+
+				const edits = cssLs.format(indentedDocument, range, {
 					...options_2,
 					...options,
 				});
-				let newText = TextDocument.applyEdits(document, edits);
+				let newText = TextDocument.applyEdits(indentedDocument, edits);
 
 				// fix https://github.com/johnsoncodehk/volar/issues/1155
 				if (!newText.startsWith('\n'))
@@ -209,12 +219,12 @@ export default function (options: {
 				if (!newText.endsWith('\n'))
 					newText = newText + '\n';
 
-				if (newText === document.getText())
+				if (newText === indentedDocument.getText())
 					return [];
 
 				return [vscode.TextEdit.replace({
-					start: document.positionAt(0),
-					end: document.positionAt(document.getText().length),
+					start: indentedDocument.positionAt(0),
+					end: indentedDocument.positionAt(indentedDocument.getText().length),
 				}, newText)];
 			});
 		},

From 5e7f1f0331bb4986057ce974b3ecb62cd67ebc16 Mon Sep 17 00:00:00 2001
From: Jeremy Morton <jeremy@doccoms.co.uk>
Date: Mon, 5 Sep 2022 17:34:48 +0100
Subject: [PATCH 2/4] Add indent for TS/JS and JSON.

---
 .../typescript-language-service/src/index.ts  |  2 +-
 .../src/services/formatting.ts                |  8 ++++++-
 .../vue-language-service/src/plugins/json.ts  | 23 ++++++++++++++-----
 .../src/plugins/typescript.ts                 |  3 ++-
 .../vue-language-service/src/tsConfigs.ts     |  6 +++--
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/packages/typescript-language-service/src/index.ts b/packages/typescript-language-service/src/index.ts
index 586dbc233..47e9a0222 100644
--- a/packages/typescript-language-service/src/index.ts
+++ b/packages/typescript-language-service/src/index.ts
@@ -34,7 +34,7 @@ export interface LanguageService extends ReturnType<typeof createLanguageService
 export { getSemanticTokenLegend } from './services/semanticTokens';
 
 export interface Settings {
-	getFormatOptions?(uri: string, options?: vscode.FormattingOptions): Promise<ts.FormatCodeSettings>;
+	getFormatOptions?(uri: string, options?: vscode.FormattingOptions, baseTabSize?: number): Promise<ts.FormatCodeSettings>;
 	getPreferences?(uri: string): Promise<ts.UserPreferences>;
 }
 
diff --git a/packages/typescript-language-service/src/services/formatting.ts b/packages/typescript-language-service/src/services/formatting.ts
index 1ee4fcf93..c8f91dc70 100644
--- a/packages/typescript-language-service/src/services/formatting.ts
+++ b/packages/typescript-language-service/src/services/formatting.ts
@@ -10,13 +10,19 @@ export function register(
 	settings: Settings
 ) {
 	return {
-		onRange: async (uri: string, options: vscode.FormattingOptions, range?: vscode.Range): Promise<vscode.TextEdit[]> => {
+		onRange: async (uri: string, options: vscode.FormattingOptions, range?: vscode.Range, baseIndentLevel?: number): Promise<vscode.TextEdit[]> => {
 
 			const document = getTextDocument(uri);
 			if (!document) return [];
 
 			const fileName = shared.getPathOfUri(document.uri);
 			const tsOptions = await settings.getFormatOptions?.(document.uri, options) ?? options;
+			if (typeof(tsOptions.indentSize) === "boolean" || typeof(tsOptions.indentSize) === "string") {
+				tsOptions.indentSize = undefined;
+			}
+			if (baseIndentLevel && tsOptions.indentSize) {
+				tsOptions.baseIndentSize = (tsOptions.indentSize * baseIndentLevel);
+			}
 
 			let scriptEdits: ReturnType<typeof languageService.getFormattingEditsForRange> | undefined;
 			try {
diff --git a/packages/vue-language-service/src/plugins/json.ts b/packages/vue-language-service/src/plugins/json.ts
index 992ed0bd2..5450d4d15 100644
--- a/packages/vue-language-service/src/plugins/json.ts
+++ b/packages/vue-language-service/src/plugins/json.ts
@@ -93,12 +93,19 @@ export default function (options: {
 			return worker(document, async (jsonDocument) => {
 
 				const options_2 = await useConfigurationHost()?.getConfiguration<json.FormattingOptions & { enable: boolean; }>('json.format', document.uri);
+				const initialIndent = await useConfigurationHost()?.getConfiguration<boolean>('volar.initialIndent') ?? false;
 
 				if (options_2?.enable === false) {
 					return;
 				}
 
-				const edits = jsonLs.format(document, range, {
+				let indentedDocument = document;
+				if (initialIndent) {
+					const newText = `{${document.getText()}}`;
+					indentedDocument = TextDocument.create(document.uri, document.languageId, document.version + 1, newText);
+				}
+
+				const edits = jsonLs.format(indentedDocument, range, {
 					...options_2,
 					...options,
 					insertFinalNewline: true,
@@ -108,13 +115,17 @@ export default function (options: {
 					return edits;
 				}
 
-				const newText = TextDocument.applyEdits(document, edits);
-				
+				let newText = TextDocument.applyEdits(indentedDocument, edits);
+				if (initialIndent) {
+					newText = newText.trim().substring(1, newText.length - 2);
+					newText = newText.replace(/\A[\r\n]+|[\r\n]+/m, '').trimEnd();
+				}
+
 				return [{
-					newText: '\n' + newText.trim() + '\n',
+					newText: '\n' + (initialIndent ? newText : newText.trim()) + '\n',
 					range: {
-						start: document.positionAt(0),
-						end: document.positionAt(document.getText().length),
+						start: indentedDocument.positionAt(0),
+						end: indentedDocument.positionAt(indentedDocument.getText().length),
 					},
 				}]
 			});
diff --git a/packages/vue-language-service/src/plugins/typescript.ts b/packages/vue-language-service/src/plugins/typescript.ts
index 6539f76d8..af745e575 100644
--- a/packages/vue-language-service/src/plugins/typescript.ts
+++ b/packages/vue-language-service/src/plugins/typescript.ts
@@ -244,12 +244,13 @@ export default function (options: {
 			if (isTsDocument(document)) {
 
 				const enable = await useConfigurationHost()?.getConfiguration<boolean>(getConfigTitle(document) + '.format.enable', document.uri);
+				const initialIndent = await useConfigurationHost()?.getConfiguration<boolean>('volar.initialIndent') ?? false;
 
 				if (enable === false) {
 					return;
 				}
 
-				return options.getTsLs().doFormatting.onRange(document.uri, options_2, range);
+				return options.getTsLs().doFormatting.onRange(document.uri, options_2, range, initialIndent ? 1 : undefined);
 			}
 		},
 
diff --git a/packages/vue-language-service/src/tsConfigs.ts b/packages/vue-language-service/src/tsConfigs.ts
index 552d950fd..f518f0c4b 100644
--- a/packages/vue-language-service/src/tsConfigs.ts
+++ b/packages/vue-language-service/src/tsConfigs.ts
@@ -5,7 +5,7 @@ import { ConfigurationHost } from '@volar/vue-language-service-types';
 
 export function getTsSettings(configurationHost: ConfigurationHost | undefined) {
 	const tsSettings: ts2.Settings = {
-		getFormatOptions: (uri, options) => getFormatOptions(configurationHost, uri, options),
+		getFormatOptions: (uri, options, baseTabSize) => getFormatOptions(configurationHost, uri, options, baseTabSize),
 		getPreferences: (uri) => getPreferences(configurationHost, uri),
 	};
 	return tsSettings;
@@ -14,7 +14,8 @@ export function getTsSettings(configurationHost: ConfigurationHost | undefined)
 export async function getFormatOptions(
 	configurationHost: ConfigurationHost | undefined,
 	uri: string,
-	options?: vscode.FormattingOptions
+	options?: vscode.FormattingOptions,
+	baseTabSize?: number
 ): Promise<ts.FormatCodeSettings> {
 
 	let config = await configurationHost?.getConfiguration<any>(isTypeScriptDocument(uri) ? 'typescript.format' : 'javascript.format', uri);
@@ -24,6 +25,7 @@ export async function getFormatOptions(
 	return {
 		tabSize: options?.tabSize,
 		indentSize: options?.tabSize,
+		baseIndentSize: baseTabSize,
 		convertTabsToSpaces: options?.insertSpaces,
 		// We can use \n here since the editor normalizes later on to its line endings.
 		newLineCharacter: '\n',

From 9adc6324b57d4960e066755964a53643d95dc19a Mon Sep 17 00:00:00 2001
From: johnsoncodehk <johnsoncodehk@gmail.com>
Date: Tue, 6 Sep 2022 06:50:43 +0800
Subject: [PATCH 3/4] refactor: config initialIndentBracket by embedded
 document

---
 .../vscode-vue-language-features/package.json | 50 +++++++++-
 packages/shared/src/node.ts                   |  3 +
 .../src/plugins/vue-sfc-customblocks.ts       | 11 ++-
 .../src/plugins/vue-sfc-scripts.ts            |  4 +-
 .../src/plugins/vue-sfc-styles.ts             | 11 ++-
 .../src/plugins/vue-sfc-template.ts           |  9 +-
 packages/vue-language-core/src/sourceFile.ts  |  4 +-
 .../src/documentFeatures/format.ts            | 96 ++++++++++++-------
 .../src/documentService.ts                    | 56 +----------
 .../vue-language-service/src/plugins/css.ts   | 20 +---
 .../vue-language-service/src/plugins/html.ts  | 12 ++-
 .../vue-language-service/src/plugins/json.ts  | 23 ++---
 .../src/plugins/typescript.ts                 |  3 +-
 packages/vue-language-service/src/types.ts    |  1 -
 14 files changed, 168 insertions(+), 135 deletions(-)

diff --git a/extensions/vscode-vue-language-features/package.json b/extensions/vscode-vue-language-features/package.json
index 6be2f186d..8f5407ade 100644
--- a/extensions/vscode-vue-language-features/package.json
+++ b/extensions/vscode-vue-language-features/package.json
@@ -371,9 +371,53 @@
 					"description": "Auto-complete Ref value with `.value`."
 				},
 				"volar.initialIndent": {
-					"type": "boolean",
-					"default": false,
-					"description": "Whether to have initial indent for non-<template> regions."
+					"type": "object",
+					"description": "Whether to have initial indent.",
+					"default": {
+						"html": true
+					},
+					"properties": {
+						"html": {
+							"type": "boolean",
+							"default": true
+						},
+						"pug": {
+							"type": "boolean",
+							"default": false
+						},
+						"typescript": {
+							"type": "boolean",
+							"default": false
+						},
+						"javascript": {
+							"type": "boolean",
+							"default": false
+						},
+						"typescriptreact": {
+							"type": "boolean",
+							"default": false
+						},
+						"javascriptreact": {
+							"type": "boolean",
+							"default": false
+						},
+						"css": {
+							"type": "boolean",
+							"default": false
+						},
+						"scss": {
+							"type": "boolean",
+							"default": false
+						},
+						"json": {
+							"type": "boolean",
+							"default": false
+						},
+						"jsonc": {
+							"type": "boolean",
+							"default": false
+						}
+					}
 				},
 				"volar.takeOverMode.enabled": {
 					"type": [
diff --git a/packages/shared/src/node.ts b/packages/shared/src/node.ts
index 153abaa03..e26f5cf9d 100644
--- a/packages/shared/src/node.ts
+++ b/packages/shared/src/node.ts
@@ -1,3 +1,6 @@
 export * from './browser';
 export * from './ts_node';
 export * from './http';
+
+// fix build
+export * as _0 from 'vscode-languageserver-textdocument';
diff --git a/packages/vue-language-core/src/plugins/vue-sfc-customblocks.ts b/packages/vue-language-core/src/plugins/vue-sfc-customblocks.ts
index 2cfca21d6..d87574fb3 100644
--- a/packages/vue-language-core/src/plugins/vue-sfc-customblocks.ts
+++ b/packages/vue-language-core/src/plugins/vue-sfc-customblocks.ts
@@ -1,5 +1,12 @@
 import { VueLanguagePlugin } from '../sourceFile';
 
+const presetInitialIndentBrackets: Record<string, [string, string] | undefined> = {
+	json: ['{', '}'],
+	jsonc: ['{', '}'],
+	html: ['<template>', '</template>'],
+	markdown: ['<template>', '</template>'],
+};
+
 const plugin: VueLanguagePlugin = () => {
 
 	return {
@@ -22,7 +29,9 @@ const plugin: VueLanguagePlugin = () => {
 				embeddedFile.capabilities = {
 					diagnostics: true,
 					foldingRanges: true,
-					formatting: true,
+					formatting: {
+						initialIndentBracket: presetInitialIndentBrackets[customBlock.lang],
+					},
 					documentSymbol: true,
 					codeActions: true,
 					inlayHints: true,
diff --git a/packages/vue-language-core/src/plugins/vue-sfc-scripts.ts b/packages/vue-language-core/src/plugins/vue-sfc-scripts.ts
index 9990f2e8e..e309840b4 100644
--- a/packages/vue-language-core/src/plugins/vue-sfc-scripts.ts
+++ b/packages/vue-language-core/src/plugins/vue-sfc-scripts.ts
@@ -23,7 +23,9 @@ const plugin: VueLanguagePlugin = () => {
 				embeddedFile.capabilities = {
 					diagnostics: false,
 					foldingRanges: true,
-					formatting: true,
+					formatting: {
+						initialIndentBracket: ['{', '}'],
+					},
 					documentSymbol: true,
 					codeActions: false,
 					inlayHints: false,
diff --git a/packages/vue-language-core/src/plugins/vue-sfc-styles.ts b/packages/vue-language-core/src/plugins/vue-sfc-styles.ts
index 178bd259a..6e3d6d1fa 100644
--- a/packages/vue-language-core/src/plugins/vue-sfc-styles.ts
+++ b/packages/vue-language-core/src/plugins/vue-sfc-styles.ts
@@ -1,5 +1,10 @@
 import { VueLanguagePlugin } from '../sourceFile';
 
+const presetInitialIndentBrackets: Record<string, [string, string] | undefined> = {
+	css: ['{', '}'],
+	scss: ['{', '}'],
+};
+
 const plugin: VueLanguagePlugin = () => {
 
 	return {
@@ -22,7 +27,9 @@ const plugin: VueLanguagePlugin = () => {
 				embeddedFile.capabilities = {
 					diagnostics: true,
 					foldingRanges: true,
-					formatting: true,
+					formatting: {
+						initialIndentBracket: presetInitialIndentBrackets[style.lang],
+					},
 					documentSymbol: true,
 					codeActions: true,
 					inlayHints: true,
@@ -48,5 +55,5 @@ const plugin: VueLanguagePlugin = () => {
 			}
 		},
 	};
-}
+};
 export = plugin;
diff --git a/packages/vue-language-core/src/plugins/vue-sfc-template.ts b/packages/vue-language-core/src/plugins/vue-sfc-template.ts
index 458a9c4f7..a346acf24 100644
--- a/packages/vue-language-core/src/plugins/vue-sfc-template.ts
+++ b/packages/vue-language-core/src/plugins/vue-sfc-template.ts
@@ -1,5 +1,10 @@
 import { VueLanguagePlugin } from '../sourceFile';
 
+const presetInitialIndentBrackets: Record<string, [string, string] | undefined> = {
+	html: ['<template>', '</template>'],
+	pug: ['div', '\n'],
+};
+
 const plugin: VueLanguagePlugin = () => {
 
 	return {
@@ -17,7 +22,9 @@ const plugin: VueLanguagePlugin = () => {
 				embeddedFile.capabilities = {
 					diagnostics: true,
 					foldingRanges: true,
-					formatting: true,
+					formatting: {
+						initialIndentBracket: presetInitialIndentBrackets[sfc.template.lang],
+					},
 					documentSymbol: true,
 					codeActions: true,
 					inlayHints: true,
diff --git a/packages/vue-language-core/src/sourceFile.ts b/packages/vue-language-core/src/sourceFile.ts
index b7ae694c5..e3e9cb914 100644
--- a/packages/vue-language-core/src/sourceFile.ts
+++ b/packages/vue-language-core/src/sourceFile.ts
@@ -74,7 +74,9 @@ export interface EmbeddedFile {
 	capabilities: {
 		diagnostics: boolean,
 		foldingRanges: boolean,
-		formatting: boolean,
+		formatting: boolean | {
+			initialIndentBracket?: [string, string],
+		},
 		documentSymbol: boolean,
 		codeActions: boolean,
 		inlayHints: boolean,
diff --git a/packages/vue-language-service/src/documentFeatures/format.ts b/packages/vue-language-service/src/documentFeatures/format.ts
index e5ffe9768..43acbd00d 100644
--- a/packages/vue-language-service/src/documentFeatures/format.ts
+++ b/packages/vue-language-service/src/documentFeatures/format.ts
@@ -3,6 +3,7 @@ import * as vscode from 'vscode-languageserver-protocol';
 import type { EmbeddedStructure } from '@volar/vue-language-core';
 import type { DocumentServiceRuntimeContext } from '../types';
 import { EmbeddedDocumentSourceMap, VueDocument } from '../vueDocuments';
+import { useConfigurationHost } from '@volar/vue-language-service-types';
 
 export function register(context: DocumentServiceRuntimeContext) {
 
@@ -24,8 +25,8 @@ export function register(context: DocumentServiceRuntimeContext) {
 
 		const originalDocument = document;
 		const rootEdits = onTypeParams
-			? await tryFormatOnType(document, onTypeParams.position, onTypeParams.ch)
-			: await tryFormat(document, range);
+			? await tryFormat(document, onTypeParams.position, undefined, onTypeParams.ch)
+			: await tryFormat(document, range, undefined);
 		const vueDocument = context.getVueDocument(document);
 
 		if (!vueDocument)
@@ -37,6 +38,8 @@ export function register(context: DocumentServiceRuntimeContext) {
 
 		let level = 0;
 
+		const initialIndentLanguageId = await useConfigurationHost()?.getConfiguration<Record<string, boolean>>('volar.initialIndent') ?? { html: true };
+
 		while (true) {
 
 			tryUpdateVueDocument();
@@ -57,6 +60,9 @@ export function register(context: DocumentServiceRuntimeContext) {
 					continue;
 
 				const sourceMap = vueDocument.sourceMapsMap.get(embedded.self);
+				const initialIndentBracket = typeof embedded.self.file.capabilities.formatting === 'object' && initialIndentLanguageId[sourceMap.mappedDocument.languageId]
+					? embedded.self.file.capabilities.formatting.initialIndentBracket
+					: undefined;
 
 				let _edits: vscode.TextEdit[] | undefined;
 
@@ -65,7 +71,12 @@ export function register(context: DocumentServiceRuntimeContext) {
 					const embeddedPosition = sourceMap.getMappedRange(onTypeParams.position)?.[0].start;
 
 					if (embeddedPosition) {
-						_edits = await tryFormatOnType(sourceMap.mappedDocument, embeddedPosition, onTypeParams.ch);
+						_edits = await tryFormat(
+							sourceMap.mappedDocument,
+							embeddedPosition,
+							initialIndentBracket,
+							onTypeParams.ch,
+						);
 					}
 				}
 
@@ -103,7 +114,11 @@ export function register(context: DocumentServiceRuntimeContext) {
 							sourceMapEmbeddedDocumentUri: sourceMap.mappedDocument.uri,
 						};
 
-						_edits = await tryFormat(sourceMap.mappedDocument, embeddedRange);
+						_edits = await tryFormat(
+							sourceMap.mappedDocument,
+							embeddedRange,
+							initialIndentBracket,
+						);
 					}
 				}
 
@@ -182,21 +197,41 @@ export function register(context: DocumentServiceRuntimeContext) {
 			}
 		}
 
-		async function tryFormat(document: TextDocument, range: vscode.Range) {
+		async function tryFormat(document: TextDocument, range: vscode.Range | vscode.Position, initialIndentBracket: [string, string] | undefined, ch?: string) {
 
-			const plugins = context.getFormatPlugins();
+			const plugins = context.getPlugins();
 
-			context.updateTsLs(document);
+			let formatDocument = document;
+			let formatRange = range;
 
-			for (const plugin of plugins) {
+			if (initialIndentBracket) {
+				formatDocument = TextDocument.create(
+					document.uri,
+					document.languageId,
+					document.version,
+					initialIndentBracket[0] + document.getText() + initialIndentBracket[1],
+				);
+				formatRange = {
+					start: formatDocument.positionAt(0),
+					end: formatDocument.positionAt(formatDocument.getText().length),
+				};
+			}
 
-				if (!plugin.format)
-					continue;
+			context.updateTsLs(formatDocument);
+
+			for (const plugin of plugins) {
 
 				let edits: vscode.TextEdit[] | null | undefined;
 
 				try {
-					edits = await plugin.format(document, range, options);
+					if (vscode.Position.is(formatRange)) {
+						if (ch !== undefined) {
+							edits = await plugin.formatOnType?.(formatDocument, formatRange, ch, options);
+						}
+					}
+					else {
+						edits = await plugin.format?.(formatDocument, formatRange, options);
+					}
 				}
 				catch (err) {
 					console.error(err);
@@ -205,34 +240,25 @@ export function register(context: DocumentServiceRuntimeContext) {
 				if (!edits)
 					continue;
 
-				return edits;
-			}
-		}
-
-		async function tryFormatOnType(document: TextDocument, position: vscode.Position, ch: string) {
-
-			const plugins = context.getFormatPlugins();
+				if (!edits.length)
+					return edits;
 
-			context.updateTsLs(document);
+				let newText = TextDocument.applyEdits(formatDocument, edits);
 
-			for (const plugin of plugins) {
-
-				if (!plugin.formatOnType)
-					continue;
-
-				let edits: vscode.TextEdit[] | null | undefined;
-
-				try {
-					edits = await plugin.formatOnType(document, position, ch, options);
+				if (initialIndentBracket) {
+					newText = newText.substring(
+						newText.indexOf(initialIndentBracket[0]) + initialIndentBracket[0].length,
+						newText.lastIndexOf(initialIndentBracket[1]),
+					);
 				}
-				catch (err) {
-					console.error(err);
-				}
-
-				if (!edits)
-					continue;
 
-				return edits;
+				return [{
+					range: {
+						start: document.positionAt(0),
+						end: document.positionAt(document.getText().length),
+					},
+					newText,
+				}];
 			}
 		}
 
diff --git a/packages/vue-language-service/src/documentService.ts b/packages/vue-language-service/src/documentService.ts
index f5327bfde..8fa78a791 100644
--- a/packages/vue-language-service/src/documentService.ts
+++ b/packages/vue-language-service/src/documentService.ts
@@ -70,17 +70,7 @@ export function getDocumentService(
 		ts,
 		getVueDocument: doc => vueDocuments.get(doc),
 	});
-
-	// formatter plugins
 	const pugFormatPlugin = usePugFormatPlugin();
-	const formatPlugns = [
-		...customPlugins,
-		cssPlugin,
-		htmlPlugin,
-		pugFormatPlugin,
-		jsonPlugin,
-		tsPlugin,
-	].map(patchHtmlFormat);
 
 	const context: DocumentServiceRuntimeContext = {
 		typescript: ts,
@@ -91,15 +81,13 @@ export function getDocumentService(
 				vuePlugin,
 				htmlPlugin,
 				pugPlugin,
+				pugFormatPlugin,
 				cssPlugin,
 				jsonPlugin,
 				tsPlugin,
 				autoWrapParenthesesPlugin,
 			];
 		},
-		getFormatPlugins() {
-			return formatPlugns;
-		},
 		updateTsLs(document) {
 			if (isTsDocument(document)) {
 				tsLs = getSingleFileTypeScriptService(context.typescript, ts2, document, tsSettings);
@@ -143,45 +131,3 @@ export function getDocumentService(
 		return vueDoc;
 	}
 }
-
-function patchHtmlFormat<T extends EmbeddedLanguageServicePlugin>(htmlPlugin: T) {
-
-	const originalFormat = htmlPlugin.format;
-
-	if (originalFormat) {
-
-		htmlPlugin.format = async (document, range, options) => {
-
-			if (document.languageId === 'html') {
-
-				const prefixes = '<template>';
-				const suffixes = '</template>';
-
-				const patchDocument = TextDocument.create(document.uri, document.languageId, document.version, prefixes + document.getText() + suffixes);
-				const result = await originalFormat?.(patchDocument, {
-					start: patchDocument.positionAt(0),
-					end: patchDocument.positionAt(patchDocument.getText().length),
-				}, options);
-
-				if (!result?.length)
-					return result;
-
-				let newText = TextDocument.applyEdits(patchDocument, result);
-				newText = newText.trim();
-				newText = newText.substring(prefixes.length, newText.length - suffixes.length);
-
-				return [{
-					newText,
-					range: {
-						start: document.positionAt(0),
-						end: document.positionAt(document.getText().length),
-					}
-				}];
-			}
-
-			return originalFormat?.(document, range, options);
-		};
-	}
-
-	return htmlPlugin;
-}
diff --git a/packages/vue-language-service/src/plugins/css.ts b/packages/vue-language-service/src/plugins/css.ts
index f517bf84e..a234d2b28 100644
--- a/packages/vue-language-service/src/plugins/css.ts
+++ b/packages/vue-language-service/src/plugins/css.ts
@@ -191,26 +191,16 @@ export default function (options: {
 			return worker(document, async (stylesheet, cssLs) => {
 
 				const options_2 = await useConfigurationHost()?.getConfiguration<css.CSSFormatConfiguration & { enable: boolean; }>(document.languageId + '.format', document.uri);
-				const initialIndent = await useConfigurationHost()?.getConfiguration<boolean>('volar.initialIndent') ?? false;
 
 				if (options_2?.enable === false) {
 					return;
 				}
 
-				let indentedDocument = document;
-				if (initialIndent && range.start.line === 0) {
-					const newText =
-						document
-						.getText()
-						.replace(/^[^\S\r\n]*/, options.insertSpaces ? ' '.repeat(options.tabSize) : '\t');
-					indentedDocument = TextDocument.create(document.uri, document.languageId, document.version + 1, newText);
-				}
-
-				const edits = cssLs.format(indentedDocument, range, {
+				const edits = cssLs.format(document, range, {
 					...options_2,
 					...options,
 				});
-				let newText = TextDocument.applyEdits(indentedDocument, edits);
+				let newText = TextDocument.applyEdits(document, edits);
 
 				// fix https://github.com/johnsoncodehk/volar/issues/1155
 				if (!newText.startsWith('\n'))
@@ -219,12 +209,12 @@ export default function (options: {
 				if (!newText.endsWith('\n'))
 					newText = newText + '\n';
 
-				if (newText === indentedDocument.getText())
+				if (newText === document.getText())
 					return [];
 
 				return [vscode.TextEdit.replace({
-					start: indentedDocument.positionAt(0),
-					end: indentedDocument.positionAt(indentedDocument.getText().length),
+					start: document.positionAt(0),
+					end: document.positionAt(document.getText().length),
 				}, newText)];
 			});
 		},
diff --git a/packages/vue-language-service/src/plugins/html.ts b/packages/vue-language-service/src/plugins/html.ts
index 16494e511..1a374cc55 100644
--- a/packages/vue-language-service/src/plugins/html.ts
+++ b/packages/vue-language-service/src/plugins/html.ts
@@ -108,10 +108,20 @@ export default function (options: {
 					return;
 				}
 
-				return htmlLs.format(document, range, {
+				const edits = htmlLs.format(document, range, {
 					...options_2,
 					...options,
 				});
+
+				const newText = TextDocument.applyEdits(document, edits);
+				
+				return [{
+					newText: '\n' + newText.trim() + '\n',
+					range: {
+						start: document.positionAt(0),
+						end: document.positionAt(document.getText().length),
+					},
+				}]
 			});
 		},
 
diff --git a/packages/vue-language-service/src/plugins/json.ts b/packages/vue-language-service/src/plugins/json.ts
index 5450d4d15..992ed0bd2 100644
--- a/packages/vue-language-service/src/plugins/json.ts
+++ b/packages/vue-language-service/src/plugins/json.ts
@@ -93,19 +93,12 @@ export default function (options: {
 			return worker(document, async (jsonDocument) => {
 
 				const options_2 = await useConfigurationHost()?.getConfiguration<json.FormattingOptions & { enable: boolean; }>('json.format', document.uri);
-				const initialIndent = await useConfigurationHost()?.getConfiguration<boolean>('volar.initialIndent') ?? false;
 
 				if (options_2?.enable === false) {
 					return;
 				}
 
-				let indentedDocument = document;
-				if (initialIndent) {
-					const newText = `{${document.getText()}}`;
-					indentedDocument = TextDocument.create(document.uri, document.languageId, document.version + 1, newText);
-				}
-
-				const edits = jsonLs.format(indentedDocument, range, {
+				const edits = jsonLs.format(document, range, {
 					...options_2,
 					...options,
 					insertFinalNewline: true,
@@ -115,17 +108,13 @@ export default function (options: {
 					return edits;
 				}
 
-				let newText = TextDocument.applyEdits(indentedDocument, edits);
-				if (initialIndent) {
-					newText = newText.trim().substring(1, newText.length - 2);
-					newText = newText.replace(/\A[\r\n]+|[\r\n]+/m, '').trimEnd();
-				}
-
+				const newText = TextDocument.applyEdits(document, edits);
+				
 				return [{
-					newText: '\n' + (initialIndent ? newText : newText.trim()) + '\n',
+					newText: '\n' + newText.trim() + '\n',
 					range: {
-						start: indentedDocument.positionAt(0),
-						end: indentedDocument.positionAt(indentedDocument.getText().length),
+						start: document.positionAt(0),
+						end: document.positionAt(document.getText().length),
 					},
 				}]
 			});
diff --git a/packages/vue-language-service/src/plugins/typescript.ts b/packages/vue-language-service/src/plugins/typescript.ts
index af745e575..6539f76d8 100644
--- a/packages/vue-language-service/src/plugins/typescript.ts
+++ b/packages/vue-language-service/src/plugins/typescript.ts
@@ -244,13 +244,12 @@ export default function (options: {
 			if (isTsDocument(document)) {
 
 				const enable = await useConfigurationHost()?.getConfiguration<boolean>(getConfigTitle(document) + '.format.enable', document.uri);
-				const initialIndent = await useConfigurationHost()?.getConfiguration<boolean>('volar.initialIndent') ?? false;
 
 				if (enable === false) {
 					return;
 				}
 
-				return options.getTsLs().doFormatting.onRange(document.uri, options_2, range, initialIndent ? 1 : undefined);
+				return options.getTsLs().doFormatting.onRange(document.uri, options_2, range);
 			}
 		},
 
diff --git a/packages/vue-language-service/src/types.ts b/packages/vue-language-service/src/types.ts
index 72e9d1942..7f0134435 100644
--- a/packages/vue-language-service/src/types.ts
+++ b/packages/vue-language-service/src/types.ts
@@ -8,7 +8,6 @@ export interface DocumentServiceRuntimeContext {
 	typescript: typeof import('typescript/lib/tsserverlibrary');
 	getVueDocument(document: TextDocument): VueDocument | undefined;
 	getPlugins(): EmbeddedLanguageServicePlugin[];
-	getFormatPlugins(): EmbeddedLanguageServicePlugin[];
 	updateTsLs(document: TextDocument): void;
 };
 

From 512985d191027061343b0cb37e833df4924abcdf Mon Sep 17 00:00:00 2001
From: johnsoncodehk <johnsoncodehk@gmail.com>
Date: Tue, 6 Sep 2022 06:58:24 +0800
Subject: [PATCH 4/4] chore: move `baseIndentSize` into format options

---
 packages/typescript-language-service/src/index.ts        | 2 +-
 .../src/services/formatting.ts                           | 5 +----
 packages/vue-language-service/src/tsConfigs.ts           | 9 +++------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/typescript-language-service/src/index.ts b/packages/typescript-language-service/src/index.ts
index 47e9a0222..586dbc233 100644
--- a/packages/typescript-language-service/src/index.ts
+++ b/packages/typescript-language-service/src/index.ts
@@ -34,7 +34,7 @@ export interface LanguageService extends ReturnType<typeof createLanguageService
 export { getSemanticTokenLegend } from './services/semanticTokens';
 
 export interface Settings {
-	getFormatOptions?(uri: string, options?: vscode.FormattingOptions, baseTabSize?: number): Promise<ts.FormatCodeSettings>;
+	getFormatOptions?(uri: string, options?: vscode.FormattingOptions): Promise<ts.FormatCodeSettings>;
 	getPreferences?(uri: string): Promise<ts.UserPreferences>;
 }
 
diff --git a/packages/typescript-language-service/src/services/formatting.ts b/packages/typescript-language-service/src/services/formatting.ts
index c8f91dc70..b2e7f5427 100644
--- a/packages/typescript-language-service/src/services/formatting.ts
+++ b/packages/typescript-language-service/src/services/formatting.ts
@@ -10,7 +10,7 @@ export function register(
 	settings: Settings
 ) {
 	return {
-		onRange: async (uri: string, options: vscode.FormattingOptions, range?: vscode.Range, baseIndentLevel?: number): Promise<vscode.TextEdit[]> => {
+		onRange: async (uri: string, options: vscode.FormattingOptions, range?: vscode.Range): Promise<vscode.TextEdit[]> => {
 
 			const document = getTextDocument(uri);
 			if (!document) return [];
@@ -20,9 +20,6 @@ export function register(
 			if (typeof(tsOptions.indentSize) === "boolean" || typeof(tsOptions.indentSize) === "string") {
 				tsOptions.indentSize = undefined;
 			}
-			if (baseIndentLevel && tsOptions.indentSize) {
-				tsOptions.baseIndentSize = (tsOptions.indentSize * baseIndentLevel);
-			}
 
 			let scriptEdits: ReturnType<typeof languageService.getFormattingEditsForRange> | undefined;
 			try {
diff --git a/packages/vue-language-service/src/tsConfigs.ts b/packages/vue-language-service/src/tsConfigs.ts
index f518f0c4b..0afe63b48 100644
--- a/packages/vue-language-service/src/tsConfigs.ts
+++ b/packages/vue-language-service/src/tsConfigs.ts
@@ -5,7 +5,7 @@ import { ConfigurationHost } from '@volar/vue-language-service-types';
 
 export function getTsSettings(configurationHost: ConfigurationHost | undefined) {
 	const tsSettings: ts2.Settings = {
-		getFormatOptions: (uri, options, baseTabSize) => getFormatOptions(configurationHost, uri, options, baseTabSize),
+		getFormatOptions: (uri, options) => getFormatOptions(configurationHost, uri, options),
 		getPreferences: (uri) => getPreferences(configurationHost, uri),
 	};
 	return tsSettings;
@@ -14,8 +14,7 @@ export function getTsSettings(configurationHost: ConfigurationHost | undefined)
 export async function getFormatOptions(
 	configurationHost: ConfigurationHost | undefined,
 	uri: string,
-	options?: vscode.FormattingOptions,
-	baseTabSize?: number
+	options?: vscode.FormattingOptions & ts.FormatCodeSettings,
 ): Promise<ts.FormatCodeSettings> {
 
 	let config = await configurationHost?.getConfiguration<any>(isTypeScriptDocument(uri) ? 'typescript.format' : 'javascript.format', uri);
@@ -23,9 +22,7 @@ export async function getFormatOptions(
 	config = config ?? {};
 
 	return {
-		tabSize: options?.tabSize,
-		indentSize: options?.tabSize,
-		baseIndentSize: baseTabSize,
+		...options,
 		convertTabsToSpaces: options?.insertSpaces,
 		// We can use \n here since the editor normalizes later on to its line endings.
 		newLineCharacter: '\n',