use filename instead of index

pull/7/head
yann300 8 years ago
parent 2e4e965f0a
commit 8f6ad3f4d3
  1. 15
      src/code/breakpointManager.js
  2. 10
      src/solidity/solidityProxy.js

@ -113,8 +113,9 @@ class BreakpointManager {
* @return {Bool} return true if the given @arg fileIndex @arg line refers to a breakpoint * @return {Bool} return true if the given @arg fileIndex @arg line refers to a breakpoint
*/ */
hasBreakpointAtLine (fileIndex, line) { hasBreakpointAtLine (fileIndex, line) {
if (this.breakpoints[fileIndex]) { var filename = this.debugger.solidityProxy.fileNameFromIndex(fileIndex)
var sources = this.breakpoints[fileIndex] if (filename && this.breakpoints[filename]) {
var sources = this.breakpoints[filename]
for (var k in sources) { for (var k in sources) {
var source = sources[k] var source = sources[k]
if (line === source.row) { if (line === source.row) {
@ -145,10 +146,10 @@ class BreakpointManager {
* @param {Object} sourceLocation - position of the breakpoint { file: '<file index>', row: '<line number' } * @param {Object} sourceLocation - position of the breakpoint { file: '<file index>', row: '<line number' }
*/ */
add (sourceLocation) { add (sourceLocation) {
if (!this.breakpoints[sourceLocation.file]) { if (!this.breakpoints[sourceLocation.fileName]) {
this.breakpoints[sourceLocation.file] = [] this.breakpoints[sourceLocation.fileName] = []
} }
this.breakpoints[sourceLocation.file].push(sourceLocation) this.breakpoints[sourceLocation.fileName].push(sourceLocation)
this.event.trigger('breakpointAdded', [sourceLocation]) this.event.trigger('breakpointAdded', [sourceLocation])
} }
@ -158,8 +159,8 @@ class BreakpointManager {
* @param {Object} sourceLocation - position of the breakpoint { file: '<file index>', row: '<line number' } * @param {Object} sourceLocation - position of the breakpoint { file: '<file index>', row: '<line number' }
*/ */
remove (sourceLocation) { remove (sourceLocation) {
if (this.breakpoints[sourceLocation.file]) { if (this.breakpoints[sourceLocation.fileName]) {
var sources = this.breakpoints[sourceLocation.file] var sources = this.breakpoints[sourceLocation.fileName]
for (var k in sources) { for (var k in sources) {
var source = sources[k] var source = sources[k]
if (sourceLocation.row === source.row) { if (sourceLocation.row === source.row) {

@ -120,6 +120,16 @@ class SolidityProxy {
return null return null
} }
} }
/**
* get the filename refering to the index from the compilation result
*
* @param {Int} index - index of the filename
* @return {String} - filename
*/
fileNameFromIndex (index) {
return this.sourceList[index]
}
} }
function contractNameFromCode (contracts, code, address) { function contractNameFromCode (contracts, code, address) {

Loading…
Cancel
Save