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

fix(swift): don't load lsp-sourcekit with eglot

Browse source 
The `use-package!` declaration for lsp-sourcekit in `config.el` did not
match the `package!` declaration in `packages.el`: this resulted in
`lsp-sourcekit` being loaded but never installed. The removal of this
package also resulted in there no longer being a proper LSP client with
eglot--this has also been fixed.
This commit is contained in:
Patrick Norton 2023-11-27 18:08:36 -08:00 • committed by GitHub
parent 95e3491c3b
commit 9c3d1951e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/lang/swift/config.el
View file

@ -4,7 +4,9 @@
(set-repl-handler! 'swift-mode #'run-swift)
(when (modulep! +lsp)
(add-hook 'swift-mode-local-vars-hook #'lsp! 'append))
(add-hook 'swift-mode-local-vars-hook #'lsp! 'append)
(when (modulep! :tools lsp +eglot)
(set-eglot-client! swift-mode 'swift-mode '("sourcekit-lsp"))))
(when (modulep! +tree-sitter)
(add-hook 'swift-mode-local-vars-hook #'tree-sitter! 'append)))
@ -25,7 +27,7 @@
(use-package! lsp-sourcekit
:when (modulep! +lsp)
:when (and (modulep! +lsp) (not (modulep! :tools lsp +eglot)))
:after swift-mode
:init (add-hook 'swift-mode-local-vars-hook #'lsp! 'append)
:config