Merge pull request #1518 from jsravn/improve-scala-lsp

Remove lsp-scala, as lsp-metals is bundled in lsp-mode

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!))

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))