branch: externals/dape commit daa32c57156641023dbbf03d1aa8353e72f5cdd6 Author: Daniel Pettersson <dan...@dpettersson.net> Commit: Daniel Pettersson <dan...@dpettersson.net>
Remove delay when disabling of dape-active-mode The delay in disabling dape-active-mode served its purpose by ensuring that the "terminated" status message was displayed before hiding the dape mode line. As the log message and removal of the mode line information now adequately communicate the status change from running to terminated, disabling dape-active-mode can proceed without further delay. --- dape.el | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dape.el b/dape.el index e6c80f52aa..e7523509a1 100644 --- a/dape.el +++ b/dape.el @@ -2201,10 +2201,9 @@ symbol `dape-connection'." (while (process-live-p server-process) (accept-process-output nil nil 0.1)))) ;; ui - (run-with-timer 1 nil (lambda () - (when (eq dape--connection conn) - (dape-active-mode -1) - (force-mode-line-update t))))) + (when (eq dape--connection conn) + (dape-active-mode -1) + (force-mode-line-update t))) :request-dispatcher 'dape-handle-request :notification-dispatcher 'dape-handle-event :process process))) @@ -4123,15 +4122,19 @@ or `prefix' part of variable string." ((zerop (or (plist-get object :variablesReference) 0)) (concat prefix " ")) ((and expanded (plist-get object :variables)) - (propertize (concat prefix "- ") - 'mouse-face 'highlight - 'help-echo "mouse-2: contract" - 'keymap map)) + (concat + (propertize (concat prefix "-") + 'mouse-face 'highlight + 'help-echo "mouse-2: contract" + 'keymap map) + " ")) (t - (propertize (concat prefix "+ ") - 'mouse-face 'highlight - 'help-echo "mouse-2: expand" - 'keymap map))))) + (concat + (propertize (concat prefix "+") + 'mouse-face 'highlight + 'help-echo "mouse-2: expand" + 'keymap map) + " "))))) (setq row (dape--info-locals-table-columns-list `((name . ,name) (type . ,type) @@ -4148,7 +4151,8 @@ or `prefix' part of variable string." ;; TODO Should be paged (dolist (variable (plist-get object :variables)) (dape--info-scope-add-variable - table variable (plist-get object :variablesReference) path expanded-p maps))))) + table variable (plist-get object :variablesReference) + path expanded-p maps))))) ;; FIXME Empty header line when adapter is killed (define-derived-mode dape-info-scope-mode dape-info-parent-mode "Scope"