Use SwiftFormat version 0.47.x

.swiftformat

@@ -22,6 +22,8 @@
     duplicateImports,               \
     elseOnSameLine,                 \
     emptyBraces,                    \
+    enumNamespaces,                 \
+    extensionAccessControl,         \
     fileHeader,                     \
     hoistPatternLet,                \
     indent,                         \
@@ -31,6 +33,7 @@
     linebreakAtEndOfFile,           \
     linebreaks,                     \
     modifierOrder,                  \
+#    markTypes,                      \
     numberFormatting,               \
 #    organizeDeclarations,           \
     preferKeyPath,                  \
@@ -53,6 +56,7 @@
     redundantVoidReturnType,        \
     semicolons,                     \
     sortedImports,                  \
+    sortedSwitchCases,              \
     spaceAroundBraces,              \
     spaceAroundBrackets,            \
     spaceAroundComments,            \
@@ -88,6 +92,10 @@
 
 --allman false
 
+### Color/image literal width. "actual-width" or "visual-width"
+
+--assetliterals visual-width
+
 ### Binary grouping,threshold (default: 4,8) or "none", "ignore"
 
 --binarygrouping 4,8
@@ -116,6 +124,10 @@
 
 --exponentgrouping disabled
 
+### Place ACL "on-extension" (default) or "on-declarations"
+
+--extensionacl on-extension
+
 ### Group digits after '.': "enabled" or "disabled" (default)
 
 --fractiongrouping disabled
@@ -244,10 +256,18 @@
 
 --wrapcollections preserve
 
+### Wrap conditions: "before-first", "after-first", "preserve"
+
+--wrapconditions preserve
+
 ### Wrap func params: "before-first", "after-first", "preserve"
 
 --wrapparameters preserve
 
+### Wrap return type: "if-multiline", "preserve" (default)
+
+--wrapreturntype preserve
+
 ### Xcode indent guard/enum: "enabled" or "disabled" (default)
 
 --xcodeindentation disabled

passKit/Extensions/String+Localization.swift

@@ -6,21 +6,21 @@
 //  Copyright © 2019 Bob Sun. All rights reserved.
 //
 
-extension String {
-    public func localize() -> String {
+public extension String {
+    func localize() -> String {
         // swiftlint:disable:next nslocalizedstring_key
         NSLocalizedString(self, bundle: Bundle.main, value: "#\(self)#", comment: "")
     }
 
-    public func localize(_ firstValue: CVarArg) -> String {
+    func localize(_ firstValue: CVarArg) -> String {
         String(format: localize(), firstValue)
     }
 
-    public func localize(_ firstValue: CVarArg, _ secondValue: CVarArg) -> String {
+    func localize(_ firstValue: CVarArg, _ secondValue: CVarArg) -> String {
         String(format: localize(), firstValue, secondValue)
     }
 
-    public func localize(_ error: Error) -> String {
+    func localize(_ error: Error) -> String {
         localize(error.localizedDescription)
     }
 }

passKit/Extensions/String+Utilities.swift

@@ -6,25 +6,25 @@
 //  Copyright © 2018 Bob Sun. All rights reserved.
 //
 
-extension String {
-    public var trimmed: String {
+public extension String {
+    var trimmed: String {
         trimmingCharacters(in: .whitespacesAndNewlines)
     }
 
-    public func stringByAddingPercentEncodingForRFC3986() -> String? {
+    func stringByAddingPercentEncodingForRFC3986() -> String? {
         let unreserved = "-._~/?"
         var allowed = CharacterSet.alphanumerics
         allowed.insert(charactersIn: unreserved)
         return addingPercentEncoding(withAllowedCharacters: allowed)
     }
 
-    public func splitByNewline() -> [String] {
+    func splitByNewline() -> [String] {
         split(omittingEmptySubsequences: false) { $0 == "\n" || $0 == "\r\n" }.map(String.init)
     }
 }
 
-extension String {
-    public static func | (left: String, right: String) -> String {
+public extension String {
+    static func | (left: String, right: String) -> String {
         right.isEmpty ? left : left + "\n" + right
     }
 }

passKit/Extensions/UIAlertActionExtension.swift

@@ -9,32 +9,32 @@
 import Foundation
 import UIKit
 
-extension UIAlertAction {
-    public static func cancelAndPopView(controller: UIViewController) -> UIAlertAction {
+public extension UIAlertAction {
+    static func cancelAndPopView(controller: UIViewController) -> UIAlertAction {
         cancel { _ in
             controller.navigationController?.popViewController(animated: true)
         }
     }
 
-    public static func cancel(title: String = "Cancel".localize(), handler: ((UIAlertAction) -> Void)? = nil) -> UIAlertAction {
+    static func cancel(title: String = "Cancel".localize(), handler: ((UIAlertAction) -> Void)? = nil) -> UIAlertAction {
         UIAlertAction(title: title, style: .cancel, handler: handler)
     }
 
-    public static func dismiss(handler: ((UIAlertAction) -> Void)? = nil) -> UIAlertAction {
+    static func dismiss(handler: ((UIAlertAction) -> Void)? = nil) -> UIAlertAction {
         cancel(title: "Dismiss".localize(), handler: handler)
     }
 
-    public static func ok(handler: ((UIAlertAction) -> Void)? = nil) -> UIAlertAction {
+    static func ok(handler: ((UIAlertAction) -> Void)? = nil) -> UIAlertAction {
         UIAlertAction(title: "Ok".localize(), style: .default, handler: handler)
     }
 
-    public static func okAndPopView(controller: UIViewController) -> UIAlertAction {
+    static func okAndPopView(controller: UIViewController) -> UIAlertAction {
         ok { _ in
             controller.navigationController?.popViewController(animated: true)
         }
     }
 
-    public static func selectKey(controller: UIViewController, handler: ((UIAlertAction) -> Void)?) -> UIAlertAction {
+    static func selectKey(controller: UIViewController, handler: ((UIAlertAction) -> Void)?) -> UIAlertAction {
         UIAlertAction(title: "Select Key", style: .default) { _ in
             let selectKeyAlert = UIAlertController(title: "Select from imported keys", message: nil, preferredStyle: .actionSheet)
             try? PGPAgent.shared.getShortKeyID().forEach { keyID in

passKit/Extensions/UIViewControllerExtension.swift

@@ -6,9 +6,9 @@
 //  Copyright © 2017 Yishi Lin. All rights reserved.
 //
 
-extension UIViewController {
+public extension UIViewController {
     @objc
-    public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         if textField.nextField != nil {
             textField.nextField?.becomeFirstResponder()
         } else {

passKit/Models/PasswordEntity.swift

@@ -9,19 +9,19 @@
 import Foundation
 import SwiftyUserDefaults
 
-extension PasswordEntity {
-    public var nameWithCategory: String {
+public extension PasswordEntity {
+    var nameWithCategory: String {
         if let path = path, path.hasSuffix(".gpg") {
             return String(path.prefix(upTo: path.index(path.endIndex, offsetBy: -4)))
         }
         return ""
     }
 
-    public func getCategoryText() -> String {
+    func getCategoryText() -> String {
         getCategoryArray().joined(separator: " > ")
     }
 
-    public func getCategoryArray() -> [String] {
+    func getCategoryArray() -> [String] {
         var parentEntity = parent
         var passwordCategoryArray: [String] = []
         while parentEntity != nil {
@@ -32,7 +32,7 @@ extension PasswordEntity {
         return passwordCategoryArray
     }
 
-    public func getURL() throws -> URL {
+    func getURL() throws -> URL {
         if let path = getPath().stringByAddingPercentEncodingForRFC3986(), let url = URL(string: path) {
             return url
         }
@@ -42,16 +42,16 @@ extension PasswordEntity {
     // XXX: define some getters to get core data, we need to consider
     // manually write models instead auto generation.
 
-    public func getImage() -> Data? {
+    func getImage() -> Data? {
         image
     }
 
-    public func getName() -> String {
+    func getName() -> String {
         // unwrap non-optional core data
         name ?? ""
     }
 
-    public func getPath() -> String {
+    func getPath() -> String {
         // unwrap non-optional core data
         path ?? ""
     }

scripts/swiftformat.sh

@@ -1,4 +1,4 @@
-SWIFTFORMAT_VERSION="0.46.*"
+SWIFTFORMAT_VERSION="0.47.*"
 
 if [[ -f "${SRCROOT}/.ci-env" ]]; then
   echo "Running in a Continuous Integration environment. Formatting is skipped."