branch: elpa/swift-mode commit 60e5cf72a85ae26ee9afa44085d1fecd9bd53f13 Author: taku0 <mxxouy6x3m_git...@tatapa.org> Commit: taku0 <mxxouy6x3m_git...@tatapa.org>
Remove redundant code Token type of operator tokens after `func` or "operator" is always identifier. See `swift-mode:fix-operator-type` for details. --- swift-mode-beginning-of-defun.el | 2 +- swift-mode-lexer.el | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/swift-mode-beginning-of-defun.el b/swift-mode-beginning-of-defun.el index 54cbad6..1459f53 100644 --- a/swift-mode-beginning-of-defun.el +++ b/swift-mode-beginning-of-defun.el @@ -1442,7 +1442,7 @@ of ancestors." ;; Ignored: "import" "get" "set" "willSet" "didSet" (t nil)))) - (if (memq (swift-mode:token:type name-token) '(identifier operator)) + (if (eq (swift-mode:token:type name-token) identifier) name-token nil))) diff --git a/swift-mode-lexer.el b/swift-mode-lexer.el index ef8c273..ff63a8e 100644 --- a/swift-mode-lexer.el +++ b/swift-mode-lexer.el @@ -632,8 +632,7 @@ Return nil otherwise." ;; FIXME: mutual dependency (progn (swift-mode:try-backward-generic-parameters) (point))) (swift-mode:function-parameter-clause-p))) - ((or (eq previous-type 'operator) - (eq previous-type 'identifier)) + ((eq previous-type 'identifier) (equal (swift-mode:token:text (swift-mode:backward-token-simple)) "func")) (t nil)))))