fix(vscode): don't rely on language-server/protocol

johnsoncodehk · johnsoncodehk · commit f2ef85330d73 · 2025-05-16T17:42:16.000+08:00
diff --git a/extensions/labs/src/views/serversView.ts b/extensions/labs/src/views/serversView.ts
@@ -1,4 +1,3 @@
-import { LoadedTSFilesMetaRequest } from '@volar/language-server/protocol';
 import type { LabsInfo } from '@volar/vscode';
 import * as lsp from '@volar/vscode';
 import * as fs from 'fs';
@@ -114,7 +113,7 @@ export function activate(context: vscode.ExtensionContext) {
 						command: {
 							command: '_volar.action.tsMemoryTreemap',
 							title: '',
-							arguments: [element.client],
+							arguments: [element.client, element.extension.exports.volarLabs.languageServerProtocol],
 						},
 					};
 				}
@@ -179,7 +178,7 @@ export function activate(context: vscode.ExtensionContext) {
 			await client.stop();
 			await client.start();
 		}),
-		vscode.commands.registerCommand('_volar.action.tsMemoryTreemap', async (client: lsp.BaseLanguageClient) => {
+		vscode.commands.registerCommand('_volar.action.tsMemoryTreemap', async (client: lsp.BaseLanguageClient, protocol: typeof import('@volar/vscode/protocol')) => {
 
 			const select = await quickPick([
 				{
@@ -210,7 +209,7 @@ export function activate(context: vscode.ExtensionContext) {
 
 				progress.report({ increment: 0 });
 
-				const meta = await client.sendRequest(LoadedTSFilesMetaRequest.type);
+				const meta = await client.sendRequest(protocol.LoadedTSFilesMetaRequest.type);
 				const { visualizer } = await import('esbuild-visualizer/dist/plugin/index.js');
 				const fileContent = await visualizer(meta as any);
 
diff --git a/packages/language-server/protocol.ts b/packages/language-server/protocol.ts
@@ -1,6 +1,6 @@
 import type { CodeMapping } from '@volar/language-core';
 import type { DocumentDropEdit } from '@volar/language-service';
-import * as vscode from 'vscode-languageserver-protocol';
+import * as protocol from 'vscode-languageserver-protocol';
 
 export * from 'vscode-languageserver-protocol';
 
@@ -10,24 +10,24 @@ export * from 'vscode-languageserver-protocol';
 
 export namespace FindFileReferenceRequest {
 	export type ParamsType = {
-		textDocument: vscode.TextDocumentIdentifier;
+		textDocument: protocol.TextDocumentIdentifier;
 	};
-	export type ResponseType = vscode.Location[] | null | undefined;
+	export type ResponseType = protocol.Location[] | null | undefined;
 	export type ErrorType = never;
-	export const type = new vscode.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/findFileReference');
+	export const type = new protocol.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/findFileReference');
 }
 
 export namespace GetMatchTsConfigRequest {
-	export type ParamsType = vscode.TextDocumentIdentifier;
+	export type ParamsType = protocol.TextDocumentIdentifier;
 	export type ResponseType = { uri: string; } | null | undefined;
 	export type ErrorType = never;
-	export const type = new vscode.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/tsconfig');
+	export const type = new protocol.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/tsconfig');
 }
 
 export namespace AutoInsertRequest {
 	export type ParamsType = {
-		textDocument: vscode.TextDocumentIdentifier;
-		selection: vscode.Position;
+		textDocument: protocol.TextDocumentIdentifier;
+		selection: protocol.Position;
 		change: {
 			rangeOffset: number;
 			rangeLength: number;
@@ -36,23 +36,23 @@ export namespace AutoInsertRequest {
 	};
 	export type ResponseType = string | null | undefined;
 	export type ErrorType = never;
-	export const type = new vscode.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/autoInsert');
+	export const type = new protocol.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/autoInsert');
 }
 
 export namespace WriteVirtualFilesNotification {
-	export const type = new vscode.NotificationType<vscode.TextDocumentIdentifier>('volar/client/writeVirtualFiles');
+	export const type = new protocol.NotificationType<protocol.TextDocumentIdentifier>('volar/client/writeVirtualFiles');
 }
 
 export namespace ReloadProjectNotification {
-	export const type = new vscode.NotificationType<vscode.TextDocumentIdentifier>('volar/client/reloadProject');
+	export const type = new protocol.NotificationType<protocol.TextDocumentIdentifier>('volar/client/reloadProject');
 }
 
 /**
  * Document Drop
  */
 
 export namespace DocumentDropRequest {
-	export type ParamsType = vscode.TextDocumentPositionParams & {
+	export type ParamsType = protocol.TextDocumentPositionParams & {
 		dataTransfer: {
 			mimeType: string;
 			value: any;
@@ -64,7 +64,7 @@ export namespace DocumentDropRequest {
 	};
 	export type ResponseType = DocumentDropEdit | null | undefined;
 	export type ErrorType = never;
-	export const type = new vscode.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/documentDrop');
+	export const type = new protocol.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/documentDrop');
 }
 
 export namespace DocumentDrop_DataTransferItemAsStringRequest {
@@ -73,7 +73,7 @@ export namespace DocumentDrop_DataTransferItemAsStringRequest {
 	};
 	export type ResponseType = string;
 	export type ErrorType = never;
-	export const type = new vscode.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/documentDrop/asString');
+	export const type = new protocol.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/documentDrop/asString');
 }
 
 export namespace DocumentDrop_DataTransferItemFileDataRequest {
@@ -82,7 +82,7 @@ export namespace DocumentDrop_DataTransferItemFileDataRequest {
 	};
 	export type ResponseType = Uint8Array;
 	export type ErrorType = never;
-	export const type = new vscode.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/documentDrop/fileData');
+	export const type = new protocol.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/documentDrop/fileData');
 }
 
 /**
@@ -95,7 +95,7 @@ export namespace UpdateVirtualCodeStateNotification {
 		virtualCodeId: string;
 		disabled: boolean;
 	};
-	export const type = new vscode.NotificationType<ParamsType>('volar/client/labs/updateVirtualFileState');
+	export const type = new protocol.NotificationType<ParamsType>('volar/client/labs/updateVirtualFileState');
 }
 
 export namespace UpdateServicePluginStateNotification {
@@ -104,19 +104,19 @@ export namespace UpdateServicePluginStateNotification {
 		serviceId: number;
 		disabled: boolean;
 	};
-	export const type = new vscode.NotificationType<ParamsType>('volar/client/labs/updateServicePluginState');
+	export const type = new protocol.NotificationType<ParamsType>('volar/client/labs/updateServicePluginState');
 }
 
 export namespace GetServicePluginsRequest {
-	export type ParamsType = vscode.TextDocumentIdentifier;
+	export type ParamsType = protocol.TextDocumentIdentifier;
 	export type ResponseType = {
 		id: number;
 		name?: string;
 		features: string[];
 		disabled: boolean;
 	}[] | null | undefined;
 	export type ErrorType = never;
-	export const type = new vscode.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/servicePlugins');
+	export const type = new protocol.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/servicePlugins');
 }
 
 export namespace GetVirtualFileRequest {
@@ -128,10 +128,10 @@ export namespace GetVirtualFileRequest {
 		disabled: boolean;
 		embeddedCodes: VirtualCodeInfo[];
 	};
-	export type ParamsType = vscode.TextDocumentIdentifier;
+	export type ParamsType = protocol.TextDocumentIdentifier;
 	export type ResponseType = VirtualCodeInfo | null | undefined;
 	export type ErrorType = never;
-	export const type = new vscode.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/virtualFiles');
+	export const type = new protocol.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/virtualFiles');
 }
 
 export namespace GetVirtualCodeRequest {
@@ -144,9 +144,9 @@ export namespace GetVirtualCodeRequest {
 		mappings: Record<string, CodeMapping[]>;
 	};
 	export type ErrorType = never;
-	export const type = new vscode.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/virtualFile');
+	export const type = new protocol.RequestType<ParamsType, ResponseType, ErrorType>('volar/client/virtualFile');
 }
 
 export namespace LoadedTSFilesMetaRequest {
-	export const type = new vscode.RequestType0('volar/client/loadedTsFiles');
+	export const type = new protocol.RequestType0('volar/client/loadedTsFiles');
 }
diff --git a/packages/vscode/index.ts b/packages/vscode/index.ts
@@ -1,4 +1,5 @@
 import * as vscode from 'vscode';
+import * as protocol from './protocol.js';
 
 export { activate as activateAutoInsertion } from './lib/features/autoInsertion';
 export { activate as activateDocumentDropEdit } from './lib/features/documentDropEdits';
@@ -80,13 +81,13 @@ export function parseServerCommand(command: vscode.Command) {
 
 export const currentLabsVersion = '2.3.1';
 
-export function createLabsInfo(languageServerProtocol: typeof import('@volar/language-server/protocol')) {
+export function createLabsInfo(_?: typeof import('@volar/language-server/protocol')) {
 	const onDidAddLanguageClientEmitter = new vscode.EventEmitter<BaseLanguageClient>();
 	const extensionExports: LabsInfo = {
 		volarLabs: {
 			version: currentLabsVersion,
 			languageClients: [] as BaseLanguageClient[],
-			languageServerProtocol,
+			languageServerProtocol: protocol,
 			onDidAddLanguageClient: onDidAddLanguageClientEmitter.event,
 		},
 	};
@@ -104,6 +105,6 @@ export interface LabsInfo {
 		version: typeof currentLabsVersion;
 		languageClients: BaseLanguageClient[];
 		onDidAddLanguageClient: vscode.Event<BaseLanguageClient>;
-		languageServerProtocol: typeof import('@volar/language-server/protocol');
+		languageServerProtocol: typeof import('./protocol.js');
 	};
 }
diff --git a/packages/vscode/lib/features/autoInsertion.ts b/packages/vscode/lib/features/autoInsertion.ts
@@ -1,5 +1,5 @@
 import type { ExperimentalFeatures } from '@volar/language-server';
-import { AutoInsertRequest } from '@volar/language-server/protocol';
+import { AutoInsertRequest } from '../../protocol.js';
 import * as vscode from 'vscode';
 import type { BaseLanguageClient, ServerCapabilities } from 'vscode-languageclient';
 
diff --git a/packages/vscode/lib/features/documentDropEdits.ts b/packages/vscode/lib/features/documentDropEdits.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
-import { DocumentDropRequest, DocumentDrop_DataTransferItemAsStringRequest, DocumentDrop_DataTransferItemFileDataRequest } from '@volar/language-server/protocol';
+import { DocumentDropRequest, DocumentDrop_DataTransferItemAsStringRequest, DocumentDrop_DataTransferItemFileDataRequest } from '../../protocol.js';
 
 export function activate(selector: vscode.DocumentSelector, client: BaseLanguageClient) {
 
diff --git a/packages/vscode/lib/features/fileReferences.ts b/packages/vscode/lib/features/fileReferences.ts
@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
 import * as nls from 'vscode-nls';
-import { FindFileReferenceRequest } from '@volar/language-server/protocol';
+import { FindFileReferenceRequest } from '../../protocol.js';
 
 const localize = nls.loadMessageBundle();
 
diff --git a/packages/vscode/lib/features/reloadProject.ts b/packages/vscode/lib/features/reloadProject.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
-import { ReloadProjectNotification } from '@volar/language-server/protocol';
+import { ReloadProjectNotification } from '../../protocol.js';
 
 export function activate(cmd: string, client: BaseLanguageClient) {
 	return vscode.commands.registerCommand(cmd, () => {
diff --git a/packages/vscode/lib/features/tsconfig.ts b/packages/vscode/lib/features/tsconfig.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
-import { GetMatchTsConfigRequest } from '@volar/language-server/protocol';
+import { GetMatchTsConfigRequest } from '../../protocol.js';
 import * as path from 'path-browserify';
 
 export function activate(
diff --git a/packages/vscode/lib/features/writeVirtualFiles.ts b/packages/vscode/lib/features/writeVirtualFiles.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
-import { WriteVirtualFilesNotification } from '@volar/language-server/protocol';
+import { WriteVirtualFilesNotification } from '../../protocol.js';
 
 export function activate(cmd: string, client: BaseLanguageClient) {
 	return vscode.commands.registerCommand(cmd, () => {
diff --git a/packages/vscode/package.json b/packages/vscode/package.json
@@ -12,14 +12,14 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.4.13",
 		"path-browserify": "^1.0.1",
 		"vscode-languageclient": "^9.0.1",
 		"vscode-nls": "^5.2.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@types/vscode": "^1.82.0"
+		"@types/vscode": "^1.82.0",
+		"@volar/language-server": "2.4.13"
 	}
 }
diff --git a/packages/vscode/protocol.ts b/packages/vscode/protocol.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
