refactor(framework): move __VLS_ filters to vue-language-tools/*

Author: johnsoncodehk

packages/language-service/src/languageFeatures/codeActions.ts

@@ -115,9 +115,6 @@ export function register(context: LanguageServiceRuntimeContext) {
 		);
 
 		if (codeActions) {
-
-			codeActions = codeActions.filter(codeAction => codeAction.title.indexOf('__VLS_') === -1);
-
 			return dedupe.withCodeAction(codeActions);
 		}
 	};

packages/language-service/src/languageFeatures/complete.ts

@@ -255,10 +255,7 @@ export function register(context: LanguageServiceRuntimeContext) {
 			return {
 				isIncomplete: lists.some(list => list.isIncomplete),
 				itemDefaults: lists.find(list => list.itemDefaults)?.itemDefaults,
-				items: lists.map(list => list.items).flat().filter((result: vscode.CompletionItem) =>
-					result.label.indexOf('__VLS_') === -1
-					&& (!result.labelDetails?.description || result.labelDetails.description.indexOf('__VLS_') === -1)
-				),
+				items: lists.map(list => list.items).flat(),
 			};
 		}
 	};

packages/typescript/src/index.ts

@@ -19,7 +19,6 @@ export function createLanguageService(host: embedded.LanguageServiceHost, mods:
 		organizeImports,
 
 		// only support for .ts for now, not support for .vue
-		getCompletionsAtPosition,
 		getDefinitionAtPosition,
 		getDefinitionAndBoundSpan,
 		getTypeDefinitionAtPosition,
@@ -75,13 +74,6 @@ export function createLanguageService(host: embedded.LanguageServiceHost, mods:
 		}
 		return edits.map(transformFileTextChanges).filter(notEmpty);
 	}
-	function getCompletionsAtPosition(fileName: string, position: number, options: ts.GetCompletionsAtPositionOptions | undefined): ReturnType<ts.LanguageService['getCompletionsAtPosition']> {
-		const finalResult = ls.getCompletionsAtPosition(fileName, position, options);
-		if (finalResult) {
-			finalResult.entries = finalResult.entries.filter(entry => entry.name.indexOf('__VLS_') === -1);
-		}
-		return finalResult;
-	}
 	function getReferencesAtPosition(fileName: string, position: number): ReturnType<ts.LanguageService['getReferencesAtPosition']> {
 		return findLocations(fileName, position, 'references') as ts.ReferenceEntry[];
 	}

vue-language-tools/vue-language-service/src/languageService.ts

@@ -53,8 +53,16 @@ export function getLanguageServicePlugins(vueCompilerOptions: VueCompilerOptions
 			complete: {
 				...base.complete,
 				async on(document, position, context) {
-					const result = await base.complete!.on!(document, position, context);
+					const result = await base.complete?.on?.(document, position, context);
 					if (result) {
+
+						// filter __VLS_
+						result.items = result.items.filter(item =>
+							item.label.indexOf('__VLS_') === -1
+							&& (!item.labelDetails?.description || item.labelDetails.description.indexOf('__VLS_') === -1)
+						);
+
+						// handle component auto-import patch
 						for (const [_, map] of _context.documents.getMapsByVirtualFileUri(document.uri)) {
 							const virtualFile = _context.documents.getRootFileBySourceFileUri(map.sourceFileDocument.uri);
 							if (virtualFile instanceof vue.VueFile) {
@@ -148,6 +156,13 @@ export function getLanguageServicePlugins(vueCompilerOptions: VueCompilerOptions
 					return item;
 				},
 			},
+			codeAction: {
+				...base.codeAction,
+				async on(document, range, context) {
+					const result = await base.codeAction?.on?.(document, range, context);
+					return result?.filter(codeAction => codeAction.title.indexOf('__VLS_') === -1);
+				},
+			}
 		};
 	};
 

vue-language-tools/vue-typescript/src/index.ts

@@ -2,9 +2,18 @@ import * as base from '@volar/typescript';
 import * as vue from '@volar/vue-language-core';
 
 export function createLanguageService(host: vue.VueLanguageServiceHost) {
-	return base.createLanguageService(host, vue.createLanguageModules(
+	const languageService = base.createLanguageService(host, vue.createLanguageModules(
 		host.getTypeScriptModule()!,
 		host.getCompilationSettings(),
 		vue.resolveVueCompilerOptions(host.getVueCompilationSettings()),
 	));
+	const getCompletionsAtPosition = languageService.getCompletionsAtPosition;
+	languageService.getCompletionsAtPosition = (fileName, position, options) => {
+		const result = getCompletionsAtPosition(fileName, position, options);
+		if (result) {
+			result.entries = result.entries.filter(entry => entry.name.indexOf('__VLS_') === -1);
+		}
+		return result;
+	};
+	return languageService;
 }