dap-features->windows: add REPL window (emacs-lsp#285)

Author: kiennq

dap-mode.el

@@ -143,18 +143,20 @@ The hook will be called with the session file and the new set of breakpoint loca
 (defcustom dap-auto-configure-features '(sessions locals breakpoints expressions controls tooltip)
   "Windows to auto show on debugging when in dap-ui-auto-configure-mode."
   :group 'dap-mode
-  :type '(set (const :tag "Show sessions popup window when debugging and enable `dap-ui-sessions-mode`" sessions)
+  :type '(set (const :tag "Show sessions popup window when debugging" sessions)
               (const :tag "Show locals popup window when debugging" locals)
-              (const :tag "Show breakpoints popup window when debugging and enable `dap-ui-breakpoints-mode`" breakpoints)
+              (const :tag "Show breakpoints popup window when debugging" breakpoints)
               (const :tag "Show expressions popup window when debugging" expressions)
+              (const :tag "Show REPL popup window when debugging" repl)
               (const :tag "Enable `dap-ui-controls-mode` with controls to manage the debug session when debugging" controls)
               (const :tag "Enable `dap-tooltip-mode` that enables mouse hover support when debugging" tooltip)))
 
 (defconst dap-features->windows
   '((sessions . (dap-ui-sessions . dap-ui--sessions-buffer))
     (locals . (dap-ui-locals . dap-ui--locals-buffer))
     (breakpoints . (dap-ui-breakpoints . dap-ui--breakpoints-buffer))
-    (expressions . (dap-ui-expressions . dap-ui--expressions-buffer))))
+    (expressions . (dap-ui-expressions . dap-ui--expressions-buffer))
+    (repl . (dap-ui-repl . dap-ui--repl-buffer))))
 
 (defconst dap-features->modes
   '((controls . (dap-ui-controls-mode . posframe))
@@ -163,6 +165,12 @@ The hook will be called with the session file and the new set of breakpoint loca
 (defvar dap--debug-configuration nil
   "List of the previous configuration that have been executed.")
 
+(defvar dap-connect-retry-count 1000
+  "Retry count for dap connect.")
+
+(defvar dap-connect-retry-interval 0.02
+  "Retry interval for dap connect.")
+
 (defun dash-expand:&dap-session (key source)
   `(,(intern-soft (format "dap--debug-session-%s" (eval key) )) ,source))
 
@@ -1578,12 +1586,6 @@ If the current session it will be terminated."
          (dap--set-breakpoints-in-file buffer-file-name))
     (add-hook 'kill-buffer-hook 'dap--buffer-killed nil t)))
 
-(defvar dap-connect-retry-count 1000
-  "Retry count for dap connect.")
-
-(defvar dap-connect-retry-interval 0.02
-  "Retry interval for dap connect.")
-
 (defun dap-mode-mouse-set-clear-breakpoint (event)
   "Set or remove a breakpoint at the position represented by an
 `event' mouse click. If `dap-mode' is not enabled, then only the

dap-ui-repl.el

@@ -4,7 +4,7 @@
 
 ;;; Commentary:
 
-;; This code is heavily based on `skewer-repl'. Run `dap-ui-repl' to switch to
+;; This code is heavily based on `skewer-repl'.  Run `dap-ui-repl' to switch to
 ;; the REPL buffer and evaluate code.
 
 ;;; Code:
@@ -28,6 +28,8 @@ Hack notice: this allows log messages to appear before anything is
 evaluated because it provides insertable space at the top of the
 buffer.")
 
+(defconst dap-ui--repl-buffer "*dap-ui-repl*")
+
 (defun dap-ui-repl-process ()
   "Return the process for the dap-ui REPL."
   (get-buffer-process (current-buffer)))
@@ -65,7 +67,7 @@ INPUT is the current input."
                             (list :expression input
                                   :frameId active-frame-id))
          (-lambda ((&hash "success" "message" "body"))
-           (-when-let (buffer (get-buffer "*dap-ui-repl*"))
+           (-when-let (buffer (get-buffer dap-ui--repl-buffer))
              (with-current-buffer buffer
                (comint-output-filter (dap-ui-repl-process)
                                      (concat (if success (gethash "result" body) message)
@@ -79,13 +81,15 @@ INPUT is the current input."
   "Start a JavaScript REPL to be evaluated in the visiting browser."
   (interactive)
   (let ((workspaces (lsp-workspaces)))
-    (unless (get-buffer "*dap-ui-repl*")
-      (with-current-buffer (get-buffer-create "*dap-ui-repl*")
+    (unless (get-buffer dap-ui--repl-buffer)
+      (with-current-buffer (get-buffer-create dap-ui--repl-buffer)
         (dap-ui-repl-mode)
         (when (functionp 'company-mode)
           (company-mode 1))
         (setq-local lsp--buffer-workspaces workspaces))))
-  (pop-to-buffer (get-buffer "*dap-ui-repl*")))
+  (if (called-interactively-p 'any)
+      (pop-to-buffer dap-ui--repl-buffer)
+    (display-buffer dap-ui--repl-buffer)))
 
 (defun dap-ui-repl--calculate-candidates ()
   "Calculate candidates.

dap-ui.el

@@ -34,6 +34,7 @@
 (require 'compile)
 (require 'gdb-mi)
 (require 'lsp-treemacs)
+(require 'dap-ui-repl)
 
 (defcustom dap-ui-stack-frames-loaded nil
   "Stack frames loaded."
@@ -854,7 +855,7 @@ DEBUG-SESSION is the debug session triggering the event."
                                            (region-end)))
                        (t (symbol-at-point))))))
   (when (-contains? dap-ui-expressions expression)
-    (user-error "\"%s\" is already watched." expression))
+    (user-error "\"%s\" is already watched" expression))
   (add-to-list 'dap-ui-expressions expression)
   (dap-ui-expressions)
   (dap-ui-expressions-refresh))
@@ -866,7 +867,7 @@ DEBUG-SESSION is the debug session triggering the event."
                       nil
                       t)))
   (unless (-contains? dap-ui-expressions expression)
-    (user-error "\"%s\" is not present." expression))
+    (user-error "\"%s\" is not present" expression))
   (setq dap-ui-expressions (remove expression dap-ui-expressions))
   (dap-ui-expressions-refresh))
 
@@ -1123,8 +1124,10 @@ DEBUG-SESSION is the debug session triggering the event."
 (defun dap-ui--hide-many-windows (_session)
   "Hide all debug windows when sessions are dead."
   (seq-doseq (feature-start-stop dap-auto-configure-features)
-    (-when-let* ((feature-start-stop (alist-get feature-start-stop dap-features->windows))
-                 (buffer-name (symbol-value (cdr feature-start-stop))))
+    (when-let* ((feature-start-stop (alist-get feature-start-stop dap-features->windows))
+                (buffer-name (symbol-value (cdr feature-start-stop))))
+      (when-let (window (get-buffer-window buffer-name))
+        (delete-window window))
       (and (get-buffer buffer-name)
            (kill-buffer buffer-name)))))