From ac1122ae67d762e09fc6684945b52adff96cf1dc Mon Sep 17 00:00:00 2001 From: Eleanor Bartle Date: Sun, 8 Sep 2024 05:11:43 +1000 Subject: [PATCH] tweak(erlang): format w/ erlfmt instead of efmt --- modules/lang/erlang/README.org | 2 +- modules/lang/erlang/config.el | 2 +- modules/lang/erlang/doctor.el | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/lang/erlang/README.org b/modules/lang/erlang/README.org index f88be01dc..3a2a447e6 100644 --- a/modules/lang/erlang/README.org +++ b/modules/lang/erlang/README.org @@ -40,7 +40,7 @@ This module requires Erlang be installed (which includes ~erlang-mode~). Check your distribution's package manager or a version management tool such as [[https://github.com/kerl/kerl][kerl]]. - [[https://github.com/erlang/sourcer][sourcer]] when [[doom-module::tools lsp]] & [[doom-module:+lsp]] -- [[https://github.com/sile/efmt][efmt]] when [[doom-module::editor format]] +- [[https://github.com/erlang/rebar3][rebar3]] with [[https://github.com/WhatsApp/erlfmt][erlfmt]] when [[doom-module::editor format]] * TODO Usage #+begin_quote diff --git a/modules/lang/erlang/config.el b/modules/lang/erlang/config.el index 672ca5b6a..32854a627 100644 --- a/modules/lang/erlang/config.el +++ b/modules/lang/erlang/config.el @@ -5,7 +5,7 @@ :mode ("/rebar\\.config\\(?:\\.script\\)?\\'" . erlang-mode) :mode ("/\\(?:app\\|sys\\)\\.config\\'" . erlang-mode) :config - (set-formatter! 'efmt '("efmt" "-") :modes '(erlang-mode)) + (set-formatter! 'erlfmt '("rebar3" "fmt" "-") :modes '(erlang-mode)) (when (modulep! +lsp) (add-hook 'erlang-mode-local-vars-hook #'lsp! 'append)) diff --git a/modules/lang/erlang/doctor.el b/modules/lang/erlang/doctor.el index 3997f8fa3..eca4a6039 100644 --- a/modules/lang/erlang/doctor.el +++ b/modules/lang/erlang/doctor.el @@ -6,5 +6,5 @@ "This module requires (:tools lsp)") (when (modulep! :editor format) - (unless (executable-find "efmt") - (warn! "Couldn't find efmt. Formatting will be disabled."))) + (unless (and (executable-find "rebar3") (zerop (car (doom-call-process "rebar3" "fmt" "-v")))) + (warn! "Couldn't find erlfmt. Formatting will be disabled.")))