feat(vscode): support latest volar labs

johnsoncodehk · johnsoncodehk · commit fc48ce6d1081 · 2023-12-26T19:32:53.000+08:00
diff --git a/extensions/vscode/src/nodeClientMain.ts b/extensions/vscode/src/nodeClientMain.ts
@@ -1,15 +1,14 @@
-import { ExportsInfoForLabs, supportLabsVersion } from '@volar/vscode';
+import { createLabsInfo } from '@volar/vscode';
 import * as serverLib from '@vue/language-server';
+import * as fs from 'fs';
 import * as vscode from 'vscode';
 import * as lsp from 'vscode-languageclient/node';
 import { activate as commonActivate, deactivate as commonDeactivate } from './common';
 import { config } from './config';
 import { middleware } from './middleware';
-import * as fs from 'fs';
 
 export async function activate(context: vscode.ExtensionContext) {
 
-	let languageClient: lsp.LanguageClient;
 	let serverPathStatusItem: vscode.StatusBarItem | undefined;
 
 	await commonActivate(context, (
@@ -109,7 +108,7 @@ export async function activate(context: vscode.ExtensionContext) {
 		);
 		client.start();
 
-		languageClient = client;
+		volarLabs.addLanguageClient(client);
 
 		updateProviders(client);
 
@@ -118,6 +117,9 @@ export async function activate(context: vscode.ExtensionContext) {
 
 	const tsExtension = vscode.extensions.getExtension('vscode.typescript-language-features');
 	const vueTsPluginExtension = vscode.extensions.getExtension('Vue.vscode-typescript-vue-plugin');
+	const volarLabs = createLabsInfo(serverLib);
+
+	volarLabs.extensionExports.volarLabs.codegenStackSupport = true;
 
 	if (tsExtension) {
 		await tsExtension.activate();
@@ -144,14 +146,7 @@ export async function activate(context: vscode.ExtensionContext) {
 		});
 	}
 
-	return {
-		volarLabs: {
-			version: supportLabsVersion,
-			codegenStackSupport: true,
-			languageClient: languageClient!,
-			languageServerProtocol: serverLib,
-		},
-	} satisfies ExportsInfoForLabs;
+	return volarLabs.extensionExports;
 }
 
 export function deactivate(): Thenable<any> | undefined {
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
 	"devDependencies": {
 		"@lerna-lite/cli": "latest",
 		"@lerna-lite/publish": "latest",
-		"@volar/language-service": "2.0.0-alpha.8",
+		"@volar/language-service": "2.0.0-alpha.9",
 		"typescript": "latest",
 		"vite": "latest",
 		"vitest": "latest"
diff --git a/packages/language-core/package.json b/packages/language-core/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.8",
+		"@volar/language-core": "2.0.0-alpha.9",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/shared": "^3.3.0",
 		"computeds": "^0.0.1",
diff --git a/packages/language-plugin-pug/package.json b/packages/language-plugin-pug/package.json
@@ -17,7 +17,7 @@
 		"@vue/language-core": "1.8.27"
 	},
 	"dependencies": {
-		"@volar/source-map": "2.0.0-alpha.8",
-		"volar-service-pug": "0.0.23"
+		"@volar/source-map": "2.0.0-alpha.9",
+		"volar-service-pug": "0.0.24"
 	}
 }
diff --git a/packages/language-service/package.json b/packages/language-service/package.json
@@ -17,29 +17,29 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.8",
-		"@volar/language-service": "2.0.0-alpha.8",
-		"@volar/typescript": "2.0.0-alpha.8",
+		"@volar/language-core": "2.0.0-alpha.9",
+		"@volar/language-service": "2.0.0-alpha.9",
+		"@volar/typescript": "2.0.0-alpha.9",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/language-core": "1.8.27",
 		"@vue/shared": "^3.3.0",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
-		"volar-service-css": "0.0.23",
-		"volar-service-emmet": "0.0.23",
-		"volar-service-html": "0.0.23",
-		"volar-service-json": "0.0.23",
-		"volar-service-pug": "0.0.23",
-		"volar-service-pug-beautify": "0.0.23",
-		"volar-service-typescript": "0.0.23",
-		"volar-service-typescript-twoslash-queries": "0.0.23",
+		"volar-service-css": "0.0.24",
+		"volar-service-emmet": "0.0.24",
+		"volar-service-html": "0.0.24",
+		"volar-service-json": "0.0.24",
+		"volar-service-pug": "0.0.24",
+		"volar-service-pug-beautify": "0.0.24",
+		"volar-service-typescript": "0.0.24",
+		"volar-service-typescript-twoslash-queries": "0.0.24",
 		"vscode-html-languageservice": "^5.1.0",
 		"vscode-languageserver-textdocument": "^1.0.11"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "2.0.0-alpha.8",
+		"@volar/kit": "2.0.0-alpha.9",
 		"vscode-languageserver-protocol": "^3.17.5",
 		"vscode-uri": "^3.0.8"
 	}
diff --git a/packages/language-service/src/languageService.ts b/packages/language-service/src/languageService.ts
@@ -285,6 +285,9 @@ export function resolveServices(
 	services['vue/toggleVBind'] ??= createToggleVBindService(ts);
 	services.emmet ??= createEmmetService();
 
+	services.html.name += ' (html)';
+	services.pug.name += ' (pug)';
+
 	return services;
 }
 
diff --git a/packages/language-service/src/plugins/vue-autoinsert-dotvalue.ts b/packages/language-service/src/plugins/vue-autoinsert-dotvalue.ts
@@ -7,6 +7,7 @@ import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 export function create(ts: typeof import('typescript/lib/tsserverlibrary')): ServicePlugin {
 	return {
+		name: 'vue-autoinsert-dotvalue',
 		create(context): ServicePluginInstance {
 			return {
 				async provideAutoInsertionEdit(document, position, lastChange) {
diff --git a/packages/language-service/src/plugins/vue-autoinsert-parentheses.ts b/packages/language-service/src/plugins/vue-autoinsert-parentheses.ts
@@ -3,6 +3,7 @@ import { isCharacterTyping } from './vue-autoinsert-dotvalue';
 
 export function create(ts: typeof import('typescript/lib/tsserverlibrary')): ServicePlugin {
 	return {
+		name: 'vue-autoinsert-parentheses',
 		create(context): ServicePluginInstance {
 			return {
 				async provideAutoInsertionEdit(document, position, lastChange) {
diff --git a/packages/language-service/src/plugins/vue-autoinsert-space.ts b/packages/language-service/src/plugins/vue-autoinsert-space.ts
@@ -2,6 +2,7 @@ import { ServicePlugin, ServicePluginInstance } from '@volar/language-service';
 
 export function create(): ServicePlugin {
 	return {
+		name: 'vue-autoinsert-space',
 		create(context): ServicePluginInstance {
 			return {
 				async provideAutoInsertionEdit(document, _, lastChange) {
diff --git a/packages/language-service/src/plugins/vue-codelens-references.ts b/packages/language-service/src/plugins/vue-codelens-references.ts
@@ -4,6 +4,7 @@ import type * as vscode from 'vscode-languageserver-protocol';
 
 export function create(): ServicePlugin {
 	return {
+		name: 'vue-codelens-references',
 		create(context): ServicePluginInstance {
 			return {
 				provideReferencesCodeLensRanges(document) {
diff --git a/packages/language-service/src/plugins/vue-directive-comments.ts b/packages/language-service/src/plugins/vue-directive-comments.ts
@@ -10,6 +10,7 @@ const directiveCommentReg = /<!--\s*@/;
 
 export function create(): ServicePlugin {
 	return {
+		name: 'vue-directive-comments',
 		triggerCharacters: ['@'],
 		create(): ServicePluginInstance {
 			return {
diff --git a/packages/language-service/src/plugins/vue-document-drop.ts b/packages/language-service/src/plugins/vue-document-drop.ts
@@ -7,6 +7,7 @@ import { ServicePlugin, ServicePluginInstance, TagNameCasing } from '../types';
 
 export function create(ts: typeof import('typescript/lib/tsserverlibrary')): ServicePlugin {
 	return {
+		name: 'vue-document-drop',
 		create(context): ServicePluginInstance {
 
 			let casing: TagNameCasing = TagNameCasing.Pascal; // TODO
diff --git a/packages/language-service/src/plugins/vue-extract-file.ts b/packages/language-service/src/plugins/vue-extract-file.ts
@@ -15,6 +15,7 @@ const unicodeReg = /\\u/g;
 
 export function create(ts: typeof import('typescript/lib/tsserverlibrary')): ServicePlugin {
 	return {
+		name: 'vue-extract-file',
 		create(context) {
 			return {
 				async provideCodeActions(document, range, _context) {
diff --git a/packages/language-service/src/plugins/vue-template.ts b/packages/language-service/src/plugins/vue-template.ts
@@ -24,6 +24,7 @@ export function create(
 	}
 ): ServicePlugin {
 	return {
+		name: 'vue-template',
 		triggerCharacters: [
 			...baseServide.triggerCharacters ?? [],
 			'@', // vue event shorthand
diff --git a/packages/language-service/src/plugins/vue-toggle-v-bind-codeaction.ts b/packages/language-service/src/plugins/vue-toggle-v-bind-codeaction.ts
@@ -4,6 +4,7 @@ import type * as vscode from 'vscode-languageserver-protocol';
 
 export function create(ts: typeof import('typescript/lib/tsserverlibrary')): ServicePlugin {
 	return {
+		name: 'vue-toggle-v-bind-codeaction',
 		create(context): ServicePluginInstance {
 			return {
 				provideCodeActions(document, range, _context) {
diff --git a/packages/language-service/src/plugins/vue-twoslash-queries.ts b/packages/language-service/src/plugins/vue-twoslash-queries.ts
@@ -7,6 +7,7 @@ const twoslashReg = /<!--\s*\^\?\s*-->/g;
 
 export function create(ts: typeof import('typescript/lib/tsserverlibrary')): ServicePlugin {
 	return {
+		name: 'vue-twoslash-queries',
 		create(context): ServicePluginInstance {
 			return {
 				provideInlayHints(document, range) {
diff --git a/packages/language-service/src/plugins/vue-visualize-hidden-callback-param.ts b/packages/language-service/src/plugins/vue-visualize-hidden-callback-param.ts
@@ -4,6 +4,7 @@ import type { ServicePlugin, VueCodeInformation } from '../types';
 
 export function create(): ServicePlugin {
 	return {
+		name: 'vue-inlay-hints-hidden-callback-param',
 		create(context): ServicePluginInstance {
 			return {
 				async provideInlayHints(document, range) {
diff --git a/packages/language-service/src/plugins/vue.ts b/packages/language-service/src/plugins/vue.ts
@@ -15,6 +15,7 @@ export interface Provide {
 
 export function create(): ServicePlugin {
 	return {
+		name: 'vue-basic',
 		create(context): ServicePluginInstance<Provide> {
 
 			const htmlPlugin = createHtmlService({ languageId: 'vue', useCustomDataProviders: false }).create(context);
diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.0.0-alpha.8",
+		"@volar/typescript": "2.0.0-alpha.9",
 		"@vue/language-core": "1.8.27"
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"@vue/language-core": "1.8.27"`
`18`	`18`	`},`
`19`	`19`	`"dependencies": {`
`20`		`- "@volar/source-map": "2.0.0-alpha.8",`
`21`		`- "volar-service-pug": "0.0.23"`
	`20`	`+ "@volar/source-map": "2.0.0-alpha.9",`
	`21`	`+ "volar-service-pug": "0.0.24"`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,9 @@ export function resolveServices(`
`285`	`285`	`services['vue/toggleVBind'] ??= createToggleVBindService(ts);`
`286`	`286`	`services.emmet ??= createEmmetService();`
`287`	`287`
	`288`	`+ services.html.name += ' (html)';`
	`289`	`+ services.pug.name += ' (pug)';`
	`290`	`+`
`288`	`291`	`return services;`
`289`	`292`	`}`
`290`	`293`