emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Remove lsp-scala, as lsp-metals is bundled in lsp-mode
This commit is contained in:
Henrik Lissner 2019-06-27 20:48:48 +02:00 • committed by GitHub
commit 501ed32ce5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/lang/scala/config.el
View file

@ -27,8 +27,5 @@
:after scala-mode :after scala-mode
:config (set-repl-handler! 'scala-mode #'run-scala)) :config (set-repl-handler! 'scala-mode #'run-scala))
(when (featurep! +lsp)
(def-package! lsp-scala (add-hook 'scala-mode-hook #'lsp!))
:when (featurep! +lsp)
:after scala-mode
:init (add-hook 'scala-mode-hook #'lsp!))

3
modules/lang/scala/packages.el
View file

@ -4,6 +4,5 @@
(package! sbt-mode) (package! sbt-mode)
(package! scala-mode) (package! scala-mode)
(if (featurep! +lsp) (unless (featurep! +lsp)
(package! lsp-scala)
(package! ensime)) (package! ensime))