From 50adaa9e48964a54fa4acdde8ac363869b32419f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 19 Aug 2024 13:34:39 -0400 Subject: [PATCH] fix(format): prettier-*: 'void-variable unless' error Also short-circuits the condition with apheleia-formatters-respect-indent-level, if it's been disabled. Amend: c0a1b9efc9a8 Ref: #7998 --- modules/editor/format/config.el | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el index fec55c04e..cbd1ea30c 100644 --- a/modules/editor/format/config.el +++ b/modules/editor/format/config.el @@ -89,17 +89,18 @@ This is controlled by `+format-on-save-disabled-modes'." (setf (alist-get formatter apheleia-formatters) (append (delete '(apheleia-formatters-js-indent "--use-tabs" "--tab-width") (alist-get formatter apheleia-formatters)) - '(unless (or (cl-loop for file - in '(".prettierrc" - ".prettierrc.json" - ".prettierrc.yml" - ".prettierrc.yaml" - ".prettierrc.json5" - ".prettierrc.js" "prettier.config.js" - ".prettierrc.mjs" "prettier.config.mjs" - ".prettierrc.cjs" "prettier.config.cjs" - ".prettierrc.toml") - if (locate-dominating-file default-directory file) - return t) - (assq 'prettier (+javascript-npm-conf))) - (apheleia-formatters-indent "--use-tabs" "--tab-width")))))) + '((when apheleia-formatters-respect-indent-level + (unless (or (cl-loop for file + in '(".prettierrc" + ".prettierrc.json" + ".prettierrc.yml" + ".prettierrc.yaml" + ".prettierrc.json5" + ".prettierrc.js" "prettier.config.js" + ".prettierrc.mjs" "prettier.config.mjs" + ".prettierrc.cjs" "prettier.config.cjs" + ".prettierrc.toml") + if (locate-dominating-file default-directory file) + return t) + (assq 'prettier (+javascript-npm-conf))) + (apheleia-formatters-indent "--use-tabs" "--tab-width"))))))))