From bde9b2791da686a91107461d6c3b87f720160166 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 27 Oct 2019 12:18:13 -0400 Subject: [PATCH] lang/swift: add sane sourcekit-lsp defaults --- modules/lang/swift/config.el | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/lang/swift/config.el b/modules/lang/swift/config.el index 83f21b647..74fd60da3 100644 --- a/modules/lang/swift/config.el +++ b/modules/lang/swift/config.el @@ -22,4 +22,13 @@ (use-package! lsp-sourcekit :when (featurep! +lsp) :after swift-mode - :init (add-hook 'swift-mode-hook #'lsp!)) + :init (add-hook 'swift-mode-hook #'lsp!) + :config + (unless (getenv "SOURCEKIT_TOOLCHAIN_PATH") + (setenv "SOURCEKIT_TOOLCHAIN_PATH" "/Library/Developer/Toolchains/swift-latest.xctoolchain")) + (setq lsp-sourcekit-executable + (cl-find-if #'executable-find + (list lsp-sourcekit-executable ; 'sourcekit' by default + "sourcekit-lsp" + "/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/sourcekit" + "/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/sourcekit-lsp"))))