Fix startup complaining

1 files changed, 52 insertions, 6 deletions

@@ -43,6 +43,9 @@ it includes the NAME of the setup form in the warning output."
                                    name)
        ,body)))
 
+
+;;; New forms
+
 (setup-define :quit
   'setup-quit
   :documentation "Quit the current `setup' form.
@@ -77,7 +80,16 @@ If PATH does not exist, abort the evaluation."
                 (file-name-nondirectory
                  (directory-file-name (cadr args))))))
 
+(setup-define :needs
+  (lambda (executable)
+    `(unless (executable-find ,executable)
+       ,(setup-quit)))
+  :documentation "If EXECUTABLE is not in the path, stop here."
+  :repeatable 1)
+
 
+;;; Package integrations
+
 ;;; Straight.el
 
 (defun setup--straight-handle-arg (arg var)
@@ -127,12 +139,46 @@ The following keyword arguments are also recognized:
                  (let ((recipe (cadr sexp)))
                    (or (car-safe recipe) recipe)))))
 
-(setup-define :needs
-  (lambda (executable)
-    `(unless (executable-find ,executable)
-       ,(setup-quit)))
-  :documentation "If EXECUTABLE is not in the path, stop here."
-  :repeatable 1)
+;;; Apheleia
+
+(setup-define :apheleia
+  (lambda (name formatter &optional mode -pend)
+    (let* ((mode (or mode (setup-get 'mode)))
+           (current-formatters (and -pend
+                                    (alist-get mode apheleia-formatters))))
+      `(with-eval-after-load 'apheleia
+         (setf (alist-get ',name apheleia-formatters)
+               ,formatter)
+         (setf (alist-get ',mode apheleia-mode-alist)
+               ',(pcase -pend
+                   (:append (append (ensure-list current-formatters)
+                                    (list name)))
+                   (:prepend (cons name (ensure-list current-formatters)))
+                   ('nil name)
+                   (_ (error "Improper `:apheleia' -PEND argument")))))))
+  :documentation
+  "Register a formatter to `apheleia''s lists.
+NAME is the name given to the formatter in `apheleia-formatters'
+and `apheleia-mode-alist'.  FORMATTER is the command paired with
+NAME in `apheleia-formatters'.  MODE is the mode or modes to add
+NAME to in `apheleia-mode-alist'.  If MODE is not given or nil,
+use the setup form's MODE.  Optional argument -PEND can be one of
+`:append' or `:prepend', and if given will append or prepend the
+given NAME to the current formatters for the MODE in
+`apheleia-mode-alist', rather than replace them (the default).
+
+Example:
+(setup
+ (:apheleia isort (\"isort\" \"--stdout\" \"-\")
+                  python-mode))
+; =>
+(progn
+  (setf (alist-get 'isort apheleia-formatters)
+        '(\"isort\" \"--stdout\" \"-\"))
+  (setf (alist-get 'python-mode apheleia-mode-alist)
+        'isort))
+
+This form cannot be repeated, and it cannot be used as HEAD.")
 
 
 ;;; Redefines of `setup' forms