refactor: rewrite @volar/vue-typescript

extensions/vscode-vue-language-features/package.json

@@ -634,13 +634,12 @@
 		"@volar/shared": "0.33.2",
 		"@volar/vue-language-server": "0.33.2",
 		"@vue/compiler-dom": "^3.2.27",
+		"@vue/compiler-sfc": "^3.2.27",
 		"@vue/reactivity": "^3.2.27",
 		"esbuild": "latest",
 		"upath": "^2.0.1",
 		"vsce": "latest",
-		"vscode-html-languageservice": "^4.2.1",
 		"vscode-languageclient": "^8.0.0-next.8",
-		"vscode-languageserver-textdocument": "^1.0.3",
 		"vscode-nls": "5.0.0"
 	}
 }

extensions/vscode-vue-language-features/src/features/preview.ts

@@ -3,8 +3,8 @@ import { compile, NodeTypes } from '@vue/compiler-dom';
 import * as path from 'upath';
 import * as fs from '../utils/fs';
 import * as shared from '@volar/shared';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-import { htmlLs, userPick } from './splitEditors';
+import { userPick } from './splitEditors';
+import { parse } from '@vue/compiler-sfc';
 
 interface PreviewState { port: number, fileName: string }
 
@@ -213,8 +213,8 @@ export async function activate(context: vscode.ExtensionContext) {
 					if (req !== goToTemplateReq)
 						return;
 
-					const sfc = shared.parseSfc(doc.getText(), htmlLs.parseHTMLDocument(TextDocument.create(doc.uri.toString(), doc.languageId, doc.version, doc.getText())));
-					const offset = sfc.template?.startTagEnd ?? 0;
+					const sfc = parse(doc.getText(), { sourceMap: false, ignoreEmpty: false });
+					const offset = sfc.descriptor.template?.loc.start.offset ?? 0;
 					const start = doc.positionAt(data.range[0] + offset);
 					const end = doc.positionAt(data.range[1] + offset);
 					await vscode.window.showTextDocument(doc, vscode.ViewColumn.One);
@@ -273,13 +273,13 @@ export async function activate(context: vscode.ExtensionContext) {
 
 	function createQuery(vueCode: string, fileName: string) {
 
-		const sfc = shared.parseSfc(vueCode, htmlLs.parseHTMLDocument(TextDocument.create('', '', 0, vueCode)));
+		const sfc = parse(vueCode, { sourceMap: false, ignoreEmpty: false });
 		let query = '';
 
-		for (const customBlock of sfc.customBlocks) {
+		for (const customBlock of sfc.descriptor.customBlocks) {
 			if (customBlock.type === 'preview') {
-				const previewTagStart = vueCode.substring(0, customBlock.startTagEnd).lastIndexOf('<preview');
-				const previewTag = vueCode.substring(previewTagStart, customBlock.startTagEnd);
+				const previewTagStart = vueCode.substring(0, customBlock.loc.start.offset).lastIndexOf('<preview');
+				const previewTag = vueCode.substring(previewTagStart, customBlock.loc.start.offset);
 				const previewGen = compile(previewTag + '</preview>').ast;
 				const props: Record<string, string> = {};
 				for (const previewNode of previewGen.children) {

extensions/vscode-vue-language-features/src/features/splitEditors.ts

@@ -1,10 +1,7 @@
 import * as vscode from 'vscode';
 import { ref, computed } from '@vue/reactivity';
 import * as shared from '@volar/shared';
-import * as html from 'vscode-html-languageservice';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-
-export const htmlLs = html.getLanguageService();
+import { parse, SFCBlock } from '@vue/compiler-sfc';
 
 export function activate(context: vscode.ExtensionContext) {
 
@@ -18,7 +15,7 @@ export function activate(context: vscode.ExtensionContext) {
 		if (!editor) return;
 
 		const doc = editor.document;
-		const descriptor = getDocDescriptor(doc.getText());
+		const { descriptor } = getDocDescriptor(doc.getText());
 		const leftBlocks = [
 			descriptor.scriptSetup,
 			descriptor.script,
@@ -33,26 +30,26 @@ export function activate(context: vscode.ExtensionContext) {
 		await vscode.commands.executeCommand('workbench.action.toggleSplitEditorInGroup');
 		await foldingBlocks(rightBlocks);
 
-		async function foldingBlocks(blocks: shared.SfcBlock[]) {
+		async function foldingBlocks(blocks: SFCBlock[]) {
 
-			const firstBlock = blocks.sort((a, b) => a.startTagEnd - b.startTagEnd)[0];
+			const firstBlock = blocks.sort((a, b) => a.loc.start.offset - b.loc.start.offset)[0];
 
 			const editor = vscode.window.activeTextEditor;
 			if (!editor) return;
 
-			editor.selections = blocks.map(block => new vscode.Selection(doc.positionAt(block.startTagEnd), doc.positionAt(block.startTagEnd)));
+			editor.selections = blocks.map(block => new vscode.Selection(doc.positionAt(block.loc.start.offset), doc.positionAt(block.loc.start.offset)));
 
 			await vscode.commands.executeCommand('editor.unfoldAll');
 			await vscode.commands.executeCommand('editor.foldLevel1');
-			editor.revealRange(new vscode.Range(doc.positionAt(firstBlock.startTagEnd), new vscode.Position(editor.document.lineCount, 0)), vscode.TextEditorRevealType.AtTop);
+			editor.revealRange(new vscode.Range(doc.positionAt(firstBlock.loc.start.offset), new vscode.Position(editor.document.lineCount, 0)), vscode.TextEditorRevealType.AtTop);
 		}
 	}
 }
 
 function useDocDescriptor() {
 
 	const splitDocText = ref('');
-	const splitDocDescriptor = computed(() => shared.parseSfc(splitDocText.value, htmlLs.parseHTMLDocument(TextDocument.create('', '', 0, splitDocText.value))));
+	const splitDocDescriptor = computed(() => parse(splitDocText.value, { sourceMap: false, ignoreEmpty: false }));
 
 	return getDescriptor;
 

packages/code-gen/package.json

@@ -13,7 +13,6 @@
 		"directory": "packages/code-gen"
 	},
 	"dependencies": {
-		"@volar/shared": "0.33.2",
 		"@volar/source-map": "0.33.2"
 	}
 }