chore: bump next volar

vuejs · Aug 18, 2024 · 2e559db · 2e559db
1 parent 0e52a2d
commit 2e559db
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 111 deletions.
diff --git a/extensions/vscode/src/common.ts b/extensions/vscode/src/common.ts
@@ -234,7 +234,6 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 	lsp.activateAutoInsertion(selectors, client);
 	lsp.activateDocumentDropEdit(selectors, client);
 	lsp.activateWriteVirtualFiles('vue.action.writeVirtualFiles', client);
-	lsp.activateServerSys(client);
 
 	if (!enabledHybridMode) {
 		lsp.activateTsConfigStatusItem(selectors, 'vue.tsconfig', client);

diff --git a/package.json b/package.json
@@ -31,13 +31,13 @@
 	},
 	"pnpm": {
 		"overrides": {
-			"@volar/kit": "https://pkg.pr.new/volarjs/volar.js/@volar/kit@7f93034",
-			"@volar/language-core": "https://pkg.pr.new/volarjs/volar.js/@volar/language-core@7f93034",
-			"@volar/language-server": "https://pkg.pr.new/volarjs/volar.js/@volar/language-server@7f93034",
-			"@volar/language-service": "https://pkg.pr.new/volarjs/volar.js/@volar/language-service@7f93034",
-			"@volar/source-map": "https://pkg.pr.new/volarjs/volar.js/@volar/source-map@7f93034",
-			"@volar/typescript": "https://pkg.pr.new/volarjs/volar.js/@volar/typescript@7f93034",
-			"@volar/vscode": "https://pkg.pr.new/volarjs/volar.js/@volar/vscode@7f93034",
+			"@volar/kit": "https://pkg.pr.new/volarjs/volar.js/@volar/kit@ab44192",
+			"@volar/language-core": "https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192",
+			"@volar/language-server": "https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192",
+			"@volar/language-service": "https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192",
+			"@volar/source-map": "https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192",
+			"@volar/typescript": "https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192",
+			"@volar/vscode": "https://pkg.pr.new/volarjs/volar.js/@volar/vscode@ab44192",
 			"volar-service-css": "https://pkg.pr.new/volarjs/services/volar-service-css@f520ee3",
 			"volar-service-emmet": "https://pkg.pr.new/volarjs/services/volar-service-emmet@f520ee3",
 			"volar-service-html": "https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3",

diff --git a/packages/language-server/lib/hybridModeProject.ts b/packages/language-server/lib/hybridModeProject.ts
@@ -25,9 +25,9 @@ export function createHybridModeProject(
 		setup(_server) {
 			server = _server;
 			onSomePipeReadyCallbacks.push(() => {
-				server.diagnosticsSupport?.refresh(project, false);
+				server.languageFeatures.refreshDiagnostics(false);
 			});
-			server.onDidChangeWatchedFiles(({ changes }) => {
+			server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => {
 				for (const change of changes) {
 					const changeUri = URI.parse(change.uri);
 					if (tsconfigProjects.has(changeUri)) {
@@ -90,11 +90,10 @@ export function createHybridModeProject(
 			asFileName,
 		});
 		const language = createLanguage([
-			{ getLanguageId: uri => server.documents.get(server.getSyncedDocumentKey(uri) ?? uri.toString())?.languageId },
+			{ getLanguageId: uri => server.documents.get(uri)?.languageId },
 			...languagePlugins,
 		], createUriMap(), uri => {
-			const documentKey = server.getSyncedDocumentKey(uri);
-			const document = documentKey ? server.documents.get(documentKey) : undefined;
+			const document = server.documents.get(uri);
 			if (document) {
 				language.scripts.set(uri, document.getSnapshot(), document.languageId);
 			}
@@ -107,7 +106,7 @@ export function createHybridModeProject(
 		return createLanguageService(
 			language,
 			server.languageServicePlugins,
-			createLanguageServiceEnvironment(server, [...server.workspaceFolders.keys()]),
+			createLanguageServiceEnvironment(server, [...server.workspaceFolders.all]),
 			project
 		);
 	}

diff --git a/packages/language-server/lib/initialize.ts b/packages/language-server/lib/initialize.ts
@@ -70,7 +70,7 @@ export function initialize(
 				watchingExtensions.add(ext);
 			}
 			fileWatcher?.then(dispose => dispose.dispose());
-			fileWatcher = server.watchFiles(['**/*.{' + [...watchingExtensions].join(',') + '}']);
+			fileWatcher = server.fileWatcher.watchFiles(['**/*.{' + [...watchingExtensions].join(',') + '}']);
 		}
 	}
 }
diff --git a/packages/language-service/lib/plugins/vue-document-drop.ts b/packages/language-service/lib/plugins/vue-document-drop.ts
@@ -14,7 +14,7 @@ export function create(
 	return {
 		name: 'vue-document-drop',
 		capabilities: {
-			// documentDropEditsProvider: true,
+			documentDropEditsProvider: true,
 		},
 		create(context): LanguageServicePluginInstance {
 			if (!context.project.vue) {