Skip to content

Commit 638ad3f

Browse files
committed
Add echo messages to devtools actions
1 parent 9d3c9b7 commit 638ad3f

File tree

1 file changed

+21
-11
lines changed

1 file changed

+21
-11
lines changed

lisp/ess-developer.el

+21-11
Original file line numberDiff line numberDiff line change
@@ -407,16 +407,18 @@ If ALL is non-nil, deactivate in all open R buffers."
407407
(equal pack package)))
408408
(ess-developer -1)))))
409409

410-
(defun ess-developer-send-process (command)
410+
(defun ess-developer-send-process (command &optional msg)
411411
(ess-force-buffer-current)
412-
(let ((path (or (cdr ess-developer-local-package)
413-
(ess-developer--get-package-path))))
412+
(let* ((path (or (cdr ess-developer-local-package)
413+
(ess-developer--get-package-path)))
414+
(name (file-name-nondirectory (directory-file-name path))))
414415
;; Ask package directory only when not obvious
415416
(unless (or ess-developer-local-package path)
416417
(setq path (read-directory-name "Package: " path nil t nil)))
417418
(unless (file-exists-p (expand-file-name ess-developer-root-file path))
418419
(error "Not a valid package. No '%s' found in `%s'."
419420
ess-developer-root-file path))
421+
(message msg name)
420422
(let ((name (or (car ess-developer-local-package)
421423
(ess-developer--get-package-name path))))
422424
(ess-developer--init-process-local-vars name path))
@@ -434,11 +436,14 @@ Without prefix, load the package. With single prefix, recompile
434436
before loading. With double prefix, unload the package."
435437
(interactive)
436438
(cond ((equal current-prefix-arg '(16))
437-
(ess-developer-send-process "devtools::unload()\n"))
439+
(ess-developer-send-process "devtools::unload()\n"
440+
"Unloading %s"))
438441
((equal current-prefix-arg '(4))
439-
(ess-developer-send-process "devtools::load_all('%s', recompile = TRUE)\n"))
442+
(ess-developer-send-process "devtools::load_all('%s', recompile = TRUE)\n"
443+
"Recompiling %s"))
440444
(t
441-
(ess-developer-send-process "devtools::load_all('%s')\n"))))
445+
(ess-developer-send-process "devtools::load_all('%s')\n"
446+
"Loading %s"))))
442447

443448
(defun ess-developer-check-package ()
444449
"Interface to checking functions from devtools package.
@@ -447,21 +452,26 @@ Without prefix, run the unit tests. With single prefix, perform a
447452
R CMD check. With double prefix, check only the documentation."
448453
(interactive)
449454
(cond ((equal current-prefix-arg '(16))
450-
(ess-developer-send-process "devtools::check_doc('%s')\n"))
455+
(ess-developer-send-process "devtools::check_doc('%s')\n"
456+
"Checking documentation of %s"))
451457
((equal current-prefix-arg '(4))
452-
(ess-developer-send-process "devtools::check('%s')\n"))
458+
(ess-developer-send-process "devtools::check('%s')\n"
459+
"Checking %s"))
453460
(t
454-
(ess-developer-send-process "devtools::test('%s')\n"))))
461+
(ess-developer-send-process "devtools::test('%s')\n"
462+
"Testing %s"))))
455463

456464
(defun ess-developer-document-package ()
457465
"Interface to document() from devtools package."
458466
(interactive)
459-
(ess-developer-send-process "devtools::document('%s')\n"))
467+
(ess-developer-send-process "devtools::document('%s')\n"
468+
"Documenting %s"))
460469

461470
(defun ess-developer-install-package ()
462471
"Interface to document() from devtools package."
463472
(interactive)
464-
(ess-developer-send-process "devtools::install('%s')\n"))
473+
(ess-developer-send-process "devtools::install('%s')\n"
474+
"Installing %s"))
465475

466476
(defvar ess-developer nil
467477
"Non nil in buffers where developer mode is active")

0 commit comments

Comments
 (0)