File tree Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -784,7 +784,7 @@ will be reversed."
784784 (-when-let* ((source (gethash " source" stack-frame))
785785 (sourceReference (gethash " sourceReference" source ))
786786 (sourceReferenceKey (format " %s -%s " name sourceReference)))
787- (select-window (get-mru-window (selected-frame ) nil ))
787+ (select-window (get-mru-window (dap-- selected-frame) nil ))
788788 (if-let* ((existing-buffer (get-buffer sourceReferenceKey)))
789789 (switch-to-buffer existing-buffer)
790790 (dap--send-message
@@ -810,6 +810,15 @@ will be reversed."
810810 path)))
811811 (--> debug-session (dap--debug-session-remote-to-local-path-fn it) (funcall it remote-path)))))
812812
813+ (defun dap--selected-frame ()
814+ " Select the 'main' frame when we have a utility/subframe selected"
815+ (cl-labels ((helper (f)
816+ (let ((parent-frame (frame-parameter f 'parent-frame )))
817+ (if parent-frame
818+ (helper parent-frame)
819+ f))))
820+ (helper (selected-frame ))))
821+
813822(defun dap--go-to-stack-frame (debug-session stack-frame )
814823 " Make STACK-FRAME the active STACK-FRAME of DEBUG-SESSION."
815824 (when stack-frame
@@ -821,7 +830,7 @@ will be reversed."
821830 ; ; stack trace.
822831 (if (and path (file-exists-p path))
823832 (progn
824- (select-window (get-mru-window (selected-frame ) nil ))
833+ (select-window (get-mru-window (dap-- selected-frame) nil ))
825834 (find-file path)
826835 (goto-char (point-min ))
827836 (forward-line (1- line))
You can’t perform that action at this time.
0 commit comments