emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(format): prettier-*: 'void-variable unless' error

Browse source 
Also short-circuits the condition with
apheleia-formatters-respect-indent-level, if it's been disabled.

Amend: c0a1b9efc9
Ref: #7998
This commit is contained in:
Henrik Lissner 2024-08-19 13:34:39 -04:00
parent ddfb0cc3cc
commit 50adaa9e48
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/editor/format/config.el
View file

@ -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"))))))))