Wrap long lines

Author: mattrubin

Authenticator/Source/RootViewController.swift

@@ -213,10 +213,12 @@ extension RootViewController: UINavigationControllerDelegate {
             viewController is InfoListViewController {
             switch menu.child {
             case .info:
-                // If the view model modal state has an Info.ViewModel and the just-shown view controller is an info list,
-                // then the user has popped the info view controller.
+                // If the current modal state is the menu with an Info child, and the just-shown view controller is
+                // an InfoList, then the user has popped the Info view controller.
                 dispatchAction(.dismissInfo)
             case .displayOptions:
+                // If the current modal state is the menu with a DisplayOptions child, and the just-shown view
+                // controller is an InfoList, then the user has popped the DisplayOptions view controller.
                 dispatchAction(.dismissDisplayOptions)
             default:
                 break

Authenticator/Source/TokenList.swift

@@ -38,7 +38,10 @@ struct TokenList: Component {
     func viewModel(with persistentTokens: [PersistentToken], at displayTime: DisplayTime, digitGroupSize: Int) -> (viewModel: TokenListViewModel, nextRefreshTime: Date) {
         let isFiltering = !(filter ?? "").isEmpty
         let rowModels = filteredTokens(from: persistentTokens).map({
-            TokenRowModel(persistentToken: $0, displayTime: displayTime, digitGroupSize: digitGroupSize, canReorder: !isFiltering)
+            TokenRowModel(persistentToken: $0,
+                          displayTime: displayTime,
+                          digitGroupSize: digitGroupSize,
+                          canReorder: !isFiltering)
         })
 
         let lastRefreshTime = persistentTokens.reduce(.distantPast) { (lastRefreshTime, persistentToken) in

AuthenticatorTests/RootTests.swift

@@ -204,8 +204,12 @@ class RootTests: XCTestCase {
     func testEventTokenFormSucceeded() {
         var root = Root(deviceCanScan: false)
 
+        func modalViewModel(from root: Root) -> RootViewModel.ModalViewModel {
+            return root.viewModel(with: [], at: displayTime, digitGroupSize: defaultDigitGroupSize).viewModel.modal
+        }
+
         // Ensure the initial view model has no modal.
-        guard case .none = root.viewModel(with: [], at: displayTime, digitGroupSize: defaultDigitGroupSize).viewModel.modal else {
+        guard case .none = modalViewModel(from: root) else {
             XCTFail("The initial view model should have no modal.")
             return
         }
@@ -219,7 +223,7 @@ class RootTests: XCTestCase {
         }
 
         // Ensure the view model now has a modal entry form.
-        guard case .entryForm = root.viewModel(with: [], at: displayTime, digitGroupSize: defaultDigitGroupSize).viewModel.modal else {
+        guard case .entryForm = modalViewModel(from: root) else {
             XCTFail("The view model should have a modal entry form.")
             return
         }
@@ -229,7 +233,7 @@ class RootTests: XCTestCase {
         XCTAssertNil(effect)
 
         // Ensure the token entry form hides on success.
-        guard case .none = root.viewModel(with: [], at: displayTime, digitGroupSize: defaultDigitGroupSize).viewModel.modal else {
+        guard case .none = modalViewModel(from: root) else {
             XCTFail("The final view model should have no modal.")
             return
         }

AuthenticatorTests/TokenListTests.swift

@@ -40,7 +40,9 @@ class TokenListTests: XCTestCase {
         ])
         let effect = tokenList.update(with: .filter("goo"))
 
-        let (viewModel, _) = tokenList.viewModel(with: persistentTokens, at: displayTime, digitGroupSize: defaultDigitGroupSize)
+        let (viewModel, _) = tokenList.viewModel(with: persistentTokens,
+                                                 at: displayTime,
+                                                 digitGroupSize: defaultDigitGroupSize)
         let filteredIssuers = viewModel.rowModels.map { $0.issuer }
 
         XCTAssertNil(effect)
@@ -57,7 +59,9 @@ class TokenListTests: XCTestCase {
             ("Service", "username"),
         ])
         let effect = tokenList.update(with: .filter("Service"))
-        let (viewModel, _) = tokenList.viewModel(with: persistentTokens, at: displayTime, digitGroupSize: defaultDigitGroupSize)
+        let (viewModel, _) = tokenList.viewModel(with: persistentTokens,
+                                                 at: displayTime,
+                                                 digitGroupSize: defaultDigitGroupSize)
 
         XCTAssertNil(effect)
         XCTAssertTrue(viewModel.isFiltering)

AuthenticatorTests/TokenListViewControllerTest.swift

@@ -55,7 +55,9 @@ class TokenListViewControllerTest: XCTestCase {
         let persistentTokens = mockPersistentTokens([
             ("Service", "email@example.com"),
         ])
-        let (updatedViewModel, _) = tokenList.viewModel(with: persistentTokens, at: displayTime, digitGroupSize: defaultDigitGroupSize)
+        let (updatedViewModel, _) = tokenList.viewModel(with: persistentTokens,
+                                                        at: displayTime,
+                                                        digitGroupSize: defaultDigitGroupSize)
         controller.update(with: updatedViewModel)
 
         // Check the table view.
@@ -72,7 +74,9 @@ class TokenListViewControllerTest: XCTestCase {
     func testUpdatesExistingToken() {
         // Set up a view controller with a mock table view.
         let initialPersistentToken = mockPersistentToken(name: "account@example.com", issuer: "Issuer")
-        let (initialTokenListViewModel, _) = tokenList.viewModel(with: [initialPersistentToken], at: displayTime, digitGroupSize: defaultDigitGroupSize)
+        let (initialTokenListViewModel, _) = tokenList.viewModel(with: [initialPersistentToken],
+                                                                 at: displayTime,
+                                                                 digitGroupSize: defaultDigitGroupSize)
         let controller = TokenListViewController(viewModel: initialTokenListViewModel, dispatchAction: { _ in })
         let tableView = MockTableView()
         controller.tableView = tableView
@@ -82,7 +86,9 @@ class TokenListViewControllerTest: XCTestCase {
 
         // Update the view controller.
         let updatedPersistentToken = initialPersistentToken.updated(with: mockToken(name: "name", issuer: "issuer"))
-        let (updatedTokenListViewModel, _) = tokenList.viewModel(with: [updatedPersistentToken], at: displayTime, digitGroupSize: defaultDigitGroupSize)
+        let (updatedTokenListViewModel, _) = tokenList.viewModel(with: [updatedPersistentToken],
+                                                                 at: displayTime,
+                                                                 digitGroupSize: defaultDigitGroupSize)
         controller.update(with: updatedTokenListViewModel)
 
         // Check the changes to the table view.
@@ -104,7 +110,9 @@ class TokenListViewControllerTest: XCTestCase {
             ("Service", "example@google.com"),
             ("Service", "username"),
         ])
-        let (viewModel, _) = tokenList.viewModel(with: persistentTokens, at: displayTime, digitGroupSize: defaultDigitGroupSize)
+        let (viewModel, _) = tokenList.viewModel(with: persistentTokens,
+                                                 at: displayTime,
+                                                 digitGroupSize: defaultDigitGroupSize)
         let controller = TokenListViewController(viewModel: viewModel, dispatchAction: { _ in })
 
         // Check that the table view contains the expected cells.