feat: use vscode-html-languageservice formatter instead of `prettyh…

…tml` close #1078
vuejs · Apr 3, 2022 · 54bd095 · 54bd095
1 parent 8317859
commit 54bd095
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 1,164 deletions.
diff --git a/extensions/vscode-vue-language-features/src/common.ts b/extensions/vscode-vue-language-features/src/common.ts
@@ -7,7 +7,6 @@ import * as callGraph from './features/callGraph';
 import * as createWorkspaceSnippets from './features/createWorkspaceSnippets';
 import * as documentVersion from './features/documentVersion';
 import * as documentContent from './features/documentContent';
-import * as documentPrintWidth from './features/documentPrintWidth';
 import * as preview from './features/preview';
 import * as showReferences from './features/showReferences';
 import * as splitEditors from './features/splitEditors';
@@ -170,7 +169,6 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 			showReferences.activate(context, client);
 			documentVersion.activate(context, client);
 			documentContent.activate(context, client);
-			documentPrintWidth.activate(context, client);
 			activeSelection.activate(context, client);
 		}
 
@@ -250,10 +248,7 @@ function getInitializationOptions(
 			linkedEditingRange: true,
 			documentSymbol: true,
 			documentColor: true,
-			documentFormatting: {
-				defaultPrintWidth: 100,
-				getDocumentPrintWidthRequest: true,
-			},
+			documentFormatting: true,
 		} : undefined,
 		initializationMessage: initMessage,
 	};

diff --git a/extensions/vscode-vue-language-features/src/features/documentPrintWidth.ts b/extensions/vscode-vue-language-features/src/features/documentPrintWidth.ts
diff --git a/package.json b/package.json
@@ -18,8 +18,5 @@
 		"lerna": "latest",
 		"typescript": "latest",
 		"vitest": "^0.8.4"
-	},
-	"resolutions": {
-		"to-vfile": "7.1.0"
 	}
 }
diff --git a/packages/shared/src/types.ts b/packages/shared/src/types.ts
@@ -79,13 +79,7 @@ export interface ServerInitializationOptions {
 		linkedEditingRange?: boolean
 		documentSymbol?: boolean
 		documentColor?: boolean
-		documentFormatting?: {
-			defaultPrintWidth: number,
-			/**
-			 * {@link __requests.GetDocumentPrintWidthRequest}
-			 * */
-			getDocumentPrintWidthRequest?: boolean,
-		},
+		documentFormatting?: boolean,
 	}
 	initializationMessage?: string
 }
diff --git a/packages/vue-language-server/src/common.ts b/packages/vue-language-server/src/common.ts
@@ -64,15 +64,6 @@ export function createLanguageServer(connection: vscode.Connection, runtimeEnv:
 			const ts = runtimeEnv.loadTypescript(options);
 			const documentService = vue.getDocumentService(
 				{ typescript: ts },
-				async (uri) => {
-					if (options.documentFeatures?.documentFormatting?.getDocumentPrintWidthRequest) {
-						const response = await connection.sendRequest(shared.GetDocumentPrintWidthRequest.type, { uri });
-						if (response !== undefined) {
-							return response;
-						}
-					}
-					return options.documentFeatures?.documentFormatting?.defaultPrintWidth ?? 100;
-				},
 				configHost,
 				runtimeEnv.fileSystemProvide,
 				loadCustomPlugins(folders[0]),

diff --git a/packages/vue-language-service/package.json b/packages/vue-language-service/package.json
@@ -19,7 +19,6 @@
 	},
 	"dependencies": {
 		"@johnsoncodehk/pug-beautify": "^0.2.2",
-		"@starptech/prettyhtml": "^0.10.0",
 		"@volar/html2pug": "0.33.9",
 		"@volar/pug-language-service": "0.33.9",
 		"@volar/shared": "0.33.9",
@@ -44,7 +43,6 @@
 	},
 	"browser": {
 		"./out/commonPlugins/prettier.js": "./out/commonPlugins/empty.js",
-		"./out/commonPlugins/prettyhtml.js": "./out/commonPlugins/empty.js",
 		"./out/commonPlugins/emmet.js": "./out/commonPlugins/empty.js",
 		"./out/commonPlugins/pug.js": "./out/commonPlugins/empty.js",
 		"./out/vuePlugins/htmlPugConversions.js": "./out/commonPlugins/empty.js"

diff --git a/packages/vue-language-service/src/commonPlugins/prettyhtml.ts b/packages/vue-language-service/src/commonPlugins/prettyhtml.ts
diff --git a/packages/vue-language-service/src/documentService.ts b/packages/vue-language-service/src/documentService.ts
@@ -9,7 +9,6 @@ import useCssPlugin from './commonPlugins/css';
 import useHtmlPlugin from './commonPlugins/html';
 import useJsonPlugin from './commonPlugins/json';
 import usePrettierPlugin from './commonPlugins/prettier';
-import usePrettyhtmlPlugin from './commonPlugins/prettyhtml';
 import usePugPlugin from './commonPlugins/pug';
 import usePugFormatPlugin from './commonPlugins/pugBeautify';
 import useSassFormatPlugin from './commonPlugins/sassFormatter';
@@ -34,7 +33,6 @@ export interface DocumentService extends ReturnType<typeof getDocumentService> {
 
 export function getDocumentService(
 	{ typescript: ts }: { typescript: typeof import('typescript/lib/tsserverlibrary') },
-	getPrintWidth: (uri: string) => Promise<number>,
 	configurationHost: ConfigurationHost | undefined,
 	fileSystemProvider: html.FileSystemProvider | undefined,
 	customPlugins: EmbeddedLanguageServicePlugin[],
@@ -74,13 +72,11 @@ export function getDocumentService(
 
 	// formatter plugins
 	const cssFormatPlugin = usePrettierPlugin({ allowLanguageIds: ['css', 'less', 'scss', 'postcss'] });
-	const prettyhtmlPlugin = usePrettyhtmlPlugin({ getPrintWidth });
 	const pugFormatPlugin = usePugFormatPlugin();
 	const sassFormatPlugin = useSassFormatPlugin();
 	const formatPlugns = [
 		...customPlugins,
 		cssFormatPlugin,
-		prettyhtmlPlugin, // ignore in browser
 		htmlPlugin,
 		pugFormatPlugin,
 		sassFormatPlugin,