Fixes for the debugger #694
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrandSchtroumpf
approved these changes
Jan 4, 2021
| const res = await (() => { | ||
| return new Promise((resolve, reject) => { | ||
| const compiler = new Compiler(() => {}) | ||
| const compiler = new Compiler(contentResolverCallback || (() => {})) |
Contributor
There was a problem hiding this comment.
Wouldn't it be better to make the callback optional or set the default callback in the Compiler ?
class Compiler {
constructor(callback = () => {})
}| } | ||
|
|
||
| isExternalUrl (url) { | ||
| for (const handler of this.handlers()) { |
Contributor
There was a problem hiding this comment.
If you want there is a built-in method of that :
const handlers = this.handlers();
return handlers.some(handler => handler.match.exec(url));| const compData = await compile( | ||
| compilationTargets, | ||
| settings, | ||
| (url, cb) => this.call('contentImport', 'resolveAndSave', url).then((result) => cb(null, result)).catch((error) => cb(error.message))) |
Contributor
There was a problem hiding this comment.
looks like callback hell here ^^.
When you've to a callback in a promise in a callback, you start loosing people XD
| const target = (address && remixDebug.traceHelper.isContractCreation(address)) ? receipt.contractAddress : address | ||
|
|
||
| return this.call('fetchAndCompile', 'resolve', target || receipt.contractAddress || receipt.to, '.debug', this.blockchain.web3()) | ||
| return this.call('fetchAndCompile', 'resolve', target || receipt.contractAddress || receipt.to, 'browser/.debug', this.blockchain.web3()) |
Contributor
There was a problem hiding this comment.
Maybe add a variable before with a good naming to make it easier to follow :
const goodName = target || receipt.contractAddress || receipt.to, 'browser/.debug'
...| ret[node.src] = node | ||
| ret[node.src] = [node] | ||
| } | ||
| if (node.initialValue && (node.nodeType === 'VariableDeclarationStatement' || node.nodeType === 'YulVariableDeclarationStatement')) { |
Contributor
There was a problem hiding this comment.
Maybe create a variable with the right name also to explain this statement
|
|
||
| export function isCallInstruction (step) { | ||
| return step.op === 'CALL' || step.op === 'CALLCODE' || step.op === 'CREATE' || step.op === 'DELEGATECALL' | ||
| return step.op === 'CALL' || step.op === 'STATICCALL' || step.op === 'CALLCODE' || step.op === 'CREATE' || step.op === 'DELEGATECALL' |
Contributor
There was a problem hiding this comment.
You might want to transform it into an array :
return ['CALL', 'CALLCODE', ...].include(step.op)
yann300
force-pushed
the
fixCompilationTargets
branch
from
0625ddb to
35a3152
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes some issues with the debugger: