From 3cd9a2ccce680022b93702bba68ead975bcc6699 Mon Sep 17 00:00:00 2001 From: tintinweb Date: Wed, 15 Jan 2020 11:30:46 +0100 Subject: [PATCH] fix surya ftrace for constructor/fallback --- src/extension.js | 4 ++-- src/features/codelens.js | 2 +- src/features/commands.js | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/extension.js b/src/extension.js index bf43a14..8aefb88 100644 --- a/src/extension.js +++ b/src/extension.js @@ -671,8 +671,8 @@ function onActivate(context) { context.subscriptions.push( vscode.commands.registerCommand( 'solidity-va.surya.ftrace', - function (doc, functionName, mode) { - commands.surya(doc || vscode.window.activeTextEditor.document, "ftrace", [functionName, mode]); + function (doc, contractName, functionName, mode) { + commands.surya(doc || vscode.window.activeTextEditor.document, "ftrace", [contractName, functionName, mode]); } ) ); diff --git a/src/features/codelens.js b/src/features/codelens.js index 713492b..5587cb1 100644 --- a/src/features/codelens.js +++ b/src/features/codelens.js @@ -185,7 +185,7 @@ class SolidityCodeLensProvider { lenses.push(new vscode.CodeLens(range, { command: 'solidity-va.surya.ftrace', title: 'ftrace', - arguments: [document, contractName+"::"+item._node.name, "all"] + arguments: [document, contractName, item._node.name, "all"] }) ); diff --git a/src/features/commands.js b/src/features/commands.js index a8d62c1..3b49d63 100644 --- a/src/features/commands.js +++ b/src/features/commands.js @@ -231,7 +231,13 @@ class Commands{ break; case "ftrace": // contract::func, all, files - ret = surya.ftrace(args[0], args[1] || 'all', files, {}, true); + if (args[1] === null){ + args[1] = ""; + } else if (args[1] === ""){ + args[1] = ""; + } + + ret = surya.ftrace(args[0] + "::" + args[1], args[2] || 'all', files, {}, true); vscode.workspace.openTextDocument({content: ret, language: "markdown"}) .then(doc => vscode.window.showTextDocument(doc, vscode.ViewColumn.Beside)); break;