From ad4ed9419eee1fb12530259e13cd926f6717475e Mon Sep 17 00:00:00 2001 From: Danny Moesch Date: Sun, 31 Jan 2021 13:17:37 +0100 Subject: [PATCH] Format code with SwiftFormat --- .swiftformat | 4 ++-- .../AddPasswordTableViewController.swift | 2 +- .../AdvancedSettingsTableViewController.swift | 4 ++-- .../BasicStaticTableViewController.swift | 4 ++-- ...itRepositorySettingsTableViewController.swift | 4 ++-- .../PasswordDetailTableViewController.swift | 2 +- .../PasswordNavigationViewController.swift | 12 ++++++------ .../SettingsTableViewController.swift | 4 ++-- pass/Services/PasswordManager.swift | 2 +- pass/Services/PasswordNavigationDataSource.swift | 14 +++++++------- .../CredentialProviderViewController.swift | 4 ++-- .../Controllers/PasswordsViewController.swift | 4 ++-- .../Services/PasswordsTableDataSource.swift | 16 ++++++++-------- .../Controllers/ExtensionViewController.swift | 14 +++++++------- passExtension/Services/CredentialProvider.swift | 2 +- passKit/Crypto/PGPAgent.swift | 6 +++--- 16 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.swiftformat b/.swiftformat index 9d97209..67558bf 100644 --- a/.swiftformat +++ b/.swiftformat @@ -156,9 +156,9 @@ --ifdef indent -### "testable-top", "testable-bottom" or "alphabetized" (default) +### "testable-first", "testable-last", "alpha" (default) or "length" ---importgrouping testable-bottom +--importgrouping testable-last ### Number of spaces to indent, or "tab" to use tabs diff --git a/pass/Controllers/AddPasswordTableViewController.swift b/pass/Controllers/AddPasswordTableViewController.swift index 163f18d..d01905e 100644 --- a/pass/Controllers/AddPasswordTableViewController.swift +++ b/pass/Controllers/AddPasswordTableViewController.swift @@ -36,7 +36,7 @@ class AddPasswordTableViewController: PasswordEditorTableViewController { } @IBAction - private func cancel(_ sender: Any) { + private func cancel(_: Any) { navigationController?.popViewController(animated: true) } diff --git a/pass/Controllers/AdvancedSettingsTableViewController.swift b/pass/Controllers/AdvancedSettingsTableViewController.swift index b251d44..513747e 100644 --- a/pass/Controllers/AdvancedSettingsTableViewController.swift +++ b/pass/Controllers/AdvancedSettingsTableViewController.swift @@ -79,11 +79,11 @@ class AdvancedSettingsTableViewController: UITableViewController { } } - override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + override func tableView(_: UITableView, heightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } - override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat { + override func tableView(_: UITableView, estimatedHeightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } diff --git a/pass/Controllers/BasicStaticTableViewController.swift b/pass/Controllers/BasicStaticTableViewController.swift index 5ea3b6d..29ccd54 100644 --- a/pass/Controllers/BasicStaticTableViewController.swift +++ b/pass/Controllers/BasicStaticTableViewController.swift @@ -115,11 +115,11 @@ class BasicStaticTableViewController: UITableViewController, MFMailComposeViewCo } } - override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + override func tableView(_: UITableView, heightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } - override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat { + override func tableView(_: UITableView, estimatedHeightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } diff --git a/pass/Controllers/GitRepositorySettingsTableViewController.swift b/pass/Controllers/GitRepositorySettingsTableViewController.swift index 5cbce88..8985937 100644 --- a/pass/Controllers/GitRepositorySettingsTableViewController.swift +++ b/pass/Controllers/GitRepositorySettingsTableViewController.swift @@ -105,11 +105,11 @@ class GitRepositorySettingsTableViewController: UITableViewController, PasswordA tableView.deselectRow(at: indexPath, animated: true) } - override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + override func tableView(_: UITableView, heightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } - override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat { + override func tableView(_: UITableView, estimatedHeightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift index 2a96698..bb9290c 100644 --- a/pass/Controllers/PasswordDetailTableViewController.swift +++ b/pass/Controllers/PasswordDetailTableViewController.swift @@ -86,7 +86,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni } @objc - private func decryptThenShowPasswordSelector(_ sender: Any) { + private func decryptThenShowPasswordSelector(_: Any) { decryptThenShowPassword() } diff --git a/pass/Controllers/PasswordNavigationViewController.swift b/pass/Controllers/PasswordNavigationViewController.swift index fb584ec..5f38f53 100644 --- a/pass/Controllers/PasswordNavigationViewController.swift +++ b/pass/Controllers/PasswordNavigationViewController.swift @@ -1,6 +1,6 @@ -import UIKit import passKit import SVProgressHUD +import UIKit extension UIStoryboard { static var passwordNavigationViewController: PasswordNavigationViewController { @@ -148,7 +148,7 @@ class PasswordNavigationViewController: UIViewController { navigationBar.addGestureRecognizer(tapNavigationBarGestureRecognizer) } - private func isRootViewController () -> Bool { + private func isRootViewController() -> Bool { navigationController?.viewControllers.count == 1 } @@ -258,11 +258,11 @@ extension PasswordNavigationViewController: UITableViewDelegate { } } - func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat { + func tableView(_: UITableView, estimatedHeightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } - func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + func tableView(_: UITableView, heightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } } @@ -282,7 +282,7 @@ extension PasswordNavigationViewController { } } - override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool { + override func shouldPerformSegue(withIdentifier identifier: String, sender _: Any?) -> Bool { if identifier == "showPasswordDetail" { guard PGPAgent.shared.isPrepared else { Utils.alert(title: "CannotShowPassword".localize(), message: "PgpKeyNotSet.".localize(), controller: self) @@ -369,7 +369,7 @@ extension PasswordNavigationViewController: UISearchBarDelegate { cancelSearch() } - func searchBarTextDidEndEditing(_ searchBar: UISearchBar) { + func searchBarTextDidEndEditing(_: UISearchBar) { cancelSearch() } diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift index c076bb0..a3001a3 100644 --- a/pass/Controllers/SettingsTableViewController.swift +++ b/pass/Controllers/SettingsTableViewController.swift @@ -140,11 +140,11 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele tableView.deselectRow(at: indexPath, animated: true) } - override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + override func tableView(_: UITableView, heightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } - override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat { + override func tableView(_: UITableView, estimatedHeightForRowAt _: IndexPath) -> CGFloat { UITableView.automaticDimension } diff --git a/pass/Services/PasswordManager.swift b/pass/Services/PasswordManager.swift index 35cafca..9f9aee9 100644 --- a/pass/Services/PasswordManager.swift +++ b/pass/Services/PasswordManager.swift @@ -1,6 +1,6 @@ -import UIKit import passKit import SVProgressHUD +import UIKit class PasswordManager { weak var viewController: UIViewController? diff --git a/pass/Services/PasswordNavigationDataSource.swift b/pass/Services/PasswordNavigationDataSource.swift index 8680d51..72b283f 100644 --- a/pass/Services/PasswordNavigationDataSource.swift +++ b/pass/Services/PasswordNavigationDataSource.swift @@ -6,8 +6,8 @@ // Copyright © 2021 Bob Sun. All rights reserved. // -import UIKit import passKit +import UIKit struct Section { var title: String @@ -22,19 +22,19 @@ class PasswordNavigationDataSource: NSObject, UITableViewDataSource { let hideSectionHeaderThreshold = 6 init(entries: [PasswordTableEntry] = []) { - sections = buildSections(from: entries) - filteredSections = sections + self.sections = buildSections(from: entries) + self.filteredSections = sections } - func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + func tableView(_: UITableView, numberOfRowsInSection section: Int) -> Int { filteredSections[section].entries.count } - func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + func tableView(_: UITableView, titleForHeaderInSection section: Int) -> String? { showSectionTitles() ? filteredSections[section].title : nil } - func tableView(_ tableView: UITableView, sectionForSectionIndexTitle title: String, at index: Int) -> Int { + func tableView(_: UITableView, sectionForSectionIndexTitle _: String, at index: Int) -> Int { index } @@ -45,7 +45,7 @@ class PasswordNavigationDataSource: NSObject, UITableViewDataSource { return cell } - func numberOfSections(in tableView: UITableView) -> Int { + func numberOfSections(in _: UITableView) -> Int { filteredSections.count } diff --git a/passAutoFillExtension/Controllers/CredentialProviderViewController.swift b/passAutoFillExtension/Controllers/CredentialProviderViewController.swift index 098b320..b6f8039 100644 --- a/passAutoFillExtension/Controllers/CredentialProviderViewController.swift +++ b/passAutoFillExtension/Controllers/CredentialProviderViewController.swift @@ -11,7 +11,7 @@ import passKit class CredentialProviderViewController: ASCredentialProviderViewController { var passcodelock: PasscodeExtensionDisplay { - PasscodeExtensionDisplay(extensionContext: self.extensionContext) + PasscodeExtensionDisplay(extensionContext: extensionContext) } var embeddedNavigationController: UINavigationController { @@ -62,7 +62,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController { @objc private func cancel(_: AnyObject?) { - self.extensionContext.cancelRequest(withError: NSError(domain: "PassExtension", code: 0)) + extensionContext.cancelRequest(withError: NSError(domain: "PassExtension", code: 0)) } } diff --git a/passAutoFillExtension/Controllers/PasswordsViewController.swift b/passAutoFillExtension/Controllers/PasswordsViewController.swift index 8d1e3a8..517a5f8 100644 --- a/passAutoFillExtension/Controllers/PasswordsViewController.swift +++ b/passAutoFillExtension/Controllers/PasswordsViewController.swift @@ -6,9 +6,9 @@ // Copyright © 2020 Bob Sun. All rights reserved. // -import UIKit import AuthenticationServices import passKit +import UIKit class PasswordsViewController: UIViewController { @IBOutlet var tableView: UITableView! @@ -70,6 +70,6 @@ extension PasswordsViewController: UITableViewDelegate { tableView.deselectRow(at: indexPath, animated: true) let entry = dataSource.tableEntry(at: indexPath) UIImpactFeedbackGenerator(style: .medium).impactOccurred() - self.selectionDelegate?.selected(password: entry) + selectionDelegate?.selected(password: entry) } } diff --git a/passAutoFillExtension/Services/PasswordsTableDataSource.swift b/passAutoFillExtension/Services/PasswordsTableDataSource.swift index 20b462b..5d1e760 100644 --- a/passAutoFillExtension/Services/PasswordsTableDataSource.swift +++ b/passAutoFillExtension/Services/PasswordsTableDataSource.swift @@ -6,8 +6,8 @@ // Copyright © 2020 Bob Sun. All rights reserved. // -import UIKit import passKit +import UIKit class PasswordsTableDataSource: NSObject, UITableViewDataSource { var passwordTableEntries: [PasswordTableEntry] @@ -18,13 +18,13 @@ class PasswordsTableDataSource: NSObject, UITableViewDataSource { var showSuggestion: Bool = false init(entries: [PasswordTableEntry] = []) { - passwordTableEntries = entries - filteredPasswordsTableEntries = passwordTableEntries - suggestedPasswordsTableEntries = [] - otherPasswordsTableEntries = [] + self.passwordTableEntries = entries + self.filteredPasswordsTableEntries = passwordTableEntries + self.suggestedPasswordsTableEntries = [] + self.otherPasswordsTableEntries = [] } - func numberOfSections(in tableView: UITableView) -> Int { + func numberOfSections(in _: UITableView) -> Int { if !showSuggestion { return 1 } else { @@ -32,11 +32,11 @@ class PasswordsTableDataSource: NSObject, UITableViewDataSource { } } - func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + func tableView(_: UITableView, numberOfRowsInSection section: Int) -> Int { tableEntries(at: section).count } - func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + func tableView(_: UITableView, titleForHeaderInSection section: Int) -> String? { if suggestedPasswordsTableEntries.isEmpty { return nil } diff --git a/passExtension/Controllers/ExtensionViewController.swift b/passExtension/Controllers/ExtensionViewController.swift index 37ca552..75f5347 100644 --- a/passExtension/Controllers/ExtensionViewController.swift +++ b/passExtension/Controllers/ExtensionViewController.swift @@ -12,7 +12,7 @@ import passKit class ExtensionViewController: UIViewController { var passcodelock: PasscodeExtensionDisplay { - PasscodeExtensionDisplay(extensionContext: self.extensionContext!) + PasscodeExtensionDisplay(extensionContext: extensionContext!) } var embeddedNavigationController: UINavigationController { @@ -49,11 +49,11 @@ class ExtensionViewController: UIViewController { @objc private func cancel(_: AnyObject?) { - self.extensionContext?.completeRequest(returningItems: nil) + extensionContext?.completeRequest(returningItems: nil) } func prepareCredentialList() { - guard let attachments = self.extensionContext?.attachments else { + guard let attachments = extensionContext?.attachments else { return } @@ -90,7 +90,7 @@ extension ExtensionViewController: PasswordSelectionDelegate { case .fillBrowser: credentialProvider.provideCredentialsBrowser(with: password.passwordEntity.getPath()) default: - self.extensionContext?.completeRequest(returningItems: nil, completionHandler: nil) + extensionContext?.completeRequest(returningItems: nil, completionHandler: nil) } } } @@ -141,7 +141,7 @@ extension NSExtensionContext { extension NSItemProvider { /// Extracts the URL from the item provider func extractSearchText(completion: @escaping (String?) -> Void) { - self.loadItem(forTypeIdentifier: kUTTypeURL as String) { item, _ in + loadItem(forTypeIdentifier: kUTTypeURL as String) { item, _ in if let url = item as? NSURL { completion(url.host) } else { @@ -149,7 +149,7 @@ extension NSItemProvider { } } - self.loadItem(forTypeIdentifier: kUTTypePropertyList as String) { item, _ in + loadItem(forTypeIdentifier: kUTTypePropertyList as String) { item, _ in if let dict = item as? NSDictionary { if let result = dict[NSExtensionJavaScriptPreprocessingResultsKey] as? NSDictionary { completion(result.extractSearchText()) @@ -157,7 +157,7 @@ extension NSItemProvider { } } - self.loadItem(forTypeIdentifier: PassExtensionActions.findLogin) { item, _ in + loadItem(forTypeIdentifier: PassExtensionActions.findLogin) { item, _ in if let dict = item as? NSDictionary { let text = dict.extractSearchText() completion(text) diff --git a/passExtension/Services/CredentialProvider.swift b/passExtension/Services/CredentialProvider.swift index 0a17207..0365b17 100644 --- a/passExtension/Services/CredentialProvider.swift +++ b/passExtension/Services/CredentialProvider.swift @@ -6,9 +6,9 @@ // Copyright © 2021 Bob Sun. All rights reserved. // -import UIKit import MobileCoreServices import passKit +import UIKit class CredentialProvider { weak var extensionContext: NSExtensionContext? diff --git a/passKit/Crypto/PGPAgent.swift b/passKit/Crypto/PGPAgent.swift index b7dd8df..ff6cc99 100644 --- a/passKit/Crypto/PGPAgent.swift +++ b/passKit/Crypto/PGPAgent.swift @@ -98,8 +98,8 @@ public class PGPAgent { public func decrypt(encryptedData: Data, requestPGPKeyPassphrase: (String) -> String) throws -> Data? { // Remember the previous status and set the current status - let previousDecryptStatus = self.latestDecryptStatus - self.latestDecryptStatus = false + let previousDecryptStatus = latestDecryptStatus + latestDecryptStatus = false // Init keys. try checkAndInit() // Get the PGP key passphrase. @@ -114,7 +114,7 @@ public class PGPAgent { return nil } // The decryption step has succeed. - self.latestDecryptStatus = true + latestDecryptStatus = true return result }