From a776664ebca6b40f1cdeb643cd14707c1adb241d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 14 Oct 2020 01:40:11 -0400 Subject: [PATCH] Don't load lsp-java/dap-java if +eglot Relevant to #3999 --- modules/lang/java/+lsp.el | 2 +- modules/lang/java/config.el | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/lang/java/+lsp.el b/modules/lang/java/+lsp.el index df19dca51..7d62383da 100644 --- a/modules/lang/java/+lsp.el +++ b/modules/lang/java/+lsp.el @@ -1,5 +1,5 @@ ;;; lang/java/+lsp.el -*- lexical-binding: t; -*- -;;;###if (featurep! +lsp) +;;;###if (and (featurep! +lsp) (not (featurep! :tools lsp +eglot))) (use-package! lsp-java :after lsp-mode diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el index f02a82992..1a537cb19 100644 --- a/modules/lang/java/config.el +++ b/modules/lang/java/config.el @@ -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) -(cond ((featurep! +lsp) (load! "+lsp")) - ((featurep! +meghanada) (load! "+meghanada"))) +(cond ((featurep! +meghanada) (load! "+meghanada")) + ((featurep! :tools lsp +eglot)) + ((featurep! +lsp) (load! "+lsp"))) ;;