Skip to content

Commit 60e5cf7

Browse files
committed
Remove redundant code
Token type of operator tokens after `func` or "operator" is always identifier. See `swift-mode:fix-operator-type` for details.
1 parent 56e21f8 commit 60e5cf7

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

swift-mode-beginning-of-defun.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1442,7 +1442,7 @@ of ancestors."
14421442

14431443
;; Ignored: "import" "get" "set" "willSet" "didSet"
14441444
(t nil))))
1445-
(if (memq (swift-mode:token:type name-token) '(identifier operator))
1445+
(if (eq (swift-mode:token:type name-token) identifier)
14461446
name-token
14471447
nil)))
14481448

swift-mode-lexer.el

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,8 +632,7 @@ Return nil otherwise."
632632
;; FIXME: mutual dependency
633633
(progn (swift-mode:try-backward-generic-parameters) (point)))
634634
(swift-mode:function-parameter-clause-p)))
635-
((or (eq previous-type 'operator)
636-
(eq previous-type 'identifier))
635+
((eq previous-type 'identifier)
637636
(equal (swift-mode:token:text (swift-mode:backward-token-simple))
638637
"func"))
639638
(t nil)))))

0 commit comments

Comments
 (0)