@volar/vscode 1.5.4 → 1.6.1

package/out/features/showVirtualFiles.d.ts

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

package/out/features/showVirtualFiles.js

@@ -29,8 +29,9 @@ const mappingSelectionDecorationType = vscode.window.createTextEditorDecorationT
         backgroundColor: 'darkblue'
     }
 });
-async function activate(cmd, client) {
-    class MappingDataHoverProvider {
+async function activate(_cmd, client) {
+    const subscriptions = [];
+    subscriptions.push(vscode.languages.registerHoverProvider({ scheme }, {
         async provideHover(document, position, _token) {
             const maps = virtualUriToSourceMap.get(document.uri.toString());
             if (!maps)
@@ -56,12 +57,31 @@ async function activate(cmd, client) {
                 '```',
             ].join('\n')));
         }
-    }
-    const subscriptions = [];
-    subscriptions.push(vscode.languages.registerHoverProvider({ scheme }, new MappingDataHoverProvider()));
+    }));
+    subscriptions.push(vscode.languages.registerDefinitionProvider({ scheme }, {
+        async provideDefinition(document, position, _token) {
+            const stacks = virtualUriToStacks.get(document.uri.toString());
+            if (!stacks)
+                return;
+            const offset = document.offsetAt(position);
+            const stack = stacks.find(stack => stack.range[0] <= offset && offset <= stack.range[1]);
+            if (!stack)
+                return;
+            const line = Number(stack.source.split(':').at(-2));
+            const character = Number(stack.source.split(':').at(-1));
+            const fileName = stack.source.split(':').slice(0, -2).join(':');
+            const link = {
+                originSelectionRange: new vscode.Range(document.positionAt(stack.range[0]), document.positionAt(stack.range[1])),
+                targetUri: vscode.Uri.file(fileName),
+                targetRange: new vscode.Range(line - 1, character - 1, line - 1, character - 1),
+            };
+            return [link];
+        }
+    }));
     const sourceUriToVirtualUris = new Map();
     const virtualUriToSourceEditor = new Map();
     const virtualUriToSourceMap = new Map();
+    const virtualUriToStacks = new Map();
     const docChangeEvent = new vscode.EventEmitter();
     const virtualDocuments = new Map();
     let updateVirtualDocument;
@@ -86,9 +106,9 @@ async function activate(cmd, client) {
             const fileName = uri.with({ scheme: 'file' }).fsPath;
             const requestEditor = virtualUriToSourceEditor.get(uri.toString());
             if (requestEditor) {
-                const virtual = await client.sendRequest(language_server_1.GetVirtualFileRequest.type, { sourceFileUri: requestEditor.document.uri.toString(), virtualFileName: fileName });
+                const virtualFile = await client.sendRequest(language_server_1.GetVirtualFileRequest.type, { sourceFileUri: requestEditor.document.uri.toString(), virtualFileName: fileName });
                 virtualUriToSourceMap.set(uri.toString(), []);
-                Object.entries(virtual.mappings).forEach(([sourceUri, mappings]) => {
+                Object.entries(virtualFile.mappings).forEach(([sourceUri, mappings]) => {
                     const sourceEditor = vscode.window.visibleTextEditors.find(editor => editor.document.uri.toString() === sourceUri);
                     if (sourceEditor) {
                         virtualUriToSourceMap.get(uri.toString())?.push([
@@ -102,22 +122,11 @@ async function activate(cmd, client) {
                         sourceUriToVirtualUris.get(sourceUri)?.add(uri.toString());
                     }
                 });
-                virtualDocuments.set(uri.toString(), vscode_languageclient_1.TextDocument.create('', '', 0, virtual.content));
+                virtualDocuments.set(uri.toString(), vscode_languageclient_1.TextDocument.create('', '', 0, virtualFile.content));
+                virtualUriToStacks.set(uri.toString(), virtualFile.codegenStacks);
                 clearTimeout(updateDecorationsTimeout);
                 updateDecorationsTimeout = setTimeout(updateDecorations, 100);
-                return virtual.content;
-            }
-        }
-    }));
-    subscriptions.push(vscode.commands.registerCommand(cmd, async () => {
-        const sourceEditor = vscode.window.activeTextEditor;
-        if (sourceEditor) {
-            const fileNames = await client.sendRequest(language_server_1.GetVirtualFileNamesRequest.type, client.code2ProtocolConverter.asTextDocumentIdentifier(sourceEditor.document));
-            const uris = fileNames.map(fileName => vscode.Uri.file(fileName).with({ scheme }));
-            sourceUriToVirtualUris.set(sourceEditor.document.uri.toString(), new Set(uris.map(uri => uri.toString())));
-            for (const uri of uris) {
-                virtualUriToSourceEditor.set(uri.toString(), sourceEditor);
-                vscode.window.showTextDocument(uri, { viewColumn: vscode.ViewColumn.Two, preview: false });
+                return virtualFile.content;
             }
         }
     }));

package/out/index.d.ts

@@ -1,6 +1,5 @@
 import * as vscode from 'vscode';
 export { activate as activateAutoInsertion } from './features/autoInsertion';
-export { activate as activateShowVirtualFiles } from './features/showVirtualFiles';
 export { activate as activateWriteVirtualFiles } from './features/writeVirtualFiles';
 export { activate as activateFindFileReferences } from './features/fileReferences';
 export { activate as activateReloadProjects } from './features/reloadProject';
@@ -12,3 +11,11 @@ export declare function takeOverModeActive(context: vscode.ExtensionContext): bo
 import * as lsp from 'vscode-languageclient';
 export declare const middleware: lsp.Middleware;
 export declare function parseServerCommand(command: vscode.Command): vscode.Command;
+export interface Exports {
+    codegenStackSupport?: boolean;
+    languageClients: lsp.BaseLanguageClient[];
+    serverLib: typeof import('@volar/language-server');
+}
+export declare function createExports(exports: Exports): {
+    volar: Exports;
+};

package/out/index.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.createExports = exports.parseServerCommand = exports.middleware = exports.takeOverModeActive = exports.getTsdk = exports.activateTsVersionStatusItem = exports.activateServerSys = exports.activateTsConfigStatusItem = exports.activateServerStats = exports.activateReloadProjects = exports.activateFindFileReferences = exports.activateWriteVirtualFiles = 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; } });
-var showVirtualFiles_1 = require("./features/showVirtualFiles");
-Object.defineProperty(exports, "activateShowVirtualFiles", { enumerable: true, get: function () { return showVirtualFiles_1.activate; } });
 var writeVirtualFiles_1 = require("./features/writeVirtualFiles");
 Object.defineProperty(exports, "activateWriteVirtualFiles", { enumerable: true, get: function () { return writeVirtualFiles_1.activate; } });
 var fileReferences_1 = require("./features/fileReferences");
@@ -100,4 +98,8 @@ function parseServerCommand(command) {
     return command;
 }
 exports.parseServerCommand = parseServerCommand;
+function createExports(exports) {
+    return { volar: exports };
+}
+exports.createExports = createExports;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "1.5.4",
+	"version": "1.6.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "1.5.4",
-		"@volar/source-map": "1.5.4",
+		"@volar/language-server": "1.6.1",
+		"@volar/source-map": "1.6.1",
 		"typesafe-path": "^0.2.2",
 		"vscode-nls": "^5.2.0"
 	},
@@ -26,5 +26,5 @@
 		"@types/vscode": "*",
 		"vscode-languageclient": "*"
 	},
-	"gitHead": "9b96450d7e4d87d1b77af45a5ce796724fc606ce"
+	"gitHead": "1e1e99f43ff39db5432a33c8013eda706e765001"
 }