Merge pull request #1292 from ethereum/fix/#1214

remix-analyzer/tasks.todo

+- [] remix-debug: Add tests for debugger (stepOverForward)
\ No newline at end of file

remix-debug/src/debugger/stepManager.js

@@ -122,7 +122,11 @@ class DebuggerStepManager {
 
   stepOverForward (solidityMode) {
     if (!this.traceManager.isLoaded()) return
-    var step = this.traceManager.findStepOverForward(this.currentStepIndex)
+    var step = this.currentStepIndex + 1
+    let scope = this.debugger.callTree.findScope(step)
+    if (scope && scope.firstStep === step) {
+      step = scope.lastStep + 1
+    }
     if (solidityMode) {
       step = this.resolveToReducedTrace(step, 1)
     }