feat: add processHtmlFile, processMdFile to settings

vuejs · Sep 16, 2022 · 7ae2f6b · 7ae2f6b
1 parent 38d6862
commit 7ae2f6b
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 35 deletions.
diff --git a/extensions/vscode-vue-language-features/package.json b/extensions/vscode-vue-language-features/package.json
@@ -50,11 +50,6 @@
 		}
 	},
 	"contributes": {
-		"configurationDefaults": {
-			"[markdown]": {
-				"editor.quickSuggestions": true
-			}
-		},
 		"views": {
 			"explorer": [
 				{
@@ -307,6 +302,14 @@
 					"default": "off",
 					"description": "Traces the communication between VS Code and the language server."
 				},
+				"volar.vueserver.petiteVue.processHtmlFile": {
+					"type": "boolean",
+					"default": false
+				},
+				"volar.vueserver.vitePress.processMdFile": {
+					"type": "boolean",
+					"default": false
+				},
 				"volar.vueserver.textDocumentSync": {
 					"type": "string",
 					"default": "incremental",

diff --git a/extensions/vscode-vue-language-features/src/common.ts b/extensions/vscode-vue-language-features/src/common.ts
@@ -18,7 +18,7 @@ import * as doctor from './features/doctor';
 import * as fileReferences from './features/fileReferences';
 import * as reloadProject from './features/reloadProject';
 import * as serverSys from './features/serverSys';
-import { ServerInitializationOptions } from '@volar/vue-language-server';
+import { VueServerInitializationOptions } from '@volar/vue-language-server';
 
 let apiClient: lsp.BaseLanguageClient | undefined;
 let docClient: lsp.BaseLanguageClient | undefined;
@@ -28,7 +28,7 @@ type CreateLanguageClient = (
 	id: string,
 	name: string,
 	documentSelector: lsp.DocumentSelector,
-	initOptions: ServerInitializationOptions,
+	initOptions: VueServerInitializationOptions,
 	port: number,
 ) => Promise<lsp.BaseLanguageClient>;
 
@@ -47,7 +47,7 @@ export async function activate(context: vscode.ExtensionContext, createLc: Creat
 		}
 
 		const currentlangId = vscode.window.activeTextEditor.document.languageId;
-		if (currentlangId === 'vue' || currentlangId === 'markdown' || currentlangId === 'html') {
+		if (currentlangId === 'vue' || (currentlangId === 'markdown' && processMd()) || (currentlangId === 'html' && processHtml())) {
 			doActivate(context, createLc);
 			stopCheck.dispose();
 		}
@@ -67,18 +67,14 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 	const takeOverMode = takeOverModeEnabled();
 	const languageFeaturesDocumentSelector: lsp.DocumentSelector = takeOverMode ?
 		[
-			{ /* scheme: 'file', */ language: 'vue' },
-			{ /* scheme: 'file', */ language: 'markdown' },
-			{ /* scheme: 'file', */ language: 'html' },
-			{ /* scheme: 'file', */ language: 'javascript' },
-			{ /* scheme: 'file', */ language: 'typescript' },
-			{ /* scheme: 'file', */ language: 'javascriptreact' },
-			{ /* scheme: 'file', */ language: 'typescriptreact' },
-			{ /* scheme: 'file', */ language: 'json' },
+			{ language: 'vue' },
+			{ language: 'javascript' },
+			{ language: 'typescript' },
+			{ language: 'javascriptreact' },
+			{ language: 'typescriptreact' },
+			{ language: 'json' },
 		] : [
-			{ /* scheme: 'file', */ language: 'vue' },
-			{ /* scheme: 'file', */ language: 'markdown' },
-			{ /* scheme: 'file', */ language: 'html' },
+			{ language: 'vue' },
 		];
 	const documentFeaturesDocumentSelector: lsp.DocumentSelector = takeOverMode ?
 		[
@@ -91,10 +87,16 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 			{ language: 'vue' },
 		];
 
-	if (enabledDocumentFeaturesInHtml()) {
+	if (processHtml()) {
+		languageFeaturesDocumentSelector.push({ language: 'html' });
 		documentFeaturesDocumentSelector.push({ language: 'html' });
 	}
 
+	if (processMd()) {
+		languageFeaturesDocumentSelector.push({ language: 'markdown' });
+		documentFeaturesDocumentSelector.push({ language: 'markdown' });
+	}
+
 	const _useSecondServer = useSecondServer();
 	const _serverMaxOldSpaceSize = serverMaxOldSpaceSize();
 
@@ -210,10 +212,6 @@ export function takeOverModeEnabled() {
 	return false;
 }
 
-function enabledDocumentFeaturesInHtml() {
-	return !vscode.extensions.getExtension('vscode.html-language-features');
-}
-
 function useSecondServer() {
 	return !!vscode.workspace.getConfiguration('volar').get<boolean>('vueserver.useSecondServer');
 }
@@ -222,13 +220,27 @@ function serverMaxOldSpaceSize() {
 	return vscode.workspace.getConfiguration('volar').get<number | null>('vueserver.maxOldSpaceSize');
 }
 
+function processHtml() {
+	return !!vscode.workspace.getConfiguration('volar').get<boolean>('vueserver.petiteVue.processHtmlFile');
+}
+
+function processMd() {
+	return !!vscode.workspace.getConfiguration('volar').get<boolean>('vueserver.vitePress.processMdFile');
+}
+
 function getInitializationOptions(
 	context: vscode.ExtensionContext,
 	mode: 'main-language-features' | 'second-language-features' | 'document-features',
 	useSecondServer: boolean,
 ) {
 	const textDocumentSync = vscode.workspace.getConfiguration('volar').get<'incremental' | 'full' | 'none'>('vueserver.textDocumentSync');
-	const initializationOptions: ServerInitializationOptions = {
+	const initializationOptions: VueServerInitializationOptions = {
+		petiteVue: {
+			processHtmlFile: processHtml(),
+		},
+		vitePress: {
+			processMdFile: processMd(),
+		},
 		textDocumentSync: textDocumentSync ? {
 			incremental: lsp.TextDocumentSyncKind.Incremental,
 			full: lsp.TextDocumentSyncKind.Full,

diff --git a/packages/vue-language-server/src/index.ts b/packages/vue-language-server/src/index.ts
@@ -1,3 +1,4 @@
 export * from '@volar/language-server';
 export * from './requests';
+export * from './types';
 
diff --git a/packages/vue-language-server/src/plugin.ts b/packages/vue-language-server/src/plugin.ts
@@ -1,18 +1,10 @@
 import * as embedded from '@volar/language-core';
-import { LanguageServerPlugin, ServerInitializationOptions } from '@volar/language-server';
+import { LanguageServerPlugin } from '@volar/language-server';
 import * as shared from '@volar/shared';
 import * as vue from '@volar/vue-language-service';
 import * as nameCasing from '@volar/vue-language-service/out/ideFeatures/nameCasing';
 import { DetectTagCasingRequest, GetConvertTagCasingEditsRequest } from './requests';
-
-type VueServerInitializationOptions = ServerInitializationOptions & {
-	petiteVue?: {
-		processHtmlFile: boolean,
-	},
-	vitePress?: {
-		processMdFile: boolean,
-	},
-};
+import { VueServerInitializationOptions } from './types';
 
 const plugin: LanguageServerPlugin<VueServerInitializationOptions, vue.LanguageServiceHost> = (initOptions) => {
 

diff --git a/packages/vue-language-server/src/types.ts b/packages/vue-language-server/src/types.ts
@@ -0,0 +1,10 @@
+import { ServerInitializationOptions } from "@volar/language-server";
+
+export type VueServerInitializationOptions = ServerInitializationOptions & {
+	petiteVue?: {
+		processHtmlFile: boolean,
+	},
+	vitePress?: {
+		processMdFile: boolean,
+	},
+};