branch: elpa/swift-mode
commit 90686cb6da7cb6046852d2c11c668ee597478bdd
Author: taku0 <mxxouy6x3m_git...@tatapa.org>
Commit: taku0 <mxxouy6x3m_git...@tatapa.org>
Add `some` keyword of Swift 5.1
---
swift-mode-font-lock.el | 2 +-
swift-mode-lexer.el | 4 ++--
test/swift-files/indent/identifiers.swift | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/swift-mode-font-lock.el b/swift-mode-font-lock.el
index 8d33d44..eb9ade2 100644
--- a/swift-mode-font-lock.el
+++ b/swift-mode-font-lock.el
@@ -538,7 +538,7 @@ Return nil otherwise."
(defconst swift-mode:declaration-keywords
'("associatedtype" "class" "deinit" "enum" "extension" "fileprivate" "func"
"import" "init" "inout" "internal" "let" "open" "operator" "private"
- "protocol" "public" "static" "struct" "subscript" "typealias" "var")
+ "protocol" "public" "some" "static" "struct" "subscript" "typealias" "var")
"Keywords used in declarations.")
(defconst swift-mode:statement-keywords
diff --git a/swift-mode-lexer.el b/swift-mode-lexer.el
index 12a2c7e..38187fc 100644
--- a/swift-mode-lexer.el
+++ b/swift-mode-lexer.el
@@ -416,9 +416,9 @@ Return nil otherwise." ;; FIXME pound-count
;; Suppress implicit semicolon around keywords that cannot start or end
;; statements.
(member (swift-mode:token:text previous-token)
- '("inout" "throws" "rethrows" "in" "where"))
+ '("some" "inout" "throws" "rethrows" "in" "where"))
(member (swift-mode:token:text next-token)
- '("inout" "throws" "rethrows" "in" "where")))
+ '("some" "inout" "throws" "rethrows" "in" "where")))
nil)
;; Inserts semicolon before open curly bracket.
diff --git a/test/swift-files/indent/identifiers.swift
b/test/swift-files/indent/identifiers.swift
index 519ed39..2dfd3d8 100644
--- a/test/swift-files/indent/identifiers.swift
+++ b/test/swift-files/indent/identifiers.swift
@@ -103,6 +103,9 @@ func foo() {
foo(
var: 1
)
+ foo(
+ some: 1
+ )
// Keywords used in statements
foo(
