From beda11068b752543e8965458328174fe04582b78 Mon Sep 17 00:00:00 2001 From: GilbertWong Date: Sat, 18 Dec 2021 14:03:50 +0800 Subject: [PATCH 1/4] bump: :lang erlang erlang/otp@118cb37bd5b9 -> erlang/otp@c1ab4b5424be Ref: erlang/otp#5314 --- modules/lang/erlang/packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/erlang/packages.el b/modules/lang/erlang/packages.el index ce5bb5c95..426668643 100644 --- a/modules/lang/erlang/packages.el +++ b/modules/lang/erlang/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/erlang/packages.el -(package! erlang :pin "118cb37bd5b9e9cb792f0463e46fdb04f151dcd5") +(package! erlang :pin "c1ab4b5424be7504cfc3c4e87a2116b7731d8f2d") (unless (featurep! +lsp) (when (featurep! :completion company) (package! company-erlang :pin "bc0524a16f17b66c7397690e4ca0e004f09ea6c5"))) From 0e99b6b9528e272b05b5b3ca29e8e45722eceaf8 Mon Sep 17 00:00:00 2001 From: GilbertWong Date: Fri, 17 Dec 2021 02:20:31 +0800 Subject: [PATCH 2/4] refactor!(erlang): remove company-erlang BREAKING CHANGE: Remove `company-erlang` which depends on `ivy-erlang-complete`. `company-erlang` and `ivy-erlang-complte` have not been maintained now. The lsp mode provides much better experience than `company-erlang` and `ivy-erlang-complete`. The `ivy-erlang-complete` package also has the defect that slow down the erlang-mode buffer when the buffer is huge enough. It is not a good choice to integrate ivy-erlang-complete nowadays even as a non-LSP option. --- modules/lang/erlang/config.el | 9 --------- modules/lang/erlang/packages.el | 3 --- 2 files changed, 12 deletions(-) diff --git a/modules/lang/erlang/config.el b/modules/lang/erlang/config.el index 5d41d24cf..8d34d10c8 100644 --- a/modules/lang/erlang/config.el +++ b/modules/lang/erlang/config.el @@ -7,12 +7,3 @@ :config (when (featurep! +lsp) (add-hook 'erlang-mode-local-vars-hook #'lsp!))) - - -(use-package! company-erlang - :when (featurep! :completion company) - :unless (featurep! +lsp) - :hook (erlang-mode . company-erlang-init) - :config - (add-hook! 'erlang-mode-hook - (add-hook 'after-save-hook #'ivy-erlang-complete-reparse nil t))) diff --git a/modules/lang/erlang/packages.el b/modules/lang/erlang/packages.el index 426668643..0307f0fb7 100644 --- a/modules/lang/erlang/packages.el +++ b/modules/lang/erlang/packages.el @@ -2,6 +2,3 @@ ;;; lang/erlang/packages.el (package! erlang :pin "c1ab4b5424be7504cfc3c4e87a2116b7731d8f2d") -(unless (featurep! +lsp) - (when (featurep! :completion company) - (package! company-erlang :pin "bc0524a16f17b66c7397690e4ca0e004f09ea6c5"))) From e692d8e9fde2349297b665a3e81b6c0253000c31 Mon Sep 17 00:00:00 2001 From: GilbertWong Date: Fri, 17 Dec 2021 02:31:18 +0800 Subject: [PATCH 3/4] feat(erlang): add doctor tool for erlang module --- modules/lang/erlang/doctor.el | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 modules/lang/erlang/doctor.el diff --git a/modules/lang/erlang/doctor.el b/modules/lang/erlang/doctor.el new file mode 100644 index 000000000..90ac156f9 --- /dev/null +++ b/modules/lang/erlang/doctor.el @@ -0,0 +1,6 @@ +;; -*- lexical-binding: t; no-byte-compile: t; -*- +;;; lang/erlang/doctor.el + +(assert! (or (not (featurep! +lsp)) + (featurep! :tools lsp)) + "This module requires (:tools lsp)") From 801a1c5b792b230830daf7b5862f7c3caccc17d3 Mon Sep 17 00:00:00 2001 From: GilbertWong Date: Fri, 17 Dec 2021 02:54:35 +0800 Subject: [PATCH 4/4] fix(erlang): correct `featurep!` usage