|
|
@ -27,7 +27,7 @@ function Debugger (options) { |
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
this.breakPointManager = new remixLib.code.BreakpointManager(this.debugger, (sourceLocation) => { |
|
|
|
this.breakPointManager = new remixLib.code.BreakpointManager(this.debugger, (sourceLocation) => { |
|
|
|
return self.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, this.compiler.lastCompilationResult.source.sources) |
|
|
|
return self.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, this.compiler.lastCompilationResult.source.sources, this.compiler.lastCompilationResult.data.sources) |
|
|
|
}, (step) => { |
|
|
|
}, (step) => { |
|
|
|
self.event.trigger('breakpointStep', [step]) |
|
|
|
self.event.trigger('breakpointStep', [step]) |
|
|
|
}) |
|
|
|
}) |
|
|
@ -65,7 +65,7 @@ Debugger.prototype.registerAndHighlightCodeItem = function (index) { |
|
|
|
if (error) return console.log(error) |
|
|
|
if (error) return console.log(error) |
|
|
|
self.debugger.callTree.sourceLocationTracker.getSourceLocationFromVMTraceIndex(address, index, self.compiler.lastCompilationResult.data.contracts, function (error, rawLocation) { |
|
|
|
self.debugger.callTree.sourceLocationTracker.getSourceLocationFromVMTraceIndex(address, index, self.compiler.lastCompilationResult.data.contracts, function (error, rawLocation) { |
|
|
|
if (!error && self.compiler.lastCompilationResult && self.compiler.lastCompilationResult.data) { |
|
|
|
if (!error && self.compiler.lastCompilationResult && self.compiler.lastCompilationResult.data) { |
|
|
|
var lineColumnPos = self.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, self.compiler.lastCompilationResult.source.sources) |
|
|
|
var lineColumnPos = self.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, self.compiler.lastCompilationResult.source.sources, self.compiler.lastCompilationResult.data.sources) |
|
|
|
self.event.trigger('newSourceLocation', [lineColumnPos, rawLocation]) |
|
|
|
self.event.trigger('newSourceLocation', [lineColumnPos, rawLocation]) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
self.event.trigger('newSourceLocation', [null]) |
|
|
|
self.event.trigger('newSourceLocation', [null]) |
|
|
|