@volar/vscode 2.4.12 → 2.4.14

package/index.d.ts

@@ -11,7 +11,7 @@ import type { BaseLanguageClient, Middleware } from 'vscode-languageclient';
 export declare const middleware: Middleware;
 export declare function parseServerCommand(command: vscode.Command): vscode.Command;
 export declare const currentLabsVersion = "2.3.1";
-export declare function createLabsInfo(languageServerProtocol: typeof import('@volar/language-server/protocol')): {
+export declare function createLabsInfo(_?: typeof import('@volar/language-server/protocol')): {
     extensionExports: LabsInfo;
     addLanguageClient(languageClient: BaseLanguageClient): void;
 };
@@ -20,6 +20,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');
     };
 }

package/index.js

@@ -18,6 +18,7 @@ exports.currentLabsVersion = exports.middleware = exports.getTsdk = exports.acti
 exports.parseServerCommand = parseServerCommand;
 exports.createLabsInfo = createLabsInfo;
 const vscode = require("vscode");
+const protocol = require("./protocol.js");
 var autoInsertion_1 = require("./lib/features/autoInsertion");
 Object.defineProperty(exports, "activateAutoInsertion", { enumerable: true, get: function () { return autoInsertion_1.activate; } });
 var documentDropEdits_1 = require("./lib/features/documentDropEdits");
@@ -96,13 +97,13 @@ function parseServerCommand(command) {
     return command;
 }
 exports.currentLabsVersion = '2.3.1';
-function createLabsInfo(languageServerProtocol) {
+function createLabsInfo(_) {
     const onDidAddLanguageClientEmitter = new vscode.EventEmitter();
     const extensionExports = {
         volarLabs: {
             version: exports.currentLabsVersion,
             languageClients: [],
-            languageServerProtocol,
+            languageServerProtocol: protocol,
             onDidAddLanguageClient: onDidAddLanguageClientEmitter.event,
         },
     };

package/lib/features/autoInsertion.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = activate;
-const protocol_1 = require("@volar/language-server/protocol");
+const protocol_js_1 = require("../../protocol.js");
 const vscode = require("vscode");
 function activate(selector, client) {
     let isEnabled = false;
@@ -92,7 +92,7 @@ function activate(selector, client) {
                     text: lastChange.text,
                 },
             };
-            const insertion = await client.sendRequest(protocol_1.AutoInsertRequest.type, params);
+            const insertion = await client.sendRequest(protocol_js_1.AutoInsertRequest.type, params);
             if (insertion && isEnabled && !isCancel()) {
                 activeEditor.insertSnippet(new vscode.SnippetString(insertion));
             }

package/lib/features/documentDropEdits.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = activate;
 const vscode = require("vscode");
-const protocol_1 = require("@volar/language-server/protocol");
+const protocol_js_1 = require("../../protocol.js");
 function activate(selector, client) {
     let lastDataTransfer;
-    return vscode.Disposable.from(client.onRequest(protocol_1.DocumentDrop_DataTransferItemAsStringRequest.type, async ({ mimeType }) => {
+    return vscode.Disposable.from(client.onRequest(protocol_js_1.DocumentDrop_DataTransferItemAsStringRequest.type, async ({ mimeType }) => {
         const item = lastDataTransfer.get(mimeType);
         return await item?.asString() ?? '';
-    }), client.onRequest(protocol_1.DocumentDrop_DataTransferItemFileDataRequest.type, async ({ mimeType }) => {
+    }), client.onRequest(protocol_js_1.DocumentDrop_DataTransferItemFileDataRequest.type, async ({ mimeType }) => {
         const item = lastDataTransfer.get(mimeType);
         return await item?.asFile()?.data() ?? new Uint8Array();
     }), vscode.languages.registerDocumentDropEditProvider(selector, {
         async provideDocumentDropEdits(document, position, dataTransfer) {
             lastDataTransfer = dataTransfer;
-            const result = await client.sendRequest(protocol_1.DocumentDropRequest.type, {
+            const result = await client.sendRequest(protocol_js_1.DocumentDropRequest.type, {
                 textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
                 position: client.code2ProtocolConverter.asPosition(position),
                 dataTransfer: [...dataTransfer].map(([mimeType, item]) => {

package/lib/features/fileReferences.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = activate;
 const vscode = require("vscode");
 const nls = require("vscode-nls");
-const protocol_1 = require("@volar/language-server/protocol");
+const protocol_js_1 = require("../../protocol.js");
 const localize = nls.loadMessageBundle();
 function activate(cmd, client) {
     return vscode.commands.registerCommand(cmd, async (uri) => {
@@ -19,7 +19,7 @@ function activate(cmd, client) {
                 }
                 uri = editor.document.uri;
             }
-            const response = await client.sendRequest(protocol_1.FindFileReferenceRequest.type, { textDocument: { uri: uri.toString() } });
+            const response = await client.sendRequest(protocol_js_1.FindFileReferenceRequest.type, { textDocument: { uri: uri.toString() } });
             if (!response) {
                 return;
             }

package/lib/features/reloadProject.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = activate;
 const vscode = require("vscode");
-const protocol_1 = require("@volar/language-server/protocol");
+const protocol_js_1 = require("../../protocol.js");
 function activate(cmd, client) {
     return vscode.commands.registerCommand(cmd, () => {
         if (vscode.window.activeTextEditor) {
-            client.sendNotification(protocol_1.ReloadProjectNotification.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
+            client.sendNotification(protocol_js_1.ReloadProjectNotification.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
         }
     });
 }

package/lib/features/tsconfig.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = activate;
 const vscode = require("vscode");
-const protocol_1 = require("@volar/language-server/protocol");
+const protocol_js_1 = require("../../protocol.js");
 const path = require("path-browserify");
 function activate(selector, cmd, client) {
     const subscriptions = [];
@@ -26,7 +26,7 @@ function activate(selector, cmd, client) {
             || !vscode.languages.match(selector, vscode.window.activeTextEditor.document)) {
             return;
         }
-        const tsconfig = await client.sendRequest(protocol_1.GetMatchTsConfigRequest.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
+        const tsconfig = await client.sendRequest(protocol_js_1.GetMatchTsConfigRequest.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
         if (tsconfig?.uri) {
             currentTsconfigUri = vscode.Uri.parse(tsconfig.uri);
             statusBar.text = path.relative((vscode.workspace.rootPath?.replace(/\\/g, '/') || '/'), currentTsconfigUri.fsPath.replace(/\\/g, '/'));

package/lib/features/writeVirtualFiles.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = activate;
 const vscode = require("vscode");
-const protocol_1 = require("@volar/language-server/protocol");
+const protocol_js_1 = require("../../protocol.js");
 function activate(cmd, client) {
     return vscode.commands.registerCommand(cmd, () => {
         if (vscode.window.activeTextEditor) {
-            client.sendNotification(protocol_1.WriteVirtualFilesNotification.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
+            client.sendNotification(protocol_js_1.WriteVirtualFilesNotification.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "2.4.12",
+	"version": "2.4.14",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,6 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.4.12",
 		"path-browserify": "^1.0.1",
 		"vscode-languageclient": "^9.0.1",
 		"vscode-nls": "^5.2.0"
@@ -20,7 +19,8 @@
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@types/vscode": "^1.82.0"
+		"@types/vscode": "^1.82.0",
+		"@volar/language-server": "2.4.14"
 	},
-	"gitHead": "17b9b8a1f522afd1aad1e598d2fd935680d8a8d7"
+	"gitHead": "e8280897a7bc0e0366f657b6aefd4230ad5ee027"
 }

package/protocol.d.ts

@@ -0,0 +1,135 @@
+import type { CodeMapping, DocumentDropEdit } from '@volar/language-server';
+import * as protocol from 'vscode-languageclient';
+export * from 'vscode-languageclient';
+/**
+ * Client request server
+ */
+export declare namespace FindFileReferenceRequest {
+    type ParamsType = {
+        textDocument: protocol.TextDocumentIdentifier;
+    };
+    type ResponseType = protocol.Location[] | null | undefined;
+    type ErrorType = never;
+    const type: protocol.RequestType<ParamsType, ResponseType, never>;
+}
+export declare namespace GetMatchTsConfigRequest {
+    type ParamsType = protocol.TextDocumentIdentifier;
+    type ResponseType = {
+        uri: string;
+    } | null | undefined;
+    type ErrorType = never;
+    const type: protocol.RequestType<protocol.TextDocumentIdentifier, ResponseType, never>;
+}
+export declare namespace AutoInsertRequest {
+    type ParamsType = {
+        textDocument: protocol.TextDocumentIdentifier;
+        selection: protocol.Position;
+        change: {
+            rangeOffset: number;
+            rangeLength: number;
+            text: string;
+        };
+    };
+    type ResponseType = string | null | undefined;
+    type ErrorType = never;
+    const type: protocol.RequestType<ParamsType, ResponseType, never>;
+}
+export declare namespace WriteVirtualFilesNotification {
+    const type: protocol.NotificationType<protocol.TextDocumentIdentifier>;
+}
+export declare namespace ReloadProjectNotification {
+    const type: protocol.NotificationType<protocol.TextDocumentIdentifier>;
+}
+/**
+ * Document Drop
+ */
+export declare namespace DocumentDropRequest {
+    type ParamsType = protocol.TextDocumentPositionParams & {
+        dataTransfer: {
+            mimeType: string;
+            value: any;
+            file?: {
+                name: string;
+                uri?: string;
+            };
+        }[];
+    };
+    type ResponseType = DocumentDropEdit | null | undefined;
+    type ErrorType = never;
+    const type: protocol.RequestType<ParamsType, ResponseType, never>;
+}
+export declare namespace DocumentDrop_DataTransferItemAsStringRequest {
+    type ParamsType = {
+        mimeType: string;
+    };
+    type ResponseType = string;
+    type ErrorType = never;
+    const type: protocol.RequestType<ParamsType, string, never>;
+}
+export declare namespace DocumentDrop_DataTransferItemFileDataRequest {
+    type ParamsType = {
+        mimeType: string;
+    };
+    type ResponseType = Uint8Array;
+    type ErrorType = never;
+    const type: protocol.RequestType<ParamsType, ResponseType, never>;
+}
+/**
+ * Labs
+ */
+export declare namespace UpdateVirtualCodeStateNotification {
+    type ParamsType = {
+        fileUri: string;
+        virtualCodeId: string;
+        disabled: boolean;
+    };
+    const type: protocol.NotificationType<ParamsType>;
+}
+export declare namespace UpdateServicePluginStateNotification {
+    type ParamsType = {
+        uri: string;
+        serviceId: number;
+        disabled: boolean;
+    };
+    const type: protocol.NotificationType<ParamsType>;
+}
+export declare namespace GetServicePluginsRequest {
+    type ParamsType = protocol.TextDocumentIdentifier;
+    type ResponseType = {
+        id: number;
+        name?: string;
+        features: string[];
+        disabled: boolean;
+    }[] | null | undefined;
+    type ErrorType = never;
+    const type: protocol.RequestType<protocol.TextDocumentIdentifier, ResponseType, never>;
+}
+export declare namespace GetVirtualFileRequest {
+    type VirtualCodeInfo = {
+        fileUri: string;
+        virtualCodeId: string;
+        languageId: string;
+        version: number;
+        disabled: boolean;
+        embeddedCodes: VirtualCodeInfo[];
+    };
+    type ParamsType = protocol.TextDocumentIdentifier;
+    type ResponseType = VirtualCodeInfo | null | undefined;
+    type ErrorType = never;
+    const type: protocol.RequestType<protocol.TextDocumentIdentifier, ResponseType, never>;
+}
+export declare namespace GetVirtualCodeRequest {
+    type ParamsType = {
+        fileUri: string;
+        virtualCodeId: string;
+    };
+    type ResponseType = {
+        content: string;
+        mappings: Record<string, CodeMapping[]>;
+    };
+    type ErrorType = never;
+    const type: protocol.RequestType<ParamsType, ResponseType, never>;
+}
+export declare namespace LoadedTSFilesMetaRequest {
+    const type: protocol.RequestType0<unknown, unknown>;
+}

package/protocol.js

@@ -0,0 +1,85 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoadedTSFilesMetaRequest = exports.GetVirtualCodeRequest = exports.GetVirtualFileRequest = exports.GetServicePluginsRequest = exports.UpdateServicePluginStateNotification = exports.UpdateVirtualCodeStateNotification = exports.DocumentDrop_DataTransferItemFileDataRequest = exports.DocumentDrop_DataTransferItemAsStringRequest = exports.DocumentDropRequest = exports.ReloadProjectNotification = exports.WriteVirtualFilesNotification = exports.AutoInsertRequest = exports.GetMatchTsConfigRequest = exports.FindFileReferenceRequest = void 0;
+const protocol = require("vscode-languageclient");
+__exportStar(require("vscode-languageclient"), exports);
+/**
+ * Client request server
+ */
+var FindFileReferenceRequest;
+(function (FindFileReferenceRequest) {
+    FindFileReferenceRequest.type = new protocol.RequestType('volar/client/findFileReference');
+})(FindFileReferenceRequest || (exports.FindFileReferenceRequest = FindFileReferenceRequest = {}));
+var GetMatchTsConfigRequest;
+(function (GetMatchTsConfigRequest) {
+    GetMatchTsConfigRequest.type = new protocol.RequestType('volar/client/tsconfig');
+})(GetMatchTsConfigRequest || (exports.GetMatchTsConfigRequest = GetMatchTsConfigRequest = {}));
+var AutoInsertRequest;
+(function (AutoInsertRequest) {
+    AutoInsertRequest.type = new protocol.RequestType('volar/client/autoInsert');
+})(AutoInsertRequest || (exports.AutoInsertRequest = AutoInsertRequest = {}));
+var WriteVirtualFilesNotification;
+(function (WriteVirtualFilesNotification) {
+    WriteVirtualFilesNotification.type = new protocol.NotificationType('volar/client/writeVirtualFiles');
+})(WriteVirtualFilesNotification || (exports.WriteVirtualFilesNotification = WriteVirtualFilesNotification = {}));
+var ReloadProjectNotification;
+(function (ReloadProjectNotification) {
+    ReloadProjectNotification.type = new protocol.NotificationType('volar/client/reloadProject');
+})(ReloadProjectNotification || (exports.ReloadProjectNotification = ReloadProjectNotification = {}));
+/**
+ * Document Drop
+ */
+var DocumentDropRequest;
+(function (DocumentDropRequest) {
+    DocumentDropRequest.type = new protocol.RequestType('volar/client/documentDrop');
+})(DocumentDropRequest || (exports.DocumentDropRequest = DocumentDropRequest = {}));
+var DocumentDrop_DataTransferItemAsStringRequest;
+(function (DocumentDrop_DataTransferItemAsStringRequest) {
+    DocumentDrop_DataTransferItemAsStringRequest.type = new protocol.RequestType('volar/client/documentDrop/asString');
+})(DocumentDrop_DataTransferItemAsStringRequest || (exports.DocumentDrop_DataTransferItemAsStringRequest = DocumentDrop_DataTransferItemAsStringRequest = {}));
+var DocumentDrop_DataTransferItemFileDataRequest;
+(function (DocumentDrop_DataTransferItemFileDataRequest) {
+    DocumentDrop_DataTransferItemFileDataRequest.type = new protocol.RequestType('volar/client/documentDrop/fileData');
+})(DocumentDrop_DataTransferItemFileDataRequest || (exports.DocumentDrop_DataTransferItemFileDataRequest = DocumentDrop_DataTransferItemFileDataRequest = {}));
+/**
+ * Labs
+ */
+var UpdateVirtualCodeStateNotification;
+(function (UpdateVirtualCodeStateNotification) {
+    UpdateVirtualCodeStateNotification.type = new protocol.NotificationType('volar/client/labs/updateVirtualFileState');
+})(UpdateVirtualCodeStateNotification || (exports.UpdateVirtualCodeStateNotification = UpdateVirtualCodeStateNotification = {}));
+var UpdateServicePluginStateNotification;
+(function (UpdateServicePluginStateNotification) {
+    UpdateServicePluginStateNotification.type = new protocol.NotificationType('volar/client/labs/updateServicePluginState');
+})(UpdateServicePluginStateNotification || (exports.UpdateServicePluginStateNotification = UpdateServicePluginStateNotification = {}));
+var GetServicePluginsRequest;
+(function (GetServicePluginsRequest) {
+    GetServicePluginsRequest.type = new protocol.RequestType('volar/client/servicePlugins');
+})(GetServicePluginsRequest || (exports.GetServicePluginsRequest = GetServicePluginsRequest = {}));
+var GetVirtualFileRequest;
+(function (GetVirtualFileRequest) {
+    GetVirtualFileRequest.type = new protocol.RequestType('volar/client/virtualFiles');
+})(GetVirtualFileRequest || (exports.GetVirtualFileRequest = GetVirtualFileRequest = {}));
+var GetVirtualCodeRequest;
+(function (GetVirtualCodeRequest) {
+    GetVirtualCodeRequest.type = new protocol.RequestType('volar/client/virtualFile');
+})(GetVirtualCodeRequest || (exports.GetVirtualCodeRequest = GetVirtualCodeRequest = {}));
+var LoadedTSFilesMetaRequest;
+(function (LoadedTSFilesMetaRequest) {
+    LoadedTSFilesMetaRequest.type = new protocol.RequestType0('volar/client/loadedTsFiles');
+})(LoadedTSFilesMetaRequest || (exports.LoadedTSFilesMetaRequest = LoadedTSFilesMetaRequest = {}));
+//# sourceMappingURL=protocol.js.map