Merge pull request #570 from ethereum/improveDebuggerStart

src/ui/StepManager.js

@@ -39,6 +39,9 @@ function StepManager (_parent, _traceManager) {
     this.parent.vmDebugger.asmCode.event.register('show', () => {
       this.solidityMode = false
     })
+    if (this.parent.callTree.functionCallStack.length) {
+      this.jumpTo(this.parent.callTree.functionCallStack[0])
+    }
   })
 
   this.buttonNavigator = new ButtonNavigator(_parent, this.traceManager)

src/ui/VmDebugger.js

@@ -54,6 +54,14 @@ function VmDebugger (_parent, _traceManager, _codeManager, _solidityProxy, _call
   _parent.event.register('traceUnloaded', this, function () {
     self.view.style.display = 'none'
   })
+  _parent.callTree.event.register('callTreeReady', () => {
+    if (_parent.callTree.reducedTrace.length) {
+      self.solidityLocals.basicPanel.show()
+      self.solidityState.basicPanel.show()
+    } else {
+      self.asmCode.basicPanel.show()
+    }
+  })
 }
 
 VmDebugger.prototype.render = function () {

src/util/internalCallTree.js

@@ -57,6 +57,7 @@ class InternalCallTree {
     /*
       scopeStart: represent start of a new scope. Keys are index in the vmtrace, values are scopeId
     */
+    this.functionCallStack = []
     this.scopeStarts = {}
     this.variableDeclarationByFile = {}
     this.functionDefinitionByFile = {}
@@ -196,6 +197,7 @@ function includeVariableDeclaration (tree, step, sourceLocation, scopeId, newLoc
   }
   var functionDefinition = resolveFunctionDefinition(tree, step, previousSourceLocation)
   if (functionDefinition && newLocation && traceHelper.isJumpDestInstruction(tree.traceManager.trace[step - 1])) {
+    tree.functionCallStack.push(step)
     // means: the previous location was a function definition && JUMPDEST
     // => we are at the beginning of the function and input/output are setup
     tree.solidityProxy.contractNameAt(step, (error, contractName) => { // cached