887ffe8590
The `swift-mode` REPL bindings have been updated to use a different naming convention (e.g. a prefix of `swift-mode:` in the CL style). Typing `, s s` would trigger this error: ``` command-execute: Wrong type argument: commandp, swift-mode-run-repl ``` This change fixes up the command names so that they are usable again from the leader key.
62 lines
2.1 KiB
EmacsLisp
62 lines
2.1 KiB
EmacsLisp
;;; packages.el --- swift Layer packages File for Spacemacs
|
|
;;
|
|
;; Copyright (c) 2012-2017 Sylvain Benner & Contributors
|
|
;;
|
|
;; Author: Uri Sharf <uri.sharf@me.com>
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
;;
|
|
;; This file is not part of GNU Emacs.
|
|
;;
|
|
;;; License: GPLv3
|
|
|
|
(setq swift-packages
|
|
'(
|
|
flycheck
|
|
swift-mode
|
|
))
|
|
|
|
(defun swift/post-init-flycheck ()
|
|
(spacemacs|use-package-add-hook flycheck
|
|
:post-config (add-to-list 'flycheck-checkers 'swift)))
|
|
|
|
(defun swift/init-swift-mode ()
|
|
(use-package swift-mode
|
|
:mode ("\\.swift\\'" . swift-mode)
|
|
:defer t
|
|
:init
|
|
(progn
|
|
(spacemacs|advise-commands "store-initial-buffer-name"
|
|
(swift-mode-run-repl) around
|
|
"Store current buffer bane in bufffer local variable,
|
|
before activiting or switching to REPL."
|
|
(let ((initial-buffer (current-buffer)))
|
|
ad-do-it
|
|
(with-current-buffer swift-repl-buffer
|
|
(setq swift-repl-mode-previous-buffer initial-buffer))))
|
|
|
|
(defun spacemacs/swift-repl-mode-hook ()
|
|
"Hook to run when starting an interactive swift mode repl"
|
|
(make-variable-buffer-local 'swift-repl-mode-previous-buffer))
|
|
(add-hook 'swift-repl-mode-hook 'spacemacs/swift-repl-mode-hook)
|
|
|
|
(defun spacemacs/swift-repl-mode-switch-back ()
|
|
"Switch back to from REPL to editor."
|
|
(interactive)
|
|
(if swift-repl-mode-previous-buffer
|
|
(switch-to-buffer-other-window swift-repl-mode-previous-buffer)
|
|
(message "No previous buffer"))))
|
|
:config
|
|
(progn
|
|
(spacemacs/set-leader-keys-for-major-mode 'swift-mode
|
|
"sS" 'swift-mode:run-repl ; run or switch to an existing swift repl
|
|
"ss" 'swift-mode:run-repl
|
|
"sb" 'swift-mode:send-buffer
|
|
"sr" 'swift-mode:send-region)
|
|
|
|
(with-eval-after-load 'swift-repl-mode-map
|
|
;; Switch back to editor from REPL
|
|
(spacemacs/set-leader-keys-for-major-mode 'swift-repl-mode
|
|
"ss" 'spacemacs/swift-repl-mode-switch-back)
|
|
(define-key swift-repl-mode-map
|
|
(kbd "C-c C-z") 'spacemacs/swift-repl-mode-switch-back)))))
|