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

fix(dart,scala,swift,treemacs): ignore lsp-* packages for eglot

Browse source 
Close: #7441
Co-authored-by: itome <itome@users.noreply.github.com>
This commit is contained in:
Henrik Lissner 2023-09-19 21:19:23 +02:00
parent 531a8bdfeb
commit fed0f49ca7
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,8 @@
(package! dart-mode :pin "9c846769abd37f7fdc7ba8388d1f3a2b844b75e3") (package! dart-mode :pin "9c846769abd37f7fdc7ba8388d1f3a2b844b75e3")
(when (modulep! +lsp) (when (and (modulep! +lsp)
(not (modulep! :tools lsp +eglot)))
(package! lsp-dart :pin "3db9f93c83052d6a8976c92d67d2b24473930760")) (package! lsp-dart :pin "3db9f93c83052d6a8976c92d67d2b24473930760"))
(when (modulep! +flutter) (when (modulep! +flutter)

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

@ -4,5 +4,6 @@
(package! sbt-mode :pin "9fe1e8807c22cc1dc56a6233e000969518907f4d") (package! sbt-mode :pin "9fe1e8807c22cc1dc56a6233e000969518907f4d")
(package! scala-mode :pin "5d7cf21c37e345c49f921fe5111a49fd54efd1e0") (package! scala-mode :pin "5d7cf21c37e345c49f921fe5111a49fd54efd1e0")
(when (modulep! +lsp) (when (and (modulep! +lsp)
(not (modulep! :tools lsp +eglot)))
(package! lsp-metals :pin "a2df7263ece6ac69214e41c52d66aab8d3f650eb")) (package! lsp-metals :pin "a2df7263ece6ac69214e41c52d66aab8d3f650eb"))

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

@ -4,7 +4,8 @@
(package! swift-mode :pin "1244ee48de1895d33f55fed81fc90acda0c901f1") (package! swift-mode :pin "1244ee48de1895d33f55fed81fc90acda0c901f1")
(if (modulep! +lsp) (if (modulep! +lsp)
(package! lsp-sourcekit :pin "468c641e35877e4e843f6b7c52a35937de562995") (unless (modulep! :tools lsp +eglot)
(package! lsp-sourcekit :pin "468c641e35877e4e843f6b7c52a35937de562995"))
(when (modulep! :completion company) (when (modulep! :completion company)
(package! company-sourcekit :pin "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c")) (package! company-sourcekit :pin "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c"))
(when (and (modulep! :checkers syntax) (when (and (modulep! :checkers syntax)

3
modules/ui/treemacs/packages.el
View file

@ -11,5 +11,6 @@
(package! treemacs-magit)) (package! treemacs-magit))
(when (modulep! :ui workspaces) (when (modulep! :ui workspaces)
(package! treemacs-persp)) (package! treemacs-persp))
(when (modulep! +lsp) (when (and (modulep! +lsp)
(not (modulep! :tools lsp +eglot)))
(package! lsp-treemacs :pin "e66ae2196503d4e84334519e56b4388feffa5060")) (package! lsp-treemacs :pin "e66ae2196503d4e84334519e56b4388feffa5060"))