feat: redesign additional extensions, VitePress, PetiteVue support (#…

…4321)
vuejs · Apr 28, 2024 · f49e1b8 · f49e1b8
1 parent 80118ac
commit f49e1b8
Show file tree

Hide file tree

Showing 20 changed files with 264 additions and 303 deletions.
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -90,10 +90,7 @@
 			{
 				"name": "typescript-vue-plugin-bundle",
 				"enableForWorkspaceTypeScriptVersions": true,
-				"configNamespace": "typescript",
-				"languages": [
-					"vue"
-				]
+				"configNamespace": "typescript"
 			}
 		],
 		"grammars": [
@@ -236,32 +233,20 @@
 					],
 					"description": "Vue language server only handles CSS and HTML language support, and tsserver takes over TS language support via TS plugin."
 				},
+				"vue.server.includeLanguages": {
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"default": [
+						"vue"
+					]
+				},
 				"vue.server.maxFileSize": {
 					"type": "number",
 					"default": 20971520,
 					"description": "Maximum file size for Vue Language Server to load. (default: 20MB)"
 				},
-				"vue.server.petiteVue.supportHtmlFile": {
-					"type": "boolean",
-					"default": false
-				},
-				"vue.server.vitePress.supportMdFile": {
-					"type": "boolean",
-					"default": false
-				},
-				"vue.server.diagnosticModel": {
-					"type": "string",
-					"default": "push",
-					"enum": [
-						"push",
-						"pull"
-					],
-					"enumDescriptions": [
-						"Diagnostic push by language server.",
-						"Diagnostic pull by language client."
-					],
-					"description": "Diagnostic update model."
-				},
 				"vue.server.maxOldSpaceSize": {
 					"type": [
 						"number",
@@ -270,14 +255,6 @@
 					"default": null,
 					"description": "Set --max-old-space-size option on server process. If you have problem on frequently \"Request textDocument/** failed.\" error, try setting higher memory(MB) on it."
 				},
-				"vue.server.additionalExtensions": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					},
-					"default": [],
-					"description": "List any additional file extensions that should be processed as Vue files (requires restart)."
-				},
 				"vue.doctor.status": {
 					"type": "boolean",
 					"default": true,
@@ -290,6 +267,9 @@
 				},
 				"vue.splitEditors.layout.left": {
 					"type": "array",
+					"items": {
+						"type": "string"
+					},
 					"default": [
 						"script",
 						"scriptSetup",
@@ -298,6 +278,9 @@
 				},
 				"vue.splitEditors.layout.right": {
 					"type": "array",
+					"items": {
+						"type": "string"
+					},
 					"default": [
 						"template",
 						"customBlocks"

diff --git a/extensions/vscode/src/common.ts b/extensions/vscode/src/common.ts
@@ -15,7 +15,7 @@ let client: lsp.BaseLanguageClient;
 type CreateLanguageClient = (
 	id: string,
 	name: string,
-	langs: lsp.DocumentFilter[],
+	langs: lsp.DocumentSelector,
 	initOptions: VueInitializationOptions,
 	port: number,
 	outputChannel: vscode.OutputChannel,
@@ -27,11 +27,7 @@ export async function activate(context: vscode.ExtensionContext, createLc: Creat
 	tryActivate();
 
 	function tryActivate() {
-		if (
-			vscode.window.visibleTextEditors.some(editor => editor.document.languageId === 'vue')
-			|| (config.server.vitePress.supportMdFile && vscode.window.visibleTextEditors.some(editor => editor.document.languageId === 'markdown'))
-			|| (config.server.petiteVue.supportHtmlFile && vscode.window.visibleTextEditors.some(editor => editor.document.languageId === 'html'))
-		) {
+		if (vscode.window.visibleTextEditors.some(editor => config.server.includeLanguages.includes(editor.document.languageId))) {
 			doActivate(context, createLc);
 			stopCheck.dispose();
 		}
@@ -210,30 +206,22 @@ function getCurrentHybridModeStatus(report = false) {
 
 async function doActivate(context: vscode.ExtensionContext, createLc: CreateLanguageClient) {
 
+	vscode.commands.executeCommand('setContext', 'vue.activated', true);
+
 	getCurrentHybridModeStatus(true);
 
 	const outputChannel = vscode.window.createOutputChannel('Vue Language Server');
-
-	vscode.commands.executeCommand('setContext', 'vue.activated', true);
+	const selectors = config.server.includeLanguages;
 
 	client = createLc(
 		'vue',
 		'Vue',
-		getDocumentSelector(),
+		selectors,
 		await getInitializationOptions(context, enabledHybridMode),
 		6009,
 		outputChannel
 	);
 
-	const selectors: vscode.DocumentFilter[] = [{ language: 'vue' }];
-
-	if (config.server.petiteVue.supportHtmlFile) {
-		selectors.push({ language: 'html' });
-	}
-	if (config.server.vitePress.supportMdFile) {
-		selectors.push({ language: 'markdown' });
-	}
-
 	activateConfigWatcher();
 	activateRestartRequest();
 
@@ -410,6 +398,16 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 					);
 				}
 			}
+			else if (e.affectsConfiguration('vue.server')) {
+				if (enabledHybridMode) {
+					if (e.affectsConfiguration('vue.server.includeLanguages')) {
+						requestReloadVscode('Please reload VSCode to apply the new language settings.');
+					}
+				}
+				else {
+					vscode.commands.executeCommand('vue.action.restartServer', false);
+				}
+			}
 			else if (e.affectsConfiguration('vue')) {
 				vscode.commands.executeCommand('vue.action.restartServer', false);
 			}
@@ -434,25 +432,12 @@ export function deactivate(): Thenable<any> | undefined {
 	return client?.stop();
 }
 
-export function getDocumentSelector(): lsp.DocumentFilter[] {
-	const selectors: lsp.DocumentFilter[] = [];
-	selectors.push({ language: 'vue' });
-	if (config.server.petiteVue.supportHtmlFile) {
-		selectors.push({ language: 'html' });
-	}
-	if (config.server.vitePress.supportMdFile) {
-		selectors.push({ language: 'markdown' });
-	}
-	return selectors;
-}
-
 async function getInitializationOptions(
 	context: vscode.ExtensionContext,
 	hybridMode: boolean,
 ): Promise<VueInitializationOptions> {
 	return {
-		// volar
-		diagnosticModel: config.server.diagnosticModel === 'pull' ? DiagnosticModel.Pull : DiagnosticModel.Push,
+		diagnosticModel: enabledHybridMode ? DiagnosticModel.Pull : DiagnosticModel.Push,
 		typescript: { tsdk: (await lsp.getTsdk(context)).tsdk },
 		maxFileSize: config.server.maxFileSize,
 		semanticTokensLegend: {
@@ -461,11 +446,6 @@ async function getInitializationOptions(
 		},
 		vue: {
 			hybridMode,
-			additionalExtensions: [
-				...config.server.additionalExtensions,
-				...!config.server.petiteVue.supportHtmlFile ? [] : ['html'],
-				...!config.server.vitePress.supportMdFile ? [] : ['md'],
-			],
 		},
 	};
 };
diff --git a/extensions/vscode/src/config.ts b/extensions/vscode/src/config.ts
@@ -16,17 +16,10 @@ export const config = {
 		return _config().get('doctor')!;
 	},
 	get server(): Readonly<{
+		includeLanguages: string[];
 		hybridMode: 'auto' | 'typeScriptPluginOnly' | boolean;
 		maxOldSpaceSize: number;
 		maxFileSize: number;
-		diagnosticModel: 'push' | 'pull';
-		additionalExtensions: string[];
-		vitePress: {
-			supportMdFile: boolean;
-		};
-		petiteVue: {
-			supportHtmlFile: boolean;
-		};
 	}> {
 		return _config().get('server')!;
 	},

diff --git a/extensions/vscode/src/features/doctor.ts b/extensions/vscode/src/features/doctor.ts
@@ -231,9 +231,20 @@ export async function register(context: vscode.ExtensionContext, client: BaseLan
 			});
 		}
 
-		// check outdated vue language plugins
-		// check node_modules has more than one vue versions
-		// check ESLint, Prettier...
+		if (
+			vscode.workspace.getConfiguration('vue').has('server.additionalExtensions')
+			|| vscode.workspace.getConfiguration('vue').has('server.petiteVue.supportHtmlFile')
+			|| vscode.workspace.getConfiguration('vue').has('server.vitePress.supportMdFile')
+		) {
+			problems.push({
+				title: 'Deprecated configuration',
+				message: [
+					'`vue.server.additionalExtensions`, `vue.server.petiteVue.supportHtmlFile`, and `vue.server.vitePress.supportMdFile` are deprecated. Please remove them from your settings.',
+					'',
+					'- PR: https://github.com/vuejs/language-tools/pull/4321',
+				].join('\n'),
+			});
+		}
 
 		return problems;
 	}

diff --git a/extensions/vscode/src/features/nameCasing.ts b/extensions/vscode/src/features/nameCasing.ts
@@ -136,11 +136,7 @@ export async function activate(_context: vscode.ExtensionContext, client: BaseLa
 	}
 
 	async function update(document: vscode.TextDocument | undefined) {
-		if (
-			document?.languageId === 'vue'
-			|| (config.server.vitePress.supportMdFile && document?.languageId === 'markdown')
-			|| (config.server.petiteVue.supportHtmlFile && document?.languageId === 'html')
-		) {
+		if (document && vscode.languages.match(selector, document)) {
 			let detected: Awaited<ReturnType<typeof detect>> | undefined;
 			let attrNameCasing = attrNameCasings.get(document.uri.toString());
 			let tagNameCasing = tagNameCasings.get(document.uri.toString());

diff --git a/extensions/vscode/src/nodeClientMain.ts b/extensions/vscode/src/nodeClientMain.ts
@@ -35,7 +35,7 @@ export async function activate(context: vscode.ExtensionContext) {
 			runOptions.execArgv.push("--max-old-space-size=" + config.server.maxOldSpaceSize);
 		}
 		const debugOptions: lsp.ForkOptions = { execArgv: ['--nolazy', '--inspect=' + port] };
-		let serverOptions: lsp.ServerOptions = {
+		const serverOptions: lsp.ServerOptions = {
 			run: {
 				module: serverModule.fsPath,
 				transport: lsp.TransportKind.ipc,
@@ -55,7 +55,7 @@ export async function activate(context: vscode.ExtensionContext) {
 				isTrusted: true,
 				supportHtml: true,
 			},
-			outputChannel
+			outputChannel,
 		};
 		const client = new _LanguageClient(
 			id,
@@ -145,18 +145,17 @@ try {
 					s => s + `.filter(p=>p.name!=='typescript-vue-plugin-bundle')`
 				);
 			}
-			else if (!enabledHybridMode) {
+			else if (enabledHybridMode) {
 				// patch readPlugins
 				text = text.replace(
 					'languages:Array.isArray(e.languages)',
 					[
 						'languages:',
-						`e.name==='typescript-vue-plugin-bundle'?[]:`,
-						'Array.isArray(e.languages)',
+						`e.name==='typescript-vue-plugin-bundle'?[${config.server.includeLanguages.map(lang => `"${lang}"`).join(',')}]`,
+						':Array.isArray(e.languages)',
 					].join(''),
 				);
-			}
-			else {
+
 				// VSCode < 1.87.0
 				text = text.replace('t.$u=[t.$r,t.$s,t.$p,t.$q]', s => s + '.concat("vue")'); // patch jsTsLanguageModes
 				text = text.replace('.languages.match([t.$p,t.$q,t.$r,t.$s]', s => s + '.concat("vue")'); // patch isSupportedLanguageMode

diff --git a/packages/component-meta/lib/base.ts b/packages/component-meta/lib/base.ts
@@ -92,6 +92,12 @@ function createCheckerWorker(
 			if (parsedCommandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext))) {
 				return 'vue';
 			}
+			if (parsedCommandLine.vueOptions.vitePressExtensions.some(ext => fileName.endsWith(ext))) {
+				return 'markdown';
+			}
+			if (parsedCommandLine.vueOptions.petiteVueExtensions.some(ext => fileName.endsWith(ext))) {
+				return 'html';
+			}
 			return vue.resolveCommonLanguageId(fileName);
 		},
 		scriptIdToFileName: id => id,