Fix lint issues.

Mac/MainWindow/AddFeed/AddFeedController.swift

@@ -28,7 +28,7 @@ class AddFeedController: AddFeedWindowControllerDelegate {
 	private var addFeedWindowController: AddFeedWindowController?
 	private var foundFeedURLString: String?
 	private var titleFromFeed: String?
-	
+
 	init(hostWindow: NSWindow) {
 		self.hostWindow = hostWindow
 	}
@@ -62,11 +62,11 @@ class AddFeedController: AddFeedWindowControllerDelegate {
 		}
 
 		account.createFeed(url: url.absoluteString, name: title, container: container, validateFeed: true) { result in
-			
+
 			DispatchQueue.main.async {
 				self.endShowingProgress()
 			}
-			
+
 			switch result {
 			case .success(let feed):
 				NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.feed: feed])
@@ -82,9 +82,9 @@ class AddFeedController: AddFeedWindowControllerDelegate {
 					}
 				}
 			}
-			
+
 		}
-		
+
 		beginShowingProgress()
 	}
 
@@ -102,7 +102,7 @@ private extension AddFeedController {
 		}
 		return nil
 	}
-	
+
 	struct AccountAndFolderSpecifier {
 		let account: Account
 		let folder: Folder?
@@ -156,13 +156,12 @@ private extension AddFeedController {
 	// MARK: Progress
 
 	func beginShowingProgress() {
-		runIndeterminateProgressWithMessage(NSLocalizedString("Finding feed…", comment:"Feed finder"))
+		runIndeterminateProgressWithMessage(NSLocalizedString("Finding feed…", comment: "Feed finder"))
 	}
-	
+
 	func endShowingProgress() {
 		stopIndeterminateProgress()
 		hostWindow.makeKeyAndOrderFront(self)
 	}
-	
-}
 
+}

Mac/MainWindow/AddFeed/AddFeedWindowController.swift

@@ -16,8 +16,8 @@ protocol AddFeedWindowControllerDelegate: AnyObject {
 	func addFeedWindowControllerUserDidCancel(_: AddFeedWindowController)
 }
 
-//protocol AddFeedWindowController {
+// protocol AddFeedWindowController {
 //
 //	var window: NSWindow? { get }
 //	func runSheetOnWindow(_ hostWindow: NSWindow)
-//}
+// }

Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift

@@ -12,7 +12,7 @@ import RSTree
 import Articles
 import Account
 
-final class AddFeedWindowController : NSWindowController {
+final class AddFeedWindowController: NSWindowController {
 
     @IBOutlet var urlTextField: NSTextField!
 	@IBOutlet var nameTextField: NSTextField!
@@ -34,7 +34,7 @@ final class AddFeedWindowController : NSWindowController {
 		}
 		return s
 	}
-	
+
     var hostWindow: NSWindow!
 
 	convenience init(urlString: String?, name: String?, account: Account?, folder: Folder?, folderTreeController: TreeController, delegate: AddFeedWindowControllerDelegate?) {
@@ -46,9 +46,9 @@ final class AddFeedWindowController : NSWindowController {
 		self.delegate = delegate
 		self.folderTreeController = folderTreeController
 	}
-	
+
     func runSheetOnWindow(_ hostWindow: NSWindow) {
-		hostWindow.beginSheet(window!) { (returnCode: NSApplication.ModalResponse) -> Void in
+		hostWindow.beginSheet(window!) { (_: NSApplication.ModalResponse) in
 		}
     }
 
@@ -61,7 +61,7 @@ final class AddFeedWindowController : NSWindowController {
 		}
 
 		folderPopupButton.menu = FolderTreeMenu.createFolderPopupMenu(with: folderTreeController.rootNode)
-		
+
 		if let account = initialAccount {
 			FolderTreeMenu.select(account: account, folder: initialFolder, in: folderPopupButton)
 		} else if let container = AddFeedDefaultContainer.defaultContainer {
@@ -73,41 +73,41 @@ final class AddFeedWindowController : NSWindowController {
 				}
 			}
 		}
-		
+
 		updateUI()
 	}
 
     // MARK: Actions
-    
+
     @IBAction func cancel(_ sender: Any?) {
 		cancelSheet()
     }
-    
+
     @IBAction func addFeed(_ sender: Any?) {
 		let urlString = urlTextField.stringValue
 		let normalizedURLString = urlString.normalizedURL
 
 		if normalizedURLString.isEmpty {
 			cancelSheet()
-			return;
+			return
 		}
 		guard let url = URL(string: normalizedURLString) else {
 			cancelSheet()
 			return
 		}
-		
+
 		guard let container = selectedContainer() else { return }
 		AddFeedDefaultContainer.saveDefaultContainer(container)
 
 		delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, container: container)
-		
+
     }
 
 	@IBAction func localShowFeedList(_ sender: Any?) {
 		NSApplication.shared.sendAction(NSSelectorFromString("showFeedList:"), to: nil, from: sender)
 		hostWindow.endSheet(window!, returnCode: NSApplication.ModalResponse.continue)
 	}
-	
+
 	// MARK: NSTextFieldDelegate
 
 	@objc func controlTextDidEndEditing(_ obj: Notification) {
@@ -117,7 +117,7 @@ final class AddFeedWindowController : NSWindowController {
 	@objc func controlTextDidChange(_ obj: Notification) {
 		updateUI()
 	}
-	
+
 	private func updateUI() {
 		addButton.isEnabled = urlTextField.stringValue.mayBeURL && selectedContainer() != nil
 	}

Mac/MainWindow/AddFeed/FolderTreeMenu.swift

@@ -14,34 +14,34 @@ import Account
 class FolderTreeMenu {
 
 	static func createFolderPopupMenu(with rootNode: Node, restrictToSpecialAccounts: Bool = false) -> NSMenu {
-		
+
 		let menu = NSMenu(title: "Folders")
 		menu.autoenablesItems = false
-		
+
 		for childNode in rootNode.childNodes {
-			
+
 			guard let account = childNode.representedObject as? Account else {
 				continue
 			}
-			
+
 			if restrictToSpecialAccounts && !(account.type == .onMyMac || account.type == .cloudKit) {
 				continue
 			}
-			
+
 			let menuItem = NSMenuItem(title: account.nameForDisplay, action: nil, keyEquivalent: "")
 			menuItem.representedObject = childNode.representedObject
-			
+
 			if account.behaviors.contains(.disallowFeedInRootFolder) {
 				menuItem.isEnabled = false
 			}
-			
+
 			menu.addItem(menuItem)
 
 			let childNodes = childNode.childNodes
 			addFolderItemsToMenuWithNodes(menu: menu, nodes: childNodes, indentationLevel: 1)
-			
+
 		}
-		
+
 		return menu
 	}
 
@@ -61,21 +61,21 @@ class FolderTreeMenu {
 	}
 
 	private static func addFolderItemsToMenuWithNodes(menu: NSMenu, nodes: [Node], indentationLevel: Int) {
-		
+
 		for oneNode in nodes {
 
 			if let nameProvider = oneNode.representedObject as? DisplayNameProvider {
-				
+
 				let menuItem = NSMenuItem(title: nameProvider.nameForDisplay, action: nil, keyEquivalent: "")
 				menuItem.indentationLevel = indentationLevel
 				menuItem.representedObject = oneNode.representedObject
 				menu.addItem(menuItem)
-				
+
 				if oneNode.numberOfChildNodes > 0 {
 					addFolderItemsToMenuWithNodes(menu: menu, nodes: oneNode.childNodes, indentationLevel: indentationLevel + 1)
 				}
 			}
 		}
 	}
-	
+
 }