Call apheleia-format-buffer normally when there's no region
This commit is contained in:
parent
d5030f749f
commit
47727d73f9
@ -291,6 +291,8 @@
|
||||
(defun apheleia ()
|
||||
"Format the region or current buffer using Apheleia."
|
||||
(interactive)
|
||||
(if (not (region-active-p))
|
||||
(call-interactively #'apheleia-format-buffer)
|
||||
(let* ((buf (current-buffer))
|
||||
(name (buffer-file-name))
|
||||
(temp-file (make-temp-file "apheleia" nil (format ".%s" (file-name-extension name))))
|
||||
@ -298,13 +300,8 @@
|
||||
(formatters (apheleia--get-formatters))
|
||||
(line (line-number-at-pos))
|
||||
(col (current-column))
|
||||
start
|
||||
end)
|
||||
(if (region-active-p)
|
||||
(setq start (region-beginning)
|
||||
end (region-end))
|
||||
(setq start (point-min)
|
||||
end (point-max)))
|
||||
(start (region-beginning))
|
||||
(end (region-end)))
|
||||
(with-current-buffer temp-buffer
|
||||
(erase-buffer)
|
||||
(insert-buffer-substring buf start end)
|
||||
@ -314,8 +311,7 @@
|
||||
(with-current-buffer buf
|
||||
(delete-region start end)
|
||||
(insert (with-current-buffer temp-buffer
|
||||
(string-trim
|
||||
(buffer-substring-no-properties (point-min) (point-max)))))
|
||||
(buffer-substring-no-properties (point-min) (point-max))))
|
||||
(goto-char (point-min))
|
||||
(forward-line (1- line))
|
||||
(move-to-column col)
|
||||
@ -332,6 +328,7 @@
|
||||
(set-buffer-modified-p nil))
|
||||
(kill-buffer temp-buffer))
|
||||
(error "Formatting failed: %s" error)))))))
|
||||
)
|
||||
|
||||
(keymap-set prog-mode-map "C-c f" #'apheleia)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user