yogsototh/doom-emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor(cli): minor refactors & allow flychecker in CLIs

Browse source 
- Add comments to doom-cli-context-parse.
- Simplify/inline code here and there.
- Remove sacrifice to appease byte-compiler.

Thanks to a346928 there's no need to appease the byte-compiler with this
eval-when-compile hackery.

Ref: a34692826f18
This commit is contained in:
Henrik Lissner 2022-06-22 19:34:25 +02:00
parent e651547abb
commit 001065ba42
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
2 changed files with 29 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/cli/help.el
View file

@ -121,7 +121,9 @@ OPTIONS:
" +" " " (format "'%s'" formatted)))
" or ")))))))))
(defcli! (:root :version) ((simple? ("--simple")) &context context)
(defcli! (:root :version)
((simple? ("--simple"))
&context context)
"Show installed versions of Doom, Doom modules, and Emacs."
(doom/version)
(unless simple?
@ -359,7 +361,7 @@ The alist's CAR are lists of formatted switches plus their arguments, e.g.
'((\"`--foo'\" \"`BAR'\") ...). Their CDR is their formatted documentation."
(let* ((docs (doom-cli-help--parse-docs (doom-cli-find cli t) "OPTIONS"))
(docs (mapcar (fn! (cons (split-string (car %) ", ")
(cdr %)))
(cdr %)))
docs))
(strfmt (if noformatting? "%s" "`%s'"))
local-options
@ -408,14 +410,13 @@ The alist's CAR are lists of formatted switches plus their arguments, e.g.
(insert!
("%s%s\n%s"
(mapconcat
(fn!
(when (member "..." (cdr %))
(setq multiple? t))
(string-trim-right
(format "%s %s"
(doom-print--cli-markup (car %))
(doom-print--cli-markup
(string-join (remove "..." (cdr %)) "|")))))
(fn! (when (member "..." (cdr %))
(setq multiple? t))
(string-trim-right
(format "%s %s"
(doom-print--cli-markup (car %))
(doom-print--cli-markup
(string-join (remove "..." (cdr %)) "|")))))
switches
", ")
(if multiple? ", ..." "")

42
core/core-cli-lib.el
View file

@ -1,13 +1,7 @@
;;; core/core-cli-lib.el --- API+DSL for Doom's CLI framework -*- lexical-binding: t; no-byte-compile: t; -*-
;;; core/core-cli-lib.el --- API+DSL for Doom's CLI framework -*- lexical-binding: t; -*-
;;; Commentary:
;;; Code:
;; Appease byte-compiler-sama
(eval-when-compile
;; ...but prevent recursive or unwanted loads
(unless (or load-in-progress (not noninteractive))
(require 'core-cli)))
(require 'seq)
(require 'map)
@ -267,8 +261,7 @@ If NOLOAD? is non-nil, don't autoload deferred CLIs (see `doom-cli-get')."
(when cli
(cons
cli (let (alias paths)
(while (and (doom-cli-p cli)
(setq alias (doom-cli-alias cli)))
(while (setq alias (ignore-errors (doom-cli-alias cli)))
(and (setq cli (doom-cli-get alias t noload?))
(push cli paths)))
(nreverse paths)))))
@ -290,7 +283,7 @@ Returned in the order they will execute. Includes pseudo CLIs."
(dolist (path (nreverse paths))
(push (cons :before path) results))
(push '(:before) results)
(dolist (result (nreverse results) clis)
(dolist (result results (nreverse clis))
(when-let (cli (doom-cli-get result t))
(cl-pushnew cli clis
:test #'equal
@ -374,7 +367,7 @@ Return nil if CLI (a `doom-cli') has no explicit documentation."
(push (car option) seen)))))
;; Populate arguments
(let* ((arglist (doom-cli-context-arguments context))
(rest (copy-sequence (alist-get (doom-cli-command cli) arglist nil nil #'equal)))
(rest (copy-sequence (map-elt arglist (doom-cli-command cli))))
(args (copy-sequence (alist-get t arglist)))
(argc (length args))
(required (alist-get '&required argspec))
@ -431,9 +424,9 @@ If RECURSIVE, includes breadcrumbs leading up to COMMANDSPEC."
(funcall (if recursive?
#'identity
(fn! (cl-loop with cmdlen = (length (car %))
for command in %
while (= (length command) cmdlen)
collect command)))
for command in %
while (= (length command) cmdlen)
collect command)))
(seq-reduce (lambda (init next)
(nconc (cl-loop with firstlen = (length (car init))
for seg in (doom-enlist next)
@ -765,25 +758,31 @@ executable context."
((when-let*
(((null arguments))
((not rest?))
(command (append (doom-cli--command context) (list arg)))
(command (append (doom-cli-context-command context) (list arg)))
(cli (doom-cli-get command t))
(rcli (doom-cli-get command))
(key (doom-cli-key rcli)))
(doom-log "doom-cli-context-execute: found %s" command)
;; Show warnings depending on CLI plists
(when (doom-cli-alias cli)
(dolist (pcli (doom-cli-path cli))
(doom-log "doom-cli-context-execute: path=%s" (doom-cli-key pcli))
(push (doom-cli-key pcli) (doom-cli-context-path context))))
;; Collect &rest for this command
(setf (doom-cli-context-command context) key
(map-elt (doom-cli-context-arguments context)
(doom-cli-command rcli))
(copy-sequence args))
;; Initialize options associated with this command to a nil value;
;; this simplifies existence validation later.
(dolist (cli (doom-cli-find key))
(dolist (option (doom-cli-options cli))
(dolist (switch (doom-cli-option-switches option))
(unless (assoc switch (doom-cli-context-options context))
(setf (map-elt (doom-cli-context-options context) switch)
nil)))))
;; If this command uses &rest, stop processing commands from this
;; point on and pass the rest (of the unprocessed arguments) to it.
(when (and (doom-cli-fn rcli)
(alist-get '&rest (doom-cli-arguments rcli)))
(setq rest? t))
@ -975,14 +974,6 @@ See `doom-cli-log-file-format' for details."
(princ str buffer)))
(send-string-to-terminal str)))
(defun doom-cli--output-read-stdin (buffer)
(with-current-buffer buffer
(let (in)
(while (setq in (ignore-errors (read-from-minibuffer "")))
(insert in "\n"))
(when in
(delete-char -1)))))
(defun doom-cli--output-write-logs-h (context)
"Write all log buffers to their appropriate files."
;; Delete the last `doom-cli-log-retain' logs
@ -1699,7 +1690,10 @@ errors to `doom-cli-error-file')."
(when (doom-cli-context-pipe-p context :out t)
(setq doom-print-backend nil))
(when (doom-cli-context-pipe-p context :in)
(doom-cli--output-read-stdin (doom-cli-context-stdin context)))
(with-current-buffer (doom-cli-context-stdin context)
(while (if-let (in (ignore-errors (read-from-minibuffer "")))
(insert in "\n")
(ignore-errors (delete-char -1))))))
(doom-log "doom-cli-run: %s" command-line-args)
(doom-cli--exit
(condition-case e