From a639d36a92f18d595d806b48f24d988971338a8a Mon Sep 17 00:00:00 2001 From: James Ravn Date: Thu, 27 Jun 2019 18:26:43 +0100 Subject: [PATCH] remove lsp-scala lsp-scala is deprecated. It's now bundled in lsp-mode as lsp-metals. --- modules/lang/scala/config.el | 7 ++----- modules/lang/scala/packages.el | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/lang/scala/config.el b/modules/lang/scala/config.el index ff3b9cb63..d367609c1 100644 --- a/modules/lang/scala/config.el +++ b/modules/lang/scala/config.el @@ -27,8 +27,5 @@ :after scala-mode :config (set-repl-handler! 'scala-mode #'run-scala)) - -(def-package! lsp-scala - :when (featurep! +lsp) - :after scala-mode - :init (add-hook 'scala-mode-hook #'lsp!)) +(when (featurep! +lsp) + (add-hook 'scala-mode-hook #'lsp!)) diff --git a/modules/lang/scala/packages.el b/modules/lang/scala/packages.el index 83207fe79..cc85e38ea 100644 --- a/modules/lang/scala/packages.el +++ b/modules/lang/scala/packages.el @@ -4,6 +4,5 @@ (package! sbt-mode) (package! scala-mode) -(if (featurep! +lsp) - (package! lsp-scala) +(unless (featurep! +lsp) (package! ensime))