[elpa] externals/dape c1301d238a 3/4: Fix dropped line arrow due to delayed stack frame fetching

[ELPA Syncer]

branch: externals/dape
commit c1301d238af5417e394b15b53db4bd1ab54ab0fc
Author: Daniel Pettersson <daniel@dpettersson.net>
Commit: Daniel Pettersson <daniel@dpettersson.net>

    Fix dropped line arrow due to delayed stack frame fetching
    
    When supportsDelayedStackTraceLoading is used and deepest stack frame
    is not displayable dape--stack-frame-display failed to display any
    frame.
    
    If frame display candidate is not found make sure that the rest of the
    frames are fetched as well.
---
 dape.el | 134 ++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 71 insertions(+), 63 deletions(-)

diff --git a/dape.el b/dape.el
index 886e00263a..07bb96c008 100644
--- a/dape.el
+++ b/dape.el
@@ -3233,72 +3233,80 @@ See `dape-request' for expected CB signature."
     (delete-overlay dape--stack-position-overlay))
   (set-marker dape--overlay-arrow-position nil))
 
+(defun dape--stack-frame-display-1 (conn frame deepest-p)
+  "Display FRAME for adapter CONN as if DEEPEST-p.
+Helper for `dape--stack-frame-display'."
+  (dape--with-request (dape--source-ensure conn frame)
+    ;; An update event could have fired between call to
+    ;; `dape--stack-frame-cleanup' and callback, we have make sure
+    ;; that overlay is deleted before we are dropping the overlay
+    ;; reference
+    (dape--stack-frame-cleanup)
+    (when-let ((marker (dape--object-to-marker conn frame)))
+      (with-current-buffer (marker-buffer marker)
+        (dape--add-eldoc-hook)
+        (save-excursion
+          (goto-char (marker-position marker))
+          (setq dape--stack-position-overlay
+                (let ((ov (make-overlay (line-beginning-position)
+                                        (line-beginning-position 2))))
+                  (overlay-put ov 'face 'dape-source-line-face)
+                  (when deepest-p
+                    (when-let ((exception-description
+                                (dape--exception-description conn)))
+                      (overlay-put ov 'after-string
+                                   (propertize (concat exception-description 
"\n")
+                                               'face
+                                               
'dape-exception-description-face))))
+                  ov)
+                fringe-indicator-alist
+                (unless deepest-p
+                  '((overlay-arrow . hollow-right-triangle))))
+          ;; Finally lets move arrow to point
+          (move-marker dape--overlay-arrow-position
+                       (line-beginning-position)))
+        (when-let ((window
+                    (display-buffer (marker-buffer marker)
+                                    dape-display-source-buffer-action)))
+          ;; Change selected window if not `dape-repl' buffer is selected
+          (unless (with-current-buffer (window-buffer)
+                    (memq major-mode '(dape-repl-mode)))
+            (select-window window))
+          (with-selected-window window
+            ;; XXX: This code is running within timer context, which
+            ;;      does not play nice with `post-command-hook'.
+            ;;      Since hooks are runn'ed before the point is
+            ;;      actually moved.
+            (goto-char (marker-position marker))
+            ;; Here we are manually intervening to account for this.
+            ;; The following logic borrows from gud.el to interact
+            ;; with `hl-line'.
+            (when (featurep 'hl-line)
+             (cond
+               (global-hl-line-mode (global-hl-line-highlight))
+              ((and hl-line-mode hl-line-sticky-flag) (hl-line-highlight))))
+            (run-hooks 'dape-display-source-hook)))))))
+
 (defun dape--stack-frame-display (conn)
   "Update stack frame arrow marker for adapter CONN.
-`dape-display-source-buffer-action'."
+Buffer is displayed with `dape-display-source-buffer-action'."
   (dape--stack-frame-cleanup)
-  (when-let* (((dape--stopped-threads conn))
-              (frames (plist-get (dape--current-thread conn) :stackFrames))
-              (selected (dape--current-stack-frame conn))
-              (frame (cl-loop for cell on frames for (frame) = cell
-                              when (eq frame selected) return
-                              (cl-loop for frame in cell when
-                                       (dape--source conn frame)
-                                       return frame))))
-    (let ((deepest-p (eq selected (car frames))))
-      (dape--with-request (dape--source-ensure conn frame)
-        ;; An update event could have fired between call to
-        ;; `dape--stack-frame-cleanup' and callback, we have make
-        ;; sure that overlay is deleted before we are dropping the
-        ;; reference
-        (dape--stack-frame-cleanup)
-        (when-let ((marker (dape--object-to-marker conn frame)))
-          (with-current-buffer (marker-buffer marker)
-            (dape--add-eldoc-hook)
-            (save-excursion
-              (goto-char (marker-position marker))
-              (setq dape--stack-position-overlay
-                    (let ((ov (make-overlay (line-beginning-position)
-                                            (line-beginning-position 2))))
-                      (overlay-put ov 'face 'dape-source-line-face)
-                      (when deepest-p
-                        (when-let ((exception-description
-                                    (dape--exception-description conn)))
-                          (overlay-put ov 'after-string
-                                       (propertize (concat 
exception-description "\n")
-                                                   'face
-                                                   
'dape-exception-description-face))))
-                      ov)
-                    fringe-indicator-alist
-                    (unless deepest-p
-                      '((overlay-arrow . hollow-right-triangle))))
-              ;; Finally lets move arrow to point
-              (move-marker dape--overlay-arrow-position
-                           (line-beginning-position)))
-            (when-let ((window
-                        (display-buffer (marker-buffer marker)
-                                        dape-display-source-buffer-action)))
-              ;; Change selected window if not `dape-repl' buffer is selected
-              (unless (with-current-buffer (window-buffer)
-                        (memq major-mode '(dape-repl-mode)))
-                (select-window window))
-              ;; FIXME Should be called with idle-timer as to
-              ;;       guarantee that we are not in `save-excursion'
-              ;;       context.  But this makes tests to hard write.
-              (with-selected-window window
-                (goto-char (marker-position marker))
-                ;; This code is running within the timer context
-                ;; rather than the command context.  Since the
-                ;; `post-command-hook' is executed before the point
-                ;; (cursor position) is actually updated, we must
-                ;; manually intervene to account for this.  The
-                ;; following logic borrows from gud.el to interact
-                ;; with `hl-line'.
-                (when (featurep 'hl-line)
-                 (cond
-                   (global-hl-line-mode (global-hl-line-highlight))
-                  ((and hl-line-mode hl-line-sticky-flag) 
(hl-line-highlight))))
-                (run-hooks 'dape-display-source-hook)))))))))
+  (when (dape--stopped-threads conn)
+    (let* ((selected (dape--current-stack-frame conn))
+           (thread (dape--current-thread conn))
+           (deepest-p (eq selected (car (plist-get thread :stackFrames)))))
+      (cl-flet ((displayable-frame ()
+                  (cl-loop with frames = (plist-get thread :stackFrames)
+                           for cell on frames for (frame . _rest) = cell
+                           when (eq frame selected) return
+                           (cl-loop for frame in cell when (dape--source conn 
frame)
+                                    return frame))))
+        (if-let (;; Check if frame is available, otherwise fetch all
+                 (frame (displayable-frame)))
+            (dape--stack-frame-display-1 conn frame deepest-p)
+          (dape--with-request (dape--stack-trace conn thread 
dape-stack-trace-levels)
+            (when-let ((frame (displayable-frame)))
+              (dape--stack-frame-display-1 conn frame deepest-p))))))))
 
 
 ;;; Info Buffers