wip

_pydevd_sys_monitoring/pydevd_sys_monitoring.py

@@ -762,7 +762,7 @@ def _return_event(code, instruction, retval):
         _stop_on_return(py_db, thread_info, info, step_cmd, frame, retval)
         return
 
-    elif step_cmd in (CMD_STEP_OVER, CMD_STEP_OVER_MY_CODE) and _is_same_frame(info, stop_frame, frame):
+    elif step_cmd in (CMD_STEP_OVER, CMD_STEP_OVER_MY_CODE) and not info.pydev_use_scoped_step_frame and _is_same_frame(info, stop_frame, frame):
         # This isn't in the sys.settrace version: on a step over, if we return and the return is valid, show
         # as a step return instead of going back to step into mode (but if the back frame is not valid, then
         # go to step into mode).