fix: emmet not working in style block

close #1145
vuejs · Apr 21, 2022 · 217abe1 · 217abe1
1 parent b9a046f
commit 217abe1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/packages/vue-language-service-types/src/index.ts b/packages/vue-language-service-types/src/index.ts
@@ -65,6 +65,7 @@ export type EmbeddedLanguageServicePlugin = {
 
 	complete?: {
 		triggerCharacters?: string[],
+		isAdditional?: boolean,
 		on?(document: TextDocument, position: vscode.Position, context?: vscode.CompletionContext): NullableResult<vscode.CompletionList>,
 		resolve?(item: vscode.CompletionItem, newPosition?: vscode.Position): NotNullableResult<vscode.CompletionItem>,
 	},

diff --git a/packages/vue-language-service/src/languageFeatures/complete.ts b/packages/vue-language-service/src/languageFeatures/complete.ts
@@ -143,15 +143,15 @@ export function register(context: LanguageServiceRuntimeContext) {
 							if (completionContext?.triggerCharacter && !plugin.complete.triggerCharacters?.includes(completionContext.triggerCharacter))
 								continue;
 
-							if (cache!.mainCompletion && (!plugin.context?.isAdditionalCompletion || cache?.mainCompletion.documentUri !== sourceMap.mappedDocument.uri))
+							if (cache!.mainCompletion && (!plugin.complete.isAdditional || cache?.mainCompletion.documentUri !== sourceMap.mappedDocument.uri))
 								continue;
 
 							const embeddedCompletionList = await plugin.complete?.on(sourceMap.mappedDocument, embeddedRange.start, completionContext);
 
 							if (!embeddedCompletionList || !embeddedCompletionList.items.length)
 								continue;
 
-							if (!plugin.context?.isAdditionalCompletion) {
+							if (!plugin.complete.isAdditional) {
 								cache!.mainCompletion = { documentUri: sourceMap.mappedDocument.uri };
 							}
 
@@ -202,15 +202,15 @@ export function register(context: LanguageServiceRuntimeContext) {
 					if (completionContext?.triggerCharacter && !plugin.complete.triggerCharacters?.includes(completionContext.triggerCharacter))
 						continue;
 
-					if (cache.mainCompletion && (!plugin.context?.isAdditionalCompletion || cache.mainCompletion.documentUri !== document.uri))
+					if (cache.mainCompletion && (!plugin.complete.isAdditional || cache.mainCompletion.documentUri !== document.uri))
 						continue;
 
 					const completionList = await plugin.complete?.on(document, position, completionContext);
 
 					if (!completionList || !completionList.items.length)
 						continue;
 
-					if (!plugin.context?.isAdditionalCompletion) {
+					if (!plugin.complete.isAdditional) {
 						cache.mainCompletion = { documentUri: document.uri };
 					}
 
@@ -240,7 +240,7 @@ export function register(context: LanguageServiceRuntimeContext) {
 		return combineCompletionList(cache.data.map(cacheData => cacheData.list));
 
 		function sortPlugins(a: LanguageServicePlugin, b: LanguageServicePlugin) {
-			return (b.context?.isAdditionalCompletion ? -1 : 1) - (a.context?.isAdditionalCompletion ? -1 : 1);
+			return (b.complete?.isAdditional ? -1 : 1) - (a.complete?.isAdditional ? -1 : 1);
 		}
 
 		function combineCompletionList(lists: vscode.CompletionList[]) {

diff --git a/packages/vue-language-service/src/languageService.ts b/packages/vue-language-service/src/languageService.ts
@@ -58,13 +58,10 @@ export type LanguageServicePlugin = ReturnType<typeof defineLanguageServicePlugi
 
 let pluginId = 0;
 
-function defineLanguageServicePlugin<T extends EmbeddedLanguageServicePlugin>(plugin: T, context?: {
-	isAdditionalCompletion?: boolean,
-}) {
+function defineLanguageServicePlugin<T extends EmbeddedLanguageServicePlugin>(plugin: T) {
 	return {
 		id: pluginId++,
 		...plugin,
-		context,
 	};
 }
 

diff --git a/packages/vue-language-service/src/plugins/emmet.ts b/packages/vue-language-service/src/plugins/emmet.ts
@@ -9,6 +9,8 @@ export default function (): EmbeddedLanguageServicePlugin {
 
 		complete: {
 
+			isAdditional: true,
+
 			async on(textDocument, position) {
 
 				const syntax = emmet.getEmmetMode(textDocument.languageId === 'vue' ? 'html' : textDocument.languageId);