Refactor: consolidate stepping commands

Author: nbfalcon

dap-mode.el

@@ -692,45 +692,34 @@ thread exection but the server will log message."
                      session)
   (dap--resume-application session))
 
-(defun dap-next ()
-  "Debug next."
-  (interactive)
-  (let ((debug-session (dap--cur-active-session-or-die)))
-    (if-let (thread-id (dap--debug-session-thread-id (dap--cur-session)))
-        (progn
-          (dap--send-message (dap--make-request
-                              "next"
-                              (list :threadId thread-id))
-                             (dap--resp-handler)
-                             debug-session)
-          (dap--resume-application debug-session))
-      (lsp--error "Currently active thread is not stopped. Use `dap-switch-thread' or select stopped thread from sessions view."))))
-
-(defun dap-step-in ()
-  "Debug step in."
-  (interactive)
-  (if-let (thread-id (dap--debug-session-thread-id (dap--cur-session)))
+(defun dap--step (cmd debug-session)
+  "Send a request for CMD, a step command.
+DEBUG-SESSION is the debug session in which the stepping is to be
+executed."
+  (if-let (thread-id (dap--debug-session-thread-id debug-session))
       (progn
         (dap--send-message (dap--make-request
-                            "stepIn"
+                            cmd
                             (list :threadId thread-id))
                            (dap--resp-handler)
-                           (dap--cur-active-session-or-die))
-        (dap--resume-application (dap--cur-active-session-or-die)))
+                           debug-session)
+        (dap--resume-application debug-session))
     (lsp--error "Currently active thread is not stopped. Use `dap-switch-thread' or select stopped thread from sessions view.")))
 
-(defun dap-step-out ()
-  "Debug step in."
-  (interactive)
-  (if-let (thread-id (dap--debug-session-thread-id (dap--cur-session)))
-      (progn
-        (dap--send-message (dap--make-request
-                            "stepOut"
-                            (list :threadId thread-id))
-                           (dap--resp-handler)
-                           (dap--cur-active-session-or-die))
-        (dap--resume-application (dap--cur-active-session-or-die)))
-    (lsp--error "Currently active thread is not stopped. Use `dap-switch-thread' or select stopped thread from sessions view.")))
+(defun dap-next (debug-session)
+  "Step over statements."
+  (interactive (list (dap--cur-session-or-die)))
+  (dap--step "next" debug-session))
+
+(defun dap-step-in (debug-session)
+  "Like `dap-next', but step into function calls."
+  (interactive (list (dap--cur-session-or-die)))
+  (dap--step "stepIn" debug-session))
+
+(defun dap-step-out (debug-session)
+  "Debug step out."
+  (interactive (list (dap--cur-session-or-die)))
+  (dap--step "stepOut" debug-session))
 
 (defun dap-restart-frame (debug-session frame-id)
   "Restarts current frame."