emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

editor/format: improve message feedback

Browse source 
Announce failures, noops and successes clearly, and log errors.
This commit is contained in:
Henrik Lissner 2018-08-30 13:12:44 +02:00
parent 60c03a78d9
commit 7616316634
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/editor/format/autoload/format.el
View file

@ -108,7 +108,7 @@ See `+format/buffer' for the interactive version of this function, and
(unwind-protect (unwind-protect
(cond ((null output) 'error) (cond ((null output) 'error)
((eq output t) 'noop) ((eq output t) 'noop)
((let ((tmpfile (make-temp-file "doom_format")) ((let ((tmpfile (make-temp-file "doom-format"))
(patchbuf (get-buffer-create " *doom format patch*")) (patchbuf (get-buffer-create " *doom format patch*"))
(coding-system-for-read 'utf-8) (coding-system-for-read 'utf-8)
(coding-system-for-write 'utf-8)) (coding-system-for-write 'utf-8))
@ -117,12 +117,11 @@ See `+format/buffer' for the interactive version of this function, and
(with-current-buffer patchbuf (erase-buffer)) (with-current-buffer patchbuf (erase-buffer))
(with-temp-file tmpfile (erase-buffer) (insert output)) (with-temp-file tmpfile (erase-buffer) (insert output))
(if (zerop (call-process-region (point-min) (point-max) "diff" nil patchbuf nil "-n" "-" tmpfile)) (if (zerop (call-process-region (point-min) (point-max) "diff" nil patchbuf nil "-n" "-" tmpfile))
(message "Buffer is already formatted") 'noop
(+format--apply-rcs-patch patchbuf) (+format--apply-rcs-patch patchbuf)
(message "Formatted buffer with %s" formatter))) (list output errput first-diff))))
(kill-buffer patchbuf) (kill-buffer patchbuf)
(delete-file tmpfile)) (delete-file tmpfile))))
(list output errput first-diff))))
(unless (= 0 (length errput)) (unless (= 0 (length errput))
(message "Formatter error output:\n%s" errput))))))) (message "Formatter error output:\n%s" errput)))))))
@ -135,7 +134,10 @@ See `+format/buffer' for the interactive version of this function, and
(defun +format/buffer () (defun +format/buffer ()
"Format the source code in the current buffer." "Format the source code in the current buffer."
(interactive) (interactive)
(+format-buffer)) (pcase (+format-buffer)
(`error (message "Failed to format buffer due to errors"))
(`noop (message "Buffer was already formatted"))
(_ (message "Formatted (%s)" (car (format-all-probe))))))
;;;###autoload ;;;###autoload
(defun +format/region (beg end) (defun +format/region (beg end)