chore: upgrade volar

johnsoncodehk · johnsoncodehk · commit e86e6ebb611a · 2024-05-15T19:17:21.000+08:00
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -517,7 +517,7 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "~2.2.2",
+		"@volar/vscode": "~2.2.3",
 		"@vue/language-core": "2.0.17",
 		"@vue/language-server": "2.0.17",
 		"@vue/typescript-plugin": "2.0.17",
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
 	"devDependencies": {
 		"@lerna-lite/cli": "latest",
 		"@lerna-lite/publish": "latest",
-		"@volar/language-service": "~2.2.2",
+		"@volar/language-service": "~2.2.3",
 		"@volar/tsl-config": "latest",
 		"tsl": "latest",
 		"typescript": "latest",
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.2",
+		"@volar/typescript": "~2.2.3",
 		"@vue/language-core": "2.0.17",
 		"path-browserify": "^1.0.1",
 		"vue-component-type-helpers": "2.0.17"
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.2",
+		"@volar/language-core": "~2.2.3",
 		"@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.17"
 	},
 	"dependencies": {
-		"@volar/source-map": "~2.2.2",
-		"volar-service-pug": "0.0.44"
+		"@volar/source-map": "~2.2.3",
+		"volar-service-pug": "0.0.45"
 	}
 }
diff --git a/packages/language-server/lib/hybridModeProject.ts b/packages/language-server/lib/hybridModeProject.ts
@@ -1,10 +1,12 @@
 import type { LanguagePlugin, ProviderResult, ServerBase, ServerProject, ServerProjectProvider, TypeScriptProjectHost } from '@volar/language-server';
 import { createSimpleServerProject } from '@volar/language-server/lib/project/simpleProject';
 import { createServiceEnvironment, getWorkspaceFolder } from '@volar/language-server/lib/project/simpleProjectProvider';
-import { FileMap, createLanguage } from '@vue/language-core';
+import { createUriMap } from '@volar/language-server/lib/utils/uriMap';
+import { createLanguage } from '@vue/language-core';
 import { Disposable, LanguageService, ServiceEnvironment, createLanguageService } from '@vue/language-service';
 import { searchNamedPipeServerForFile } from '@vue/typescript-plugin/lib/utils';
 import type * as ts from 'typescript';
