embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(debugger): fix debugger displays

This commit is contained in:
Jonathan Rainville 2018-12-20 16:25:24 -05:00 committed by Iuri Matias
parent e207537d6e
commit 9c37f9738e
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lib/modules/debugger/index.ts
View File

@ -217,6 +217,15 @@ class TransactionDebugger {
this.cmdDebugger = false; this.cmdDebugger = false;
this.currentCmdTxHash = ""; this.currentCmdTxHash = "";
const self = this;
function startDebug(txHash: string, filename: string, callback: (err?: string|object, output?: string) => void) {
self.currentCmdTxHash = txHash;
self.embark.logger.info("debugging tx " + txHash);
self.cmdDebugger = self.debuggerManager.createDebuggerSession(txHash, filename, () => {
self.displayStepInfo(callback);
});
}
this.embark.registerConsoleCommand({ this.embark.registerConsoleCommand({
description: __("Debug the last transaction or the transaction specified by a hash"), description: __("Debug the last transaction or the transaction specified by a hash"),
matches: (cmd: string) => { matches: (cmd: string) => {
@ -232,21 +241,13 @@ class TransactionDebugger {
return callback(); return callback();
} }
this.currentCmdTxHash = txHash; this.currentCmdTxHash = txHash;
this.embark.logger.info("debugging tx " + txHash); startDebug(txHash, contract.filename, callback);
this.cmdDebugger = this.debuggerManager.createDebuggerSession(txHash, contract.filename, () => {
this.displayStepInfo();
callback();
});
}); });
return; return;
} }
this.currentCmdTxHash = this.lastTx; this.currentCmdTxHash = this.lastTx;
const filename: string = this.txTracker[this.lastTx].contract.filename; const filename: string = this.txTracker[this.lastTx].contract.filename;
this.embark.logger.info("debugging tx " + this.lastTx); startDebug(txHash, filename, callback);
this.cmdDebugger = this.debuggerManager.createDebuggerSession(this.lastTx, filename, () => {
this.displayStepInfo();
callback();
});
}, },
usage: "debug <txHash>", usage: "debug <txHash>",
}); });
@ -268,8 +269,7 @@ class TransactionDebugger {
return callback(); return callback();
} }
this.cmdDebugger.stepOverForward(true); this.cmdDebugger.stepOverForward(true);
this.displayStepInfo(); this.displayStepInfo(callback);
callback();
}, },
usage: " next/n", usage: " next/n",
}); });
@ -290,8 +290,7 @@ class TransactionDebugger {
return this.cmdDebugger.unload(); return this.cmdDebugger.unload();
} }
this.cmdDebugger.stepOverBack(true); this.cmdDebugger.stepOverBack(true);
this.displayStepInfo(); this.displayStepInfo(callback);
callback();
}, },
usage: " previous/p", usage: " previous/p",
}); });
@ -337,7 +336,7 @@ class TransactionDebugger {
this.embark.logger.error(err); this.embark.logger.error(err);
return callback(); return callback();
} }
this.embark.logger.info(globals); this.embark.logger.info(JSON.stringify(globals, null, 2));
callback(); callback();
}); });
}, },
@ -406,7 +405,9 @@ class TransactionDebugger {
} }
this.findVarsInLine(txHash, line, knownVars, (foundVars: any) => { this.findVarsInLine(txHash, line, knownVars, (foundVars: any) => {
if (!foundVars) { return; } if (!foundVars) {
return cb ? cb() : null;
}
this.embark.logger.info("vars:"); this.embark.logger.info("vars:");
foundVars.forEach((variable: any) => { foundVars.forEach((variable: any) => {
this.embark.logger.info(`${variable.name}: ${variable.value}`); this.embark.logger.info(`${variable.name}: ${variable.value}`);
@ -415,12 +416,13 @@ class TransactionDebugger {
}); });
} }
private displayStepInfo() { private displayStepInfo(cb?: any) {
this.cmdDebugger.getSource().forEach((line: string) => { this.cmdDebugger.getSource().forEach((line: string) => {
this.embark.logger.info(line); this.embark.logger.info(line);
}); });
this.displayVarsInLine(() => { this.displayVarsInLine(() => {
this.displayPossibleActions(); this.displayPossibleActions();
if (cb) { cb(); }
}); });
} }