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

Don't load lsp-java/dap-java if +eglot

Browse source 
Relevant to #3999
This commit is contained in:
Henrik Lissner 2020-10-14 01:40:11 -04:00
parent 23c36a2feb
commit a776664ebc
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/lang/java/+lsp.el
View file

@ -1,5 +1,5 @@
;;; lang/java/+lsp.el -*- lexical-binding: t; -*- ;;; lang/java/+lsp.el -*- lexical-binding: t; -*-
;;;###if (featurep! +lsp) ;;;###if (and (featurep! +lsp) (not (featurep! :tools lsp +eglot)))
(use-package! lsp-java (use-package! lsp-java
:after lsp-mode :after lsp-mode

5
modules/lang/java/config.el
View file

@ -26,8 +26,9 @@ If the depth is 2, the first two directories are removed: net.lissner.game.")
(add-hook 'java-mode-hook #'rainbow-delimiters-mode) (add-hook 'java-mode-hook #'rainbow-delimiters-mode)
(cond ((featurep! +lsp) (load! "+lsp")) (cond ((featurep! +meghanada) (load! "+meghanada"))
((featurep! +meghanada) (load! "+meghanada"))) ((featurep! :tools lsp +eglot))
((featurep! +lsp) (load! "+lsp")))
;; ;;