+import { URI } from 'vscode-uri';
 
 export type GetLanguagePlugin = (
 	serviceEnv: ServiceEnvironment,
@@ -22,17 +24,18 @@ export function createHybridModeProjectProviderFactory(
 ): ServerProjectProvider {
 	let initialized = false;
 
-	const serviceEnvs = new FileMap<ServiceEnvironment>(sys.useCaseSensitiveFileNames);
-	const tsconfigProjects = new FileMap<Promise<ServerProject>>(sys.useCaseSensitiveFileNames);
-	const simpleProjects = new FileMap<Promise<ServerProject>>(sys.useCaseSensitiveFileNames);
+	const serviceEnvs = createUriMap<ServiceEnvironment>(sys.useCaseSensitiveFileNames);
+	const tsconfigProjects = createUriMap<Promise<ServerProject>>(sys.useCaseSensitiveFileNames);
+	const simpleProjects = createUriMap<Promise<ServerProject>>(sys.useCaseSensitiveFileNames);
 
 	return {
 		async get(uri): Promise<ServerProject> {
 			if (!initialized) {
 				initialized = true;
 				initialize(this);
 			}
-			const workspaceFolder = getWorkspaceFolder(uri, this.workspaceFolders);
+			const parsedUri = URI.parse(uri);
+			const workspaceFolder = getWorkspaceFolder(parsedUri, this.workspaceFolders);
 			let serviceEnv = serviceEnvs.get(workspaceFolder);
 			if (!serviceEnv) {
 				serviceEnv = createServiceEnvironment(this, workspaceFolder);
@@ -42,7 +45,7 @@ export function createHybridModeProjectProviderFactory(
 			const projectInfo = (await searchNamedPipeServerForFile(fileName))?.projectInfo;
 			if (projectInfo?.kind === 1) {
 				const tsconfig = projectInfo.name;
-				const tsconfigUri = serviceEnv.typescript!.fileNameToUri(tsconfig);
+				const tsconfigUri = URI.parse(serviceEnv.typescript!.fileNameToUri(tsconfig));
 				if (!tsconfigProjects.has(tsconfigUri)) {
 					tsconfigProjects.set(tsconfigUri, (async () => {
 						const languagePlugins = await getLanguagePlugins(serviceEnv, tsconfig, undefined, {
@@ -89,9 +92,10 @@ export function createHybridModeProjectProviderFactory(
 	function initialize(server: ServerBase) {
 		server.onDidChangeWatchedFiles(({ changes }) => {
 			for (const change of changes) {
-				if (tsconfigProjects.has(change.uri)) {
-					tsconfigProjects.get(change.uri)?.then(project => project.dispose());
-					tsconfigProjects.delete(change.uri);
+				const changeUri = URI.parse(change.uri);
+				if (tsconfigProjects.has(changeUri)) {
+					tsconfigProjects.get(changeUri)?.then(project => project.dispose());
+					tsconfigProjects.delete(changeUri);
 					server.clearPushDiagnostics();
 				}
 			}
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -15,11 +15,12 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.2.2",
-		"@volar/language-server": "~2.2.2",
+		"@volar/language-core": "~2.2.3",
+		"@volar/language-server": "~2.2.3",
 		"@vue/language-core": "2.0.17",
 		"@vue/language-service": "2.0.17",
 		"@vue/typescript-plugin": "2.0.17",
-		"vscode-languageserver-protocol": "^3.17.5"
+		"vscode-languageserver-protocol": "^3.17.5",
+		"vscode-uri": "^3.0.8"
 	}
 }
diff --git a/packages/language-service/index.ts b/packages/language-service/index.ts
@@ -88,7 +88,7 @@ export function getVueLanguageServicePlugins(
 		createVueExtractFilePlugin(ts, getTsPluginClient),
 		createVueToggleVBindPlugin(ts),
 		createEmmetPlugin({
-			mappedModes: {
+			mappedLanguages: {
 				'vue': 'html',
 				'postcss': 'scss',
 			},
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.2.2",
-		"@volar/language-service": "~2.2.2",
-		"@volar/typescript": "~2.2.2",
+		"@volar/language-core": "~2.2.3",
+		"@volar/language-service": "~2.2.3",
+		"@volar/typescript": "~2.2.3",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/language-core": "2.0.17",
 		"@vue/shared": "^3.4.0",
 		"@vue/typescript-plugin": "2.0.17",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
-		"volar-service-css": "0.0.44",
-		"volar-service-emmet": "0.0.44",
-		"volar-service-html": "0.0.44",
-		"volar-service-json": "0.0.44",
-		"volar-service-pug": "0.0.44",
-		"volar-service-pug-beautify": "0.0.44",
-		"volar-service-typescript": "0.0.44",
-		"volar-service-typescript-twoslash-queries": "0.0.44",
+		"volar-service-css": "0.0.45",
+		"volar-service-emmet": "0.0.45",
+		"volar-service-html": "0.0.45",
+		"volar-service-json": "0.0.45",
+		"volar-service-pug": "0.0.45",
+		"volar-service-pug-beautify": "0.0.45",
+		"volar-service-typescript": "0.0.45",
+		"volar-service-typescript-twoslash-queries": "0.0.45",
 		"vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "~2.2.2",
+		"@volar/kit": "~2.2.3",
 		"vscode-languageserver-protocol": "^3.17.5"
 	}
 }
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.2.2",
+		"@volar/typescript": "~2.2.3",
 		"@vue/language-core": "2.0.17",
 		"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.2.2",
+		"@volar/typescript": "~2.2.3",
 		"@vue/language-core": "2.0.17",
 		"@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.17"`
`17`	`17`	`},`
`18`	`18`	`"dependencies": {`
`19`		`- "@volar/source-map": "~2.2.2",`
`20`		`- "volar-service-pug": "0.0.44"`
	`19`	`+ "@volar/source-map": "~2.2.3",`
	`20`	`+ "volar-service-pug": "0.0.45"`
`21`	`21`	`}`
`22`	`22`	`}`