diff --git a/extensions/vscode/index.ts b/extensions/vscode/index.ts
index 4ba2152f8e..ffbfee3ded 100644
--- a/extensions/vscode/index.ts
+++ b/extensions/vscode/index.ts
@@ -18,36 +18,28 @@ import * as vscode from 'vscode';
import { config } from './lib/config';
import { activate as activateWelcome } from './lib/welcome';
+let client: lsp.BaseLanguageClient | undefined;
let needRestart = false;
-const incompatibleExtensionIds = [
- 'johnsoncodehk.vscode-typescript-vue-plugin',
- 'Vue.vscode-typescript-vue-plugin',
-];
-
-for (const extensionId of incompatibleExtensionIds) {
- const extension = vscode.extensions.getExtension(extensionId);
+for (
+ const incompatibleExtensionId of [
+ 'johnsoncodehk.vscode-typescript-vue-plugin',
+ 'Vue.vscode-typescript-vue-plugin',
+ ]
+) {
+ const extension = vscode.extensions.getExtension(incompatibleExtensionId);
if (extension) {
vscode.window.showErrorMessage(
- `The "${extensionId}" extension is incompatible with the Vue extension. Please uninstall it.`,
+ `The "${incompatibleExtensionId}" extension is incompatible with the Vue extension. Please uninstall it.`,
'Show Extension',
).then(action => {
if (action === 'Show Extension') {
- vscode.commands.executeCommand('workbench.extensions.search', '@id:' + extensionId);
+ vscode.commands.executeCommand('workbench.extensions.search', '@id:' + incompatibleExtensionId);
}
});
}
}
-let client: lsp.BaseLanguageClient | undefined;
-
-class _LanguageClient extends lsp.LanguageClient {
- fillInitializeParams(params: lsp.InitializeParams) {
- // fix https://github.com/vuejs/language-tools/issues/1959
- params.locale = vscode.env.language;
- }
-}
-
export const { activate, deactivate } = defineExtension(() => {
const context = extensionContext.value!;
const volarLabs = createLabsInfo();
@@ -125,7 +117,7 @@ export const { activate, deactivate } = defineExtension(() => {
function launch(context: vscode.ExtensionContext) {
const serverModule = vscode.Uri.joinPath(context.extensionUri, 'dist', 'language-server.js');
- const client = new _LanguageClient(
+ const client = new lsp.LanguageClient(
'vue',
'Vue',
{
diff --git a/extensions/vscode/lib/generated-meta.ts b/extensions/vscode/lib/generated-meta.ts
index 3d42137fdf..9b070f905b 100644
--- a/extensions/vscode/lib/generated-meta.ts
+++ b/extensions/vscode/lib/generated-meta.ts
@@ -4,8 +4,8 @@
// Meta info
export const publisher = 'Vue';
export const name = 'volar';
-export const version = '3.0.1';
-export const displayName = 'Vue (Official)';
+export const version = '3.0.5';
+export const displayName = 'Vue.js';
export const description = 'Language Support for Vue';
export const extensionId = `${publisher}.${name}`;
diff --git a/extensions/vscode/lib/welcome.ts b/extensions/vscode/lib/welcome.ts
index 895e49fd4f..a3b9be9e0f 100644
--- a/extensions/vscode/lib/welcome.ts
+++ b/extensions/vscode/lib/welcome.ts
@@ -42,7 +42,7 @@ function getWelcomeHtml() {
- Vue (Official)
+ Vue.js