chore: update Volar to 2.3.0

johnsoncodehk · johnsoncodehk · commit e38a673591f4 · 2024-06-18T03:38:09.000+08:00
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -543,7 +543,7 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "~2.3.0-alpha.15",
+		"@volar/vscode": "~2.3.0",
 		"@vue/language-core": "2.0.21",
 		"@vue/language-server": "2.0.21",
 		"@vue/typescript-plugin": "2.0.21",
diff --git a/package.json b/package.json
@@ -24,9 +24,14 @@
 		"@lerna-lite/publish": "latest",
 		"@tsslint/cli": "latest",
 		"@tsslint/config": "latest",
-		"@volar/language-service": "~2.3.0-alpha.15",
+		"@volar/language-service": "~2.3.0",
 		"typescript": "latest",
 		"vite": "latest",
 		"vitest": "latest"
+	},
+	"pnpm": {
+		"overrides": {
+			"vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice"
+		}
 	}
 }
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.3.0-alpha.15",
+		"@volar/typescript": "~2.3.0",
 		"@vue/language-core": "2.0.21",
 		"path-browserify": "^1.0.1",
 		"vue-component-type-helpers": "2.0.21"
diff --git a/packages/language-core/lib/plugins/file-md.ts b/packages/language-core/lib/plugins/file-md.ts
@@ -1,6 +1,8 @@
-import { buildMappings, Segment, SourceMap, toString } from '@volar/language-core';
+import { SourceMap, toString } from '@volar/language-core';
 import type { SFCBlock } from '@vue/compiler-sfc';
+import type { Segment } from 'muggle-string';
 import type { VueLanguagePlugin } from '../types';
+import { buildMappings } from '../utils/buildMappings';
 import { parse } from '../utils/parseSfc';
 
 const codeblockReg = /(`{3,})[\s\S]+?\1/g;
diff --git a/packages/language-core/lib/utils/buildMappings.ts b/packages/language-core/lib/utils/buildMappings.ts
@@ -0,0 +1,22 @@
+import type { Segment } from 'muggle-string';
+import type { Mapping } from '@volar/language-core';
+
+export function buildMappings<T>(chunks: Segment<T>[]) {
+	let length = 0;
+	const mappings: Mapping<T>[] = [];
+	for (const segment of chunks) {
+		if (typeof segment === 'string') {
+			length += segment.length;
+		}
+		else {
+			mappings.push({
+				sourceOffsets: [segment[2]],
+				generatedOffsets: [length],
+				lengths: [segment[0].length],
+				data: segment[3]!,
+			});
+			length += segment[0].length;
+		}
+	}
+	return mappings;
+}
diff --git a/packages/language-core/lib/virtualFile/computedFiles.ts b/packages/language-core/lib/virtualFile/computedFiles.ts
@@ -1,7 +1,9 @@
-import { VirtualCode, buildMappings, toString } from '@volar/language-core';
+import type { VirtualCode } from '@volar/language-core';
 import { computed } from 'computeds';
+import { toString } from 'muggle-string';
 import type * as ts from 'typescript';
 import type { Code, Sfc, SfcBlock, VueLanguagePlugin } from '../types';
+import { buildMappings } from '../utils/buildMappings';
 import { VueEmbeddedCode } from './embeddedFile';
 
 export function computedFiles(
diff --git a/packages/language-core/package.json b/packages/language-core/package.json
@@ -12,11 +12,12 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.3.0-alpha.15",
+		"@volar/language-core": "~2.3.0",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
 		"minimatch": "^9.0.3",
+		"muggle-string": "^0.4.1",
 		"path-browserify": "^1.0.1",
 		"vue-template-compiler": "^2.7.14"
 	},
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.21"
 	},
 	"dependencies": {
-		"@volar/source-map": "~2.3.0-alpha.15",
-		"volar-service-pug": "0.0.50"
+		"@volar/source-map": "~2.3.0",
+		"volar-service-pug": "0.0.51"
 	}
 }
diff --git a/packages/language-server/node.ts b/packages/language-server/node.ts
@@ -131,23 +131,23 @@ connection.onRequest(ParseSFCRequest.type, params => {
 
 connection.onRequest(DetectNameCasingRequest.type, async params => {
 	const uri = URI.parse(params.textDocument.uri);
-	const languageService = await getService(uri);
+	const languageService = await server.project.getLanguageService(uri);
 	if (languageService) {
 		return await detect(languageService.context, uri);
 	}
 });
 
 connection.onRequest(GetConvertTagCasingEditsRequest.type, async params => {
 	const uri = URI.parse(params.textDocument.uri);
-	const languageService = await getService(uri);
+	const languageService = await server.project.getLanguageService(uri);
 	if (languageService) {
 		return await convertTagName(languageService.context, uri, params.casing, getTsPluginClient(languageService.context));
 	}
 });
 
 connection.onRequest(GetConvertAttrCasingEditsRequest.type, async params => {
 	const uri = URI.parse(params.textDocument.uri);
-	const languageService = await getService(uri);
+	const languageService = await server.project.getLanguageService(uri);
 	if (languageService) {
 		return await convertAttrName(languageService.context, uri, params.casing, getTsPluginClient(languageService.context));
 	}
@@ -159,7 +159,3 @@ connection.onRequest(GetConnectedNamedPipeServerRequest.type, async fileName =>
 		return server;
 	}
 });
-
-async function getService(uri: URI) {
-	return (await server.project.getLanguageService(uri));
-}
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -15,8 +15,8 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.3.0-alpha.15",
-		"@volar/language-server": "~2.3.0-alpha.15",
+		"@volar/language-core": "~2.3.0",
+		"@volar/language-server": "~2.3.0",
 		"@vue/language-core": "2.0.21",
 		"@vue/language-service": "2.0.21",
 		"@vue/typescript-plugin": "2.0.21",
diff --git a/packages/language-service/index.ts b/packages/language-service/index.ts
@@ -49,8 +49,8 @@ export function getVueLanguageServicePlugins(
 			if (plugin.name === 'typescript-semantic') {
 				plugins[i] = {
 					...plugin,
-					create(context, api) {
-						const created = plugin.create(context, api);
+					create(context) {
+						const created = plugin.create(context);
 						if (!context.language.typescript) {
 							return created;
 						}
diff --git a/packages/language-service/lib/plugins/css.ts b/packages/language-service/lib/plugins/css.ts
@@ -5,8 +5,8 @@ export function create(): LanguageServicePlugin {
 	const base = baseCreate({ scssDocumentSelector: ['scss', 'postcss'] });
 	return {
 		...base,
-		create(context, api): LanguageServicePluginInstance {
-			const baseInstance = base.create(context, api);
+		create(context): LanguageServicePluginInstance {
+			const baseInstance = base.create(context);
 			return {
 				...baseInstance,
 				async provideDiagnostics(document, token) {
diff --git a/packages/language-service/lib/plugins/vue-sfc.ts b/packages/language-service/lib/plugins/vue-sfc.ts
@@ -47,8 +47,8 @@ export function create(): LanguageServicePlugin {
 	return {
 		...htmlPlugin,
 		name: 'vue-sfc',
-		create(context, api): LanguageServicePluginInstance<Provide> {
-			const htmlPluginInstance = htmlPlugin.create(context, api);
+		create(context): LanguageServicePluginInstance<Provide> {
+			const htmlPluginInstance = htmlPlugin.create(context);
 
 			return {
 
diff --git a/packages/language-service/lib/plugins/vue-template.ts b/packages/language-service/lib/plugins/vue-template.ts
@@ -68,17 +68,17 @@ export function create(
 			},
 			inlayHintProvider: {},
 			hoverProvider: true,
-			diagnosticProvider: true,
+			diagnosticProvider: {},
 			semanticTokensProvider: {
 				legend: {
 					tokenTypes: ['class'],
 					tokenModifiers: [],
 				},
 			}
 		},
-		create(context, api): LanguageServicePluginInstance {
+		create(context): LanguageServicePluginInstance {
 			const tsPluginClient = getTsPluginClient?.(context);
-			const baseServiceInstance = baseService.create(context, api);
+			const baseServiceInstance = baseService.create(context);
 			const vueCompilerOptions = getVueOptions(context.env);
 
 			builtInData ??= loadTemplateData(context.env.locale ?? 'en');
diff --git a/packages/language-service/package.json b/packages/language-service/package.json
@@ -16,31 +16,31 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.3.0-alpha.15",
-		"@volar/language-service": "~2.3.0-alpha.15",
-		"@volar/typescript": "~2.3.0-alpha.15",
+		"@volar/language-core": "~2.3.0",
+		"@volar/language-service": "~2.3.0",
+		"@volar/typescript": "~2.3.0",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/language-core": "2.0.21",
 		"@vue/shared": "^3.4.0",
 		"@vue/typescript-plugin": "2.0.21",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
-		"volar-service-css": "0.0.50",
-		"volar-service-emmet": "0.0.50",
-		"volar-service-html": "0.0.50",
-		"volar-service-json": "0.0.50",
-		"volar-service-pug": "0.0.50",
-		"volar-service-pug-beautify": "0.0.50",
-		"volar-service-typescript": "0.0.50",
-		"volar-service-typescript-twoslash-queries": "0.0.50",
-		"vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462",
+		"volar-service-css": "0.0.51",
+		"volar-service-emmet": "0.0.51",
+		"volar-service-html": "0.0.51",
+		"volar-service-json": "0.0.51",
+		"volar-service-pug": "0.0.51",
+		"volar-service-pug-beautify": "0.0.51",
+		"volar-service-typescript": "0.0.51",
+		"volar-service-typescript-twoslash-queries": "0.0.51",
+		"vscode-html-languageservice": "^5.2.0",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "~2.3.0-alpha.15",
+		"@volar/kit": "~2.3.0",
 		"vscode-languageserver-protocol": "^3.17.5"
 	}
 }
diff --git a/packages/language-service/tests/complete.ts b/packages/language-service/tests/complete.ts
@@ -36,15 +36,15 @@ for (const dirName of testDirs) {
 
 				it(`${location} => ${action.label}`, async () => {
 
-					let complete = await tester.languageService.doComplete(
+					let complete = await tester.languageService.getCompletionItems(
 						uri,
 						position,
 						{ triggerKind: 1 satisfies typeof vscode.CompletionTriggerKind.Invoked },
 					);
 
 					if (!complete.items.length) {
 						// fix #2511 test case, it's a bug of TS 5.3
-						complete = await tester.languageService.doComplete(
+						complete = await tester.languageService.getCompletionItems(
 							uri,
 							position,
 							{ triggerKind: 1 satisfies typeof vscode.CompletionTriggerKind.Invoked },
@@ -55,7 +55,7 @@ for (const dirName of testDirs) {
 
 					expect(item).toBeDefined();
 
-					item = await tester.languageService.doCompletionResolve(item);
+					item = await tester.languageService.resolveCompletionItem(item);
 
 					const expectedFileText = outputFiles[file];
 
diff --git a/packages/language-service/tests/findDefinition.ts b/packages/language-service/tests/findDefinition.ts
@@ -34,7 +34,7 @@ for (const dirName of testDirs) {
 
 				it(`${filePath}:${position.line + 1}:${position.character + 1} => ${targetFile}:${action.targeRange.start}`, async () => {
 
-					const locations = await tester.languageService.findDefinition(
+					const locations = await tester.languageService.getDefinition(
 						uri,
 						position,
 					);
diff --git a/packages/language-service/tests/reference.ts b/packages/language-service/tests/reference.ts
@@ -33,7 +33,7 @@ for (const dirName of testDirs) {
 
 				it(`${location} => count: ${action.count}`, async () => {
 
-					const locations = await tester.languageService.findReferences(
+					const locations = await tester.languageService.getReferences(
 						uri,
 						position,
 						{ includeDeclaration: true },
diff --git a/packages/language-service/tests/rename.ts b/packages/language-service/tests/rename.ts
@@ -36,7 +36,7 @@ for (const dirName of testDirs) {
 
 					it(`${location} => ${action.newName}`, async () => {
 
-						const edit = await tester.languageService.doRename(
+						const edit = await tester.languageService.getRenameEdits(
 							uri,
 							position,
 							action.newName,
diff --git a/packages/tsc/package.json b/packages/tsc/package.json
@@ -16,7 +16,7 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.3.0-alpha.15",
+		"@volar/typescript": "~2.3.0",
 		"@vue/language-core": "2.0.21",
 		"semver": "^7.5.4"
 	},
diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
@@ -12,7 +12,7 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.3.0-alpha.15",
+		"@volar/typescript": "~2.3.0",
 		"@vue/language-core": "2.0.21",
 		"@vue/shared": "^3.4.0"
 	},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"@vue/language-core": "2.0.21"`
`17`	`17`	`},`
`18`	`18`	`"dependencies": {`
`19`		`- "@volar/source-map": "~2.3.0-alpha.15",`
`20`		`- "volar-service-pug": "0.0.50"`
	`19`	`+ "@volar/source-map": "~2.3.0",`
	`20`	`+ "volar-service-pug": "0.0.51"`
`21`	`21`	`}`
`22`	`22`	`}`