feat: upgrade volar to 2.2.0-alpha.12

vuejs · Apr 30, 2024 · 31c9148 · 31c9148
1 parent 7072a2a
commit 31c9148
Show file tree

Hide file tree

Showing 22 changed files with 575 additions and 580 deletions.
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -515,7 +515,7 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "2.2.0-alpha.10",
+		"@volar/vscode": "2.2.0-alpha.12",
 		"@vue/language-core": "2.0.14",
 		"@vue/language-server": "2.0.14",
 		"@vue/typescript-plugin": "2.0.14",

diff --git a/extensions/vscode/src/common.ts b/extensions/vscode/src/common.ts
@@ -1,14 +1,14 @@
-import { DiagnosticModel, VueInitializationOptions } from '@vue/language-server';
-import * as vscode from 'vscode';
 import * as lsp from '@volar/vscode';
+import { quickPick } from '@volar/vscode/lib/common';
+import type { VueInitializationOptions } from '@vue/language-server';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as semver from 'semver';
+import * as vscode from 'vscode';
 import { config } from './config';
 import * as doctor from './features/doctor';
 import * as nameCasing from './features/nameCasing';
 import * as splitEditors from './features/splitEditors';
-import * as semver from 'semver';
-import * as fs from 'fs';
-import * as path from 'path';
-import { quickPick } from '@volar/vscode/lib/common';
 
 let client: lsp.BaseLanguageClient;
 
@@ -437,13 +437,8 @@ async function getInitializationOptions(
 	hybridMode: boolean,
 ): Promise<VueInitializationOptions> {
 	return {
-		diagnosticModel: enabledHybridMode ? DiagnosticModel.Pull : DiagnosticModel.Push,
 		typescript: { tsdk: (await lsp.getTsdk(context)).tsdk },
 		maxFileSize: config.server.maxFileSize,
-		semanticTokensLegend: {
-			tokenTypes: [],
-			tokenModifiers: [],
-		},
 		vue: {
 			hybridMode,
 		},

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
 	"devDependencies": {
 		"@lerna-lite/cli": "latest",
 		"@lerna-lite/publish": "latest",
-		"@volar/language-service": "2.2.0-alpha.10",
+		"@volar/language-service": "2.2.0-alpha.12",
 		"@volar/tsl-config": "latest",
 		"tsl": "latest",
 		"typescript": "latest",

diff --git a/packages/component-meta/lib/base.ts b/packages/component-meta/lib/base.ts
@@ -88,18 +88,6 @@ function createCheckerWorker(
 			}
 			return scriptSnapshots.get(fileName);
 		},
-		getLanguageId: fileName => {
-			if (parsedCommandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext))) {
-				return 'vue';
-			}
-			if (parsedCommandLine.vueOptions.vitePressExtensions.some(ext => fileName.endsWith(ext))) {
-				return 'markdown';
-			}
-			if (parsedCommandLine.vueOptions.petiteVueExtensions.some(ext => fileName.endsWith(ext))) {
-				return 'html';
-			}
-			return vue.resolveCommonLanguageId(fileName);
-		},
 		scriptIdToFileName: id => id,
 		fileNameToScriptId: id => id,
 	};

diff --git a/packages/component-meta/package.json b/packages/component-meta/package.json
@@ -12,7 +12,7 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.2.0-alpha.10",
+		"@volar/typescript": "2.2.0-alpha.12",
 		"@vue/language-core": "2.0.14",
 		"path-browserify": "^1.0.1",
 		"vue-component-type-helpers": "2.0.14"

diff --git a/packages/language-core/lib/languageModule.ts b/packages/language-core/lib/languageModule.ts
@@ -51,7 +51,7 @@ function getFileRegistryKey(
 	return JSON.stringify(values);
 }
 
-interface _Plugin extends LanguagePlugin<VueVirtualCode> {
+export interface _Plugin extends LanguagePlugin<VueVirtualCode> {
 	getCanonicalFileName: (fileName: string) => string;
 	pluginContext: Parameters<VueLanguagePlugin>[0];
 }
@@ -93,14 +93,19 @@ export function createVueLanguagePlugin(
 	return {
 		getCanonicalFileName,
 		pluginContext,
+		getLanguageId(scriptId) {
+			if (vueCompilerOptions.extensions.some(ext => scriptId.endsWith(ext))) {
+				return 'vue';
+			}
+			if (vueCompilerOptions.vitePressExtensions.some(ext => scriptId.endsWith(ext))) {
+				return 'markdown';
+			}
+			if (vueCompilerOptions.petiteVueExtensions.some(ext => scriptId.endsWith(ext))) {
+				return 'html';
+			}
+		},
 		createVirtualCode(fileId, languageId, snapshot) {
-			const isVueFile = vueCompilerOptions.extensions.some(ext => fileId.endsWith(ext))
-				|| (vueCompilerOptions.extensions.length && languageId === 'vue');
-			const isVitePressFile = vueCompilerOptions.vitePressExtensions.some(ext => fileId.endsWith(ext))
-				|| (vueCompilerOptions.vitePressExtensions.length && languageId === 'markdown');
-			const isPetiteVueFile = vueCompilerOptions.petiteVueExtensions.some(ext => fileId.endsWith(ext))
-				|| (vueCompilerOptions.petiteVueExtensions.length && languageId === 'html');
-			if (isVueFile || isVitePressFile || isPetiteVueFile) {
+			if (languageId === 'vue' || languageId === 'markdown' || languageId === 'html') {
 				const fileName = getFileName(fileId);
 				const projectVersion = getProjectVersion();
 				if (projectVersion !== canonicalRootFileNamesVersion) {
@@ -122,9 +127,9 @@ export function createVueLanguagePlugin(
 						languageId,
 						snapshot,
 						vueCompilerOptions,
-						isPetiteVueFile
+						languageId === 'html'
 							? [petiteVueSfcPlugin, ...basePlugins]
-							: isVitePressFile
+							: languageId === 'markdown'
 								? [vitePressSfcPlugin, ...basePlugins]
 								: [vueSfcPlugin, ...basePlugins],
 						ts,

diff --git a/packages/language-core/lib/virtualFile/computedFiles.ts b/packages/language-core/lib/virtualFile/computedFiles.ts
@@ -1,4 +1,4 @@
-import { VirtualCode, buildMappings, resolveCommonLanguageId, toString } from '@volar/language-core';
+import { VirtualCode, buildMappings, toString } from '@volar/language-core';
 import { computed } from 'computeds';
 import type * as ts from 'typescript';
 import type { Code, Sfc, SfcBlock, VueLanguagePlugin } from '../types';
@@ -57,7 +57,7 @@ export function computedFiles(
 				if (!file.parentCodeId) {
 					embeddedCodes.push({
 						id: file.id,
-						languageId: resolveCommonLanguageId(`/dummy.${file.lang}`),
+						languageId: resolveCommonLanguageId(file.lang),
 						linkedCodeMappings: file.linkedCodeMappings,
 						snapshot,
 						mappings,
@@ -71,7 +71,7 @@ export function computedFiles(
 						parent.embeddedCodes ??= [];
 						parent.embeddedCodes.push({
 							id: file.id,
-							languageId: resolveCommonLanguageId(`/dummy.${file.lang}`),
+							languageId: resolveCommonLanguageId(file.lang),
 							linkedCodeMappings: file.linkedCodeMappings,
 							snapshot,
 							mappings,
@@ -238,3 +238,19 @@ function fullDiffTextChangeRange(oldText: string, newText: string): ts.TextChang
 		}
 	}
 }
+
+export function resolveCommonLanguageId(lang: string) {
+	switch (lang) {
+		case 'js': return 'javascript';
+		case 'cjs': return 'javascript';
+		case 'mjs': return 'javascript';
+		case 'ts': return 'typescript';
+		case 'cts': return 'typescript';
+		case 'mts': return 'typescript';
+		case 'jsx': return 'javascriptreact';
+		case 'tsx': return 'typescriptreact';
+		case 'pug': return 'jade';
+		case 'md': return 'markdown';
+	}
+	return lang;
+}
diff --git a/packages/language-core/package.json b/packages/language-core/package.json
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.2.0-alpha.10",
+		"@volar/language-core": "2.2.0-alpha.12",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",

diff --git a/packages/language-plugin-pug/package.json b/packages/language-plugin-pug/package.json
@@ -16,7 +16,7 @@
 		"@vue/language-core": "2.0.14"
 	},
 	"dependencies": {
-		"@volar/source-map": "2.2.0-alpha.10",
+		"@volar/source-map": "2.2.0-alpha.12",
 		"volar-service-pug": "0.0.40"
 	}
 }