From c7ddbe049f2d4f36f808b9113f5ca80a5892e54f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 2 Dec 2023 10:48:42 -0500 Subject: [PATCH] fix(swift): set-eglot-client!: extra argument And move setter out of condition (it will no-op if :tools lsp +eglot isn't enabled). Plus, it should be configured even when +lsp isn't enabled for :lang swift. Amend: #7567 Close: #7577 Co-authored-by: ncihnegn --- modules/lang/swift/config.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/lang/swift/config.el b/modules/lang/swift/config.el index 5fc4d9888..ab66f2c48 100644 --- a/modules/lang/swift/config.el +++ b/modules/lang/swift/config.el @@ -2,11 +2,10 @@ (after! swift-mode (set-repl-handler! 'swift-mode #'run-swift) + (set-eglot-client! 'swift-mode '("sourcekit-lsp")) (when (modulep! +lsp) - (add-hook 'swift-mode-local-vars-hook #'lsp! 'append) - (when (modulep! :tools lsp +eglot) - (set-eglot-client! swift-mode 'swift-mode '("sourcekit-lsp")))) + (add-hook 'swift-mode-local-vars-hook #'lsp! 'append)) (when (modulep! +tree-sitter) (add-hook 'swift-mode-local-vars-hook #'tree-sitter! 'append)))