From d7af354c402062b301c4f27327f8a52b8e478981 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Tue, 16 Aug 2022 13:36:03 +0200 Subject: [PATCH] [Emacs] Actually enable prettier-js-mode by default in web-mode This is how the previously reverted commit was meant to go. --- org/config/emacs.org | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org/config/emacs.org b/org/config/emacs.org index 576cead..966bcf1 100644 --- a/org/config/emacs.org +++ b/org/config/emacs.org @@ -7322,7 +7322,8 @@ languages in the same buffer, mainly HTML, CSS, and Javascript. (use-package web-mode :defer t :straight (:build t) - :hook ((html-mode . web-mode)) + :hook html-mode + :hook (web-mode . prettier-js-mode) :mode (("\\.phtml\\'" . web-mode) ("\\.tpl\\.php\\'" . web-mode) ("\\.twig\\'" . web-mode) @@ -7507,7 +7508,7 @@ And finally, here is a formatter for Javascript. :defer t :straight (:build t) :after (rjsx-mode web-mode typescript-mode) - :hook ((rjsx-mode web-mode typescript-mode) . prettier-js-mode) + :hook ((rjsx-mode typescript-mode) . prettier-js-mode) :config (csetq prettier-js-args '("--single-quote" "--jsx-single-quote"))) #+end_src