From b34533de968f1b468b193b7c1e52ad5968588d63 Mon Sep 17 00:00:00 2001 From: Ellis Kenyo Date: Sat, 3 Dec 2022 09:37:45 +0000 Subject: [PATCH] fix(format): load format-on-save-disabled-modes fn Should handle some corner cases with how inhibiting is set --- modules/editor/format/config.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el index 9610e1154..28f7dc17e 100644 --- a/modules/editor/format/config.el +++ b/modules/editor/format/config.el @@ -34,15 +34,15 @@ select buffers.") (when (modulep! +onsave) (add-hook 'doom-first-file-hook #'apheleia-global-mode)) -(defun +format-enable-on-save-maybe-h () +(defun +format-inhibit-maybe-h () "Enable formatting on save in certain major modes. This is controlled by `+format-on-save-disabled-modes'." - (setq-local apheleia-inhibit (or (eq major-mode 'fundamental-mode) - (string-empty-p (string-trim (buffer-name))) - (not (null (memq major-mode +format-on-save-disabled-modes)))))) + (or (eq major-mode 'fundamental-mode) + (string-empty-p (string-trim (buffer-name))) + (not (null (memq major-mode +format-on-save-disabled-modes))))) (when (modulep! +onsave) - (add-hook 'after-change-major-mode-hook #'+format-enable-on-save-maybe-h)) + (add-to-list 'apheleia-inhibit-functions #'+format-inhibit-maybe-h)) ;; ;;; Hacks