Merge pull request #4088 from GyazSquare/feature-improve-swift-mode

[swift-mode.el] improve swift mode

Author: Dave Abrahams

utils/swift-mode.el

@@ -44,13 +44,28 @@
    `(,(regexp-opt '("class" "init" "deinit" "extension" "fileprivate" "func"
                     "import" "let" "protocol" "static" "struct" "subscript"
                     "typealias" "enum" "var" "lazy" "where"
-                    "private" "public" "internal" "override" "throws"
-                    "open" "associatedtype")
+                    "private" "public" "internal" "override" "throws" "rethrows"
+                    "open" "associatedtype" "inout" "indirect" "final")
+                  'words) . font-lock-keyword-face)
+   ;; Variable decl keywords
+   `("\\b\\(?:[^a-zA-Z_0-9]*\\)\\(get\\|set\\)\\(?:[^a-zA-Z_0-9]*\\)\\b" 1 font-lock-keyword-face)
+   `(,(regexp-opt '("willSet" "didSet") 'words) . font-lock-keyword-face)
+   ;; Operators
+   `("\\b\\(?:\\(?:pre\\|post\\|in\\)fix\\s-+\\)operator\\b" . font-lock-keyword-face)
+   ;; Keywords that begin with a number sign
+   `("#\\(if\\|endif\\|elseif\\|else\\|available\\)\\b" . font-lock-string-face)
+   `("#\\(file\\|line\\|column\\|function\\|selector\\)\\b" . font-lock-keyword-face)
+   ;; Infix operator attributes
+   `(,(regexp-opt '("precedence" "associativity" "left" "right" "none")
                   'words) . font-lock-keyword-face)
    ;; Statements
-   `(,(regexp-opt '("if" "guard" "in" "else" "for" "do" "repeat" "while" "return"
-                    "break" "continue" "switch" "case" "default"
-                    "throw" "try" "catch")
+   `(,(regexp-opt '("if" "guard" "in" "else" "for" "do" "repeat" "while"
+                    "return" "break" "continue" "fallthrough"  "switch" "case"
+                    "default" "throw" "defer" "try" "catch")
+                  'words) . font-lock-keyword-face)
+   ;; Decl modifier keywords
+   `(,(regexp-opt '("convenience" "dynamic" "mutating" "nonmutating" "optional"
+                    "required" "weak" "unowned" "safe" "unsafe")
                   'words) . font-lock-keyword-face)
    ;; Expressions
    `(,(regexp-opt '("new") 'words) . font-lock-keyword-face)