feat: support html, css intellisense for petite-vue

close #1471
vuejs · Jul 7, 2022 · 3307bd8 · 3307bd8
1 parent bb936cc
commit 3307bd8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/packages/vue-language-service/src/languageService.ts b/packages/vue-language-service/src/languageService.ts
@@ -355,7 +355,9 @@ export function createLanguageService(
 				}
 			},
 			tsLs,
-			isSupportedDocument: (document) => document.languageId === languageId,
+			isSupportedDocument: (document) =>
+				document.languageId === languageId
+				&& !vueDocuments.get(document.uri) /* not petite-vue source file */,
 			getNameCases,
 			vueLsHost,
 			vueDocuments,

diff --git a/packages/vue-language-service/src/plugins/vue-template.ts b/packages/vue-language-service/src/plugins/vue-template.ts
@@ -129,6 +129,10 @@ export default function useVueTemplateLanguagePlugin<T extends ReturnType<typeof
 		},
 
 		doHover(document, position) {
+
+			if (!options.isSupportedDocument(document))
+				return;
+
 			const vueDocument = options.vueDocuments.fromEmbeddedDocument(document);
 			if (vueDocument) {
 				options.templateLanguagePlugin.htmlLs.setDataProviders(
@@ -584,9 +588,10 @@ export default function useVueTemplateLanguagePlugin<T extends ReturnType<typeof
 	}
 
 	function useDefaultDataProvider(uri: string) {
-		if (uri.endsWith('.html')) {
-			return false; // petite-vue
-		}
+		// commented for https://github.com/johnsoncodehk/volar/issues/1471#issuecomment-1159691270
+		// if (uri.endsWith('.html')) {
+		// 	return false; // petite-vue
+		// }
 		return true;
 	}
 

diff --git a/packages/vue-typescript/src/plugins/vue-sfc-styles.ts b/packages/vue-typescript/src/plugins/vue-sfc-styles.ts
@@ -6,7 +6,7 @@ export default function (): VueLanguagePlugin {
 	return {
 
 		getEmbeddedFilesCount(fileName, sfc) {
-			return fileName.endsWith('.html') ? 0 : sfc.styles.length;
+			return sfc.styles.length;
 		},
 
 		getEmbeddedFile(fileName, sfc, i) {