From fed0f49ca7d23101fe309fad664e596c32b60b70 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 19 Sep 2023 21:19:23 +0200 Subject: [PATCH] fix(dart,scala,swift,treemacs): ignore lsp-* packages for eglot Close: #7441 Co-authored-by: itome --- modules/lang/dart/packages.el | 3 ++- modules/lang/scala/packages.el | 3 ++- modules/lang/swift/packages.el | 3 ++- modules/ui/treemacs/packages.el | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/lang/dart/packages.el b/modules/lang/dart/packages.el index 297a54530..5a7c93395 100644 --- a/modules/lang/dart/packages.el +++ b/modules/lang/dart/packages.el @@ -3,7 +3,8 @@ (package! dart-mode :pin "9c846769abd37f7fdc7ba8388d1f3a2b844b75e3") -(when (modulep! +lsp) +(when (and (modulep! +lsp) + (not (modulep! :tools lsp +eglot))) (package! lsp-dart :pin "3db9f93c83052d6a8976c92d67d2b24473930760")) (when (modulep! +flutter) diff --git a/modules/lang/scala/packages.el b/modules/lang/scala/packages.el index 2acdf10b8..8616e07ee 100644 --- a/modules/lang/scala/packages.el +++ b/modules/lang/scala/packages.el @@ -4,5 +4,6 @@ (package! sbt-mode :pin "9fe1e8807c22cc1dc56a6233e000969518907f4d") (package! scala-mode :pin "5d7cf21c37e345c49f921fe5111a49fd54efd1e0") -(when (modulep! +lsp) +(when (and (modulep! +lsp) + (not (modulep! :tools lsp +eglot))) (package! lsp-metals :pin "a2df7263ece6ac69214e41c52d66aab8d3f650eb")) diff --git a/modules/lang/swift/packages.el b/modules/lang/swift/packages.el index 4ff56d17d..e3ed615bd 100644 --- a/modules/lang/swift/packages.el +++ b/modules/lang/swift/packages.el @@ -4,7 +4,8 @@ (package! swift-mode :pin "1244ee48de1895d33f55fed81fc90acda0c901f1") (if (modulep! +lsp) - (package! lsp-sourcekit :pin "468c641e35877e4e843f6b7c52a35937de562995") + (unless (modulep! :tools lsp +eglot) + (package! lsp-sourcekit :pin "468c641e35877e4e843f6b7c52a35937de562995")) (when (modulep! :completion company) (package! company-sourcekit :pin "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c")) (when (and (modulep! :checkers syntax) diff --git a/modules/ui/treemacs/packages.el b/modules/ui/treemacs/packages.el index 6b0d5f20d..381c171e0 100644 --- a/modules/ui/treemacs/packages.el +++ b/modules/ui/treemacs/packages.el @@ -11,5 +11,6 @@ (package! treemacs-magit)) (when (modulep! :ui workspaces) (package! treemacs-persp)) -(when (modulep! +lsp) +(when (and (modulep! +lsp) + (not (modulep! :tools lsp +eglot))) (package! lsp-treemacs :pin "e66ae2196503d4e84334519e56b4388feffa5060"))