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

Bump :lang swift

Browse source 
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
This commit is contained in:
Hirofumi Wakasugi 2021-04-23 22:42:47 +09:00
parent 193382e2e3
commit 65e9876c33
No known key found for this signature in database
GPG key ID: 3D244A690D1DAFC8
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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"))))

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

@ -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)