branch: elpa/swift-mode commit 82ee8222e1f3be71a89da141205ea398a2b043d7 Author: taku0 <mxxouy6x3m_git...@tatapa.org> Commit: taku0 <mxxouy6x3m_git...@tatapa.org>
Fix code styles --- swift-mode-indent.el | 8 +------- swift-mode.el | 8 ++++---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/swift-mode-indent.el b/swift-mode-indent.el index 2df9dfe..07ad88b 100644 --- a/swift-mode-indent.el +++ b/swift-mode-indent.el @@ -777,15 +777,9 @@ the expression." (progn (forward-comment (point-max)) (when (eq (char-after) ?@) - (forward-symbol 1) - (forward-comment (point-max)) - (when (eq (char-after) ?\() - (condition-case nil - (forward-list) - (scan-error nil)))) + (swift-mode:forward-token-simple)) (point)))))) - (defun swift-mode:calculate-indent-after-open-curly-brace (offset) "Return indentation after open curly braces. diff --git a/swift-mode.el b/swift-mode.el index 3ba9ff3..fd1226e 100644 --- a/swift-mode.el +++ b/swift-mode.el @@ -52,9 +52,9 @@ (set-keymap-parent map prog-mode-map) (define-key map (kbd "M-j") #'swift-mode:indent-new-comment-line) (define-key map (kbd "C-M-j") #'swift-mode:indent-new-comment-line) - (define-key map (kbd "C-c C-z") 'swift-mode:run-repl) - (define-key map (kbd "C-c C-f") 'swift-mode:send-buffer) - (define-key map (kbd "C-c C-r") 'swift-mode:send-region) + (define-key map (kbd "C-c C-z") #'swift-mode:run-repl) + (define-key map (kbd "C-c C-f") #'swift-mode:send-buffer) + (define-key map (kbd "C-c C-r") #'swift-mode:send-region) (easy-menu-define swift-menu map "Swift Mode menu" `("Swift" :help "Swift-specific Features" @@ -75,7 +75,7 @@ map) "Swift mode key map.") -;;; `foward-sexp-function' +;;; `forward-sexp-function' (defun swift-mode:forward-sexp (&optional arg) "Move forward/backward a token or list.