From 65e9876c335bad61c423e974cdb301ae345e2ce7 Mon Sep 17 00:00:00 2001 From: Hirofumi Wakasugi Date: Fri, 23 Apr 2021 22:42:47 +0900 Subject: [PATCH] Bump :lang swift swift-emacs/swift-mode@95ff004 -> swift-emacs/swift-mode@ad12a30 emacs-lsp/lsp-sourcekit@ff204ed -> emacs-lsp/lsp-sourcekit@aafa987 Adds support for sourcekit-lsp bundled with Xcode --- modules/lang/swift/config.el | 11 +++++------ modules/lang/swift/packages.el | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/lang/swift/config.el b/modules/lang/swift/config.el index 5a31b95d6..15a2c5f96 100644 --- a/modules/lang/swift/config.el +++ b/modules/lang/swift/config.el @@ -24,11 +24,10 @@ :after swift-mode :init (add-hook 'swift-mode-local-vars-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")))) + (list lsp-sourcekit-executable ; 'sourcekit-lsp' by default + "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/sourcekit-lsp" + "sourcekit" + "/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/sourcekit-lsp" + "/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/sourcekit")))) diff --git a/modules/lang/swift/packages.el b/modules/lang/swift/packages.el index 5dffa9b2e..7c6c7c777 100644 --- a/modules/lang/swift/packages.el +++ b/modules/lang/swift/packages.el @@ -1,10 +1,10 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/swift/packages.el -(package! swift-mode :pin "95ff0041370660e839ed06aa92330694d8590d62") +(package! swift-mode :pin "ad12a3025156873995318b6a0480cd2459063bf7") (if (featurep! +lsp) - (package! lsp-sourcekit :pin "ff204ed820df8c3035ebdc4b5a583640d52caeeb") + (package! lsp-sourcekit :pin "aafa9878a3df2f08e5a9c846d91fd53350ce3c99") (when (featurep! :completion company) (package! company-sourcekit :pin "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781")) (when (featurep! :checkers syntax)