@volar/vscode 1.4.0-alpha.2 → 1.4.0-alpha.3

package/out/index.d.ts

@@ -6,7 +6,9 @@ export { activate as activateFindFileReferences } from './features/fileReference
 export { activate as activateReloadProjects } from './features/reloadProject';
 export { activate as activateServerStats } from './features/serverStatus';
 export { activate as activateTsConfigStatusItem } from './features/tsconfig';
-export { activate as activateShowReferences } from './features/showReferences';
 export { activate as activateServerSys } from './features/serverSys';
 export { activate as activateTsVersionStatusItem, getTsdk } from './features/tsVersion';
 export declare function takeOverModeActive(context: vscode.ExtensionContext): boolean;
+import * as lsp from 'vscode-languageclient';
+export declare const middleware: lsp.Middleware;
+export declare function parseServerCommand(command: vscode.Command): vscode.Command;

package/out/index.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.takeOverModeActive = exports.getTsdk = exports.activateTsVersionStatusItem = exports.activateServerSys = exports.activateShowReferences = exports.activateTsConfigStatusItem = exports.activateServerStats = exports.activateReloadProjects = exports.activateFindFileReferences = exports.activateWriteVirtualFiles = exports.activateShowVirtualFiles = exports.activateAutoInsertion = void 0;
+exports.parseServerCommand = exports.middleware = exports.takeOverModeActive = exports.getTsdk = exports.activateTsVersionStatusItem = exports.activateServerSys = exports.activateTsConfigStatusItem = exports.activateServerStats = exports.activateReloadProjects = exports.activateFindFileReferences = exports.activateWriteVirtualFiles = exports.activateShowVirtualFiles = exports.activateAutoInsertion = void 0;
 const vscode = require("vscode");
 var autoInsertion_1 = require("./features/autoInsertion");
 Object.defineProperty(exports, "activateAutoInsertion", { enumerable: true, get: function () { return autoInsertion_1.activate; } });
@@ -15,8 +15,6 @@ var serverStatus_1 = require("./features/serverStatus");
 Object.defineProperty(exports, "activateServerStats", { enumerable: true, get: function () { return serverStatus_1.activate; } });
 var tsconfig_1 = require("./features/tsconfig");
 Object.defineProperty(exports, "activateTsConfigStatusItem", { enumerable: true, get: function () { return tsconfig_1.activate; } });
-var showReferences_1 = require("./features/showReferences");
-Object.defineProperty(exports, "activateShowReferences", { enumerable: true, get: function () { return showReferences_1.activate; } });
 var serverSys_1 = require("./features/serverSys");
 Object.defineProperty(exports, "activateServerSys", { enumerable: true, get: function () { return serverSys_1.activate; } });
 var tsVersion_1 = require("./features/tsVersion");
@@ -29,4 +27,66 @@ function takeOverModeActive(context) {
     return false;
 }
 exports.takeOverModeActive = takeOverModeActive;
+exports.middleware = {
+    async provideCodeActions(document, range, context, token, next) {
+        let actions = await next(document, range, context, token);
+        actions = actions?.map(action => {
+            if (!(action instanceof vscode.CodeAction)) {
+                return parseServerCommand(action);
+            }
+            if (action.command) {
+                action.command = parseServerCommand(action.command);
+            }
+            return action;
+        });
+        return actions;
+    },
+    async resolveCodeAction(item, token, next) {
+        const action = await next(item, token);
+        if (action?.command) {
+            action.command = parseServerCommand(action.command);
+        }
+        return action;
+    },
+    async provideCodeLenses(document, token, next) {
+        let codeLenses = await next(document, token);
+        codeLenses = codeLenses?.map(action => {
+            if (action.command) {
+                action.command = parseServerCommand(action.command);
+            }
+            return action;
+        });
+        return codeLenses;
+    },
+    async resolveCodeLens(item, token, next) {
+        const codeLens = await next(item, token);
+        if (codeLens?.command) {
+            codeLens.command = parseServerCommand(codeLens.command);
+        }
+        return codeLens;
+    },
+};
+function parseServerCommand(command) {
+    if (command.command === 'editor.action.rename' && command.arguments) {
+        return {
+            ...command,
+            arguments: [[
+                    vscode.Uri.parse(command.arguments[0]),
+                    new vscode.Position(command.arguments[1].line, command.arguments[1].character),
+                ]],
+        };
+    }
+    else if (command.command === 'editor.action.showReferences' && command.arguments) {
+        return {
+            ...command,
+            arguments: [
+                vscode.Uri.parse(command.arguments[0]),
+                new vscode.Position(command.arguments[1].line, command.arguments[1].character),
+                command.arguments[2].map((ref) => new vscode.Location(vscode.Uri.parse(ref.uri), new vscode.Range(ref.range.start.line, ref.range.start.character, ref.range.end.line, ref.range.end.character))),
+            ],
+        };
+    }
+    return command;
+}
+exports.parseServerCommand = parseServerCommand;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "1.4.0-alpha.2",
+	"version": "1.4.0-alpha.3",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "1.4.0-alpha.2",
-		"@volar/source-map": "1.4.0-alpha.2",
+		"@volar/language-server": "1.4.0-alpha.3",
+		"@volar/source-map": "1.4.0-alpha.3",
 		"typesafe-path": "^0.2.2",
 		"vscode-nls": "^5.2.0"
 	},
@@ -26,5 +26,5 @@
 		"@types/vscode": "*",
 		"vscode-languageclient": "*"
 	},
-	"gitHead": "034b230da17794a6fcf5a0b07668710f98ff84e3"
+	"gitHead": "033129d71b355a0f5bbf514c6887ed3a6e083c21"
 }

package/out/features/showReferences.d.ts

@@ -1,3 +0,0 @@
-import * as vscode from 'vscode';
-import { BaseLanguageClient } from 'vscode-languageclient';
-export declare function activate(client: BaseLanguageClient): Promise<vscode.Disposable>;

package/out/features/showReferences.js

@@ -1,25 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.activate = void 0;
-const vscode = require("vscode");
-const vscode_languageclient_1 = require("vscode-languageclient");
-const language_server_1 = require("@volar/language-server");
-async function activate(client) {
-    const subscriptions = [];
-    addHandle();
-    subscriptions.push(client.onDidChangeState(() => {
-        if (client.state === vscode_languageclient_1.State.Running) {
-            addHandle();
-        }
-    }));
-    return vscode.Disposable.from(...subscriptions);
-    function addHandle() {
-        subscriptions.push(client.onNotification(language_server_1.ShowReferencesNotification.type, params => {
-            const uri = params.textDocument.uri;
-            const pos = params.position;
-            const refs = params.references;
-            vscode.commands.executeCommand('editor.action.showReferences', vscode.Uri.parse(uri), new vscode.Position(pos.line, pos.character), refs.map(ref => new vscode.Location(vscode.Uri.parse(ref.uri), new vscode.Range(ref.range.start.line, ref.range.start.character, ref.range.end.line, ref.range.end.character))));
-        }));
-    }
-}
-exports.activate = activate;
-//# sourceMappingURL=showReferences.js.map