From b80f5daf5965ca4b8db6a4fb4d3b6eb324627d6f Mon Sep 17 00:00:00 2001 From: Luis Osa Date: Wed, 17 Jun 2020 11:30:53 +0200 Subject: [PATCH 1/2] Add separate package for lsp-metals lsp-metals was extracted out of lsp-emacs into a separate package. This change adds that separate package to the scala module when the lsp feature is selected. Fixes hlissner/doom-emacs#3362 --- modules/lang/scala/packages.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/lang/scala/packages.el b/modules/lang/scala/packages.el index 1ed7723dd..e19cffa69 100644 --- a/modules/lang/scala/packages.el +++ b/modules/lang/scala/packages.el @@ -3,3 +3,6 @@ (package! sbt-mode :pin "633a315ad4") (package! scala-mode :pin "46bb948345") + +(when (featurep! +lsp) + (package! lsp-metals :pin "5468b638cd81b7d9ce9edc652c281b28bd775c23")) From 4aa98240dcfed71669a3117dfdc1280ce1eacf7c Mon Sep 17 00:00:00 2001 From: Luis Osa Date: Wed, 17 Jun 2020 21:23:36 +0200 Subject: [PATCH 2/2] Fix indentation --- modules/lang/scala/packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/scala/packages.el b/modules/lang/scala/packages.el index e19cffa69..2133071a8 100644 --- a/modules/lang/scala/packages.el +++ b/modules/lang/scala/packages.el @@ -5,4 +5,4 @@ (package! scala-mode :pin "46bb948345") (when (featurep! +lsp) - (package! lsp-metals :pin "5468b638cd81b7d9ce9edc652c281b28bd775c23")) + (package! lsp-metals :pin "5468b638cd81b7d9ce9edc652c281b28bd775c23"))