Fix lint issues.

Mac/MainWindow/Sidebar/Cell/SidebarCell.swift

@@ -11,7 +11,7 @@ import RSCore
 import Account
 import RSTree
 
-class SidebarCell : NSTableCellView {
+class SidebarCell: NSTableCellView {
 
 	var iconImage: IconImage? {
 		didSet {
@@ -73,14 +73,14 @@ class SidebarCell : NSTableCellView {
 	}()
 
 	private let faviconImageView = IconView()
-	private let unreadCountView = UnreadCountView(frame: NSZeroRect)
+	private let unreadCountView = UnreadCountView(frame: NSRect.zero)
 
 	override var backgroundStyle: NSView.BackgroundStyle {
 		didSet {
 			updateFaviconImage()
 		}
 	}
-	
+
 	override var isFlipped: Bool {
 		return true
 	}
@@ -89,8 +89,8 @@ class SidebarCell : NSTableCellView {
 		super.init(frame: frameRect)
 		commonInit()
 	}
-	
-	required init?(coder: NSCoder) {		
+
+	required init?(coder: NSCoder) {
 		super.init(coder: coder)
 		commonInit()
 	}
@@ -99,7 +99,7 @@ class SidebarCell : NSTableCellView {
 		if let cellAppearance = cellAppearance {
 			titleView.font = cellAppearance.textFieldFont
 		}
-		resizeSubviews(withOldSize: NSZeroSize)
+		resizeSubviews(withOldSize: NSSize.zero)
 	}
 
 	override func resizeSubviews(withOldSize oldSize: NSSize) {
@@ -138,10 +138,10 @@ private extension SidebarCell {
 		titleView.setFrame(ifNotEqualTo: layout.titleRect)
 		unreadCountView.setFrame(ifNotEqualTo: layout.unreadCountRect)
 	}
-	
+
 	func updateFaviconImage() {
 		var updatedIconImage = iconImage
-		
+
 		if let iconImage = iconImage, iconImage.isSymbol {
 			if backgroundStyle != .normal {
 				let image = iconImage.image.tinted(with: .white)
@@ -163,6 +163,5 @@ private extension SidebarCell {
 			faviconImageView.iconImage = nil
 		}
 	}
-	
-}
 
+}

Mac/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift

@@ -28,8 +28,7 @@ struct SidebarCellAppearance: Equatable {
 			imageSize = CGSize(width: 19, height: 19)
 			textFieldFontSize = 13
 		}
-		
+
 		self.textFieldFont = NSFont.systemFont(ofSize: textFieldFontSize)
 	}
 }
-

Mac/MainWindow/Sidebar/Cell/SidebarCellLayout.swift

@@ -16,7 +16,7 @@ struct SidebarCellLayout {
 	let faviconRect: CGRect
 	let titleRect: CGRect
 	let unreadCountRect: CGRect
-	
+
 	init(appearance: SidebarCellAppearance, cellSize: NSSize, shouldShowImage: Bool, textField: NSTextField, unreadCountView: UnreadCountView) {
 
 		let bounds = NSRect(x: 0.0, y: 0.0, width: floor(cellSize.width), height: floor(cellSize.height))
@@ -32,7 +32,7 @@ struct SidebarCellLayout {
 
 		var rTextField = NSRect(x: 0.0, y: 0.0, width: textFieldSize.width, height: textFieldSize.height)
 		if shouldShowImage {
-			rTextField.origin.x = NSMaxX(rFavicon) + appearance.imageMarginRight
+			rTextField.origin.x = rFavicon.maxX + appearance.imageMarginRight
 		}
 		rTextField = rTextField.centeredVertically(in: bounds)
 
@@ -42,17 +42,17 @@ struct SidebarCellLayout {
 		var rUnread = NSRect.zero
 		if !unreadCountIsHidden {
 			rUnread.size = unreadCountSize
-			rUnread.origin.x = NSMaxX(bounds) - unreadCountSize.width
+			rUnread.origin.x = bounds.maxX - unreadCountSize.width
 			rUnread = rUnread.centeredVertically(in: bounds)
-			let textFieldMaxX = NSMinX(rUnread) - appearance.unreadCountMarginLeft
-			if NSMaxX(rTextField) > textFieldMaxX {
-				rTextField.size.width = textFieldMaxX - NSMinX(rTextField)
+			let textFieldMaxX = rUnread.minX - appearance.unreadCountMarginLeft
+			if rTextField.maxX > textFieldMaxX {
+				rTextField.size.width = textFieldMaxX - rTextField.minX
 			}
 		}
 		self.unreadCountRect = rUnread
 
-		if NSMaxX(rTextField) > NSMaxX(bounds) {
-			rTextField.size.width = NSMaxX(bounds) - NSMinX(rTextField)
+		if rTextField.maxX > bounds.maxX {
+			rTextField.size.width = bounds.maxX - rTextField.minX
 		}
 		self.titleRect = rTextField
 	}

Mac/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift

@@ -23,7 +23,7 @@ import RSCore
 
 		super.init()
 	}
-	
+
 	func keydown(_ event: NSEvent, in view: NSView) -> Bool {
 
 		if MainWindowKeyboardHandler.shared.keydown(event, in: view) {
@@ -39,4 +39,3 @@ import RSCore
 		return true
 	}
 }
-

Mac/MainWindow/Sidebar/PasteboardFeed.swift

@@ -60,11 +60,11 @@ struct PasteboardFeed: Hashable {
 		let feedID = dictionary[Key.feedID]
 		let editedName = dictionary[Key.editedName]
 
-		var accountType: AccountType? = nil
+		var accountType: AccountType?
 		if let accountTypeString = dictionary[Key.accountType], let accountTypeInt = Int(accountTypeString) {
 			accountType = AccountType(rawValue: accountTypeInt)
 		}
-		
+
 		self.init(url: url, feedID: feedID, homePageURL: homePageURL, name: name, editedName: editedName, accountID: accountID, accountType: accountType)
 	}
 
@@ -72,8 +72,7 @@ struct PasteboardFeed: Hashable {
 		var pasteboardType: NSPasteboard.PasteboardType?
 		if pasteboardItem.types.contains(FeedPasteboardWriter.feedUTIInternalType) {
 			pasteboardType = FeedPasteboardWriter.feedUTIInternalType
-		}
-		else if pasteboardItem.types.contains(FeedPasteboardWriter.feedUTIType) {
+		} else if pasteboardItem.types.contains(FeedPasteboardWriter.feedUTIType) {
 			pasteboardType = FeedPasteboardWriter.feedUTIType
 		}
 		if let foundType = pasteboardType {
@@ -87,8 +86,7 @@ struct PasteboardFeed: Hashable {
 		// Check for URL or a string that may be a URL.
 		if pasteboardItem.types.contains(.URL) {
 			pasteboardType = .URL
-		}
-		else if pasteboardItem.types.contains(.string) {
+		} else if pasteboardItem.types.contains(.string) {
 			pasteboardType = .string
 		}
 		if let foundType = pasteboardType {
@@ -161,7 +159,6 @@ extension Feed: @retroactive PasteboardWriterOwner {
 	static let feedUTIInternal = "com.ranchero.NetNewsWire-Evergreen.internal.feed"
 	static let feedUTIInternalType = NSPasteboard.PasteboardType(rawValue: feedUTIInternal)
 
-
 	init(feed: Feed) {
 		self.feed = feed
 	}

Mac/MainWindow/Sidebar/PasteboardFolder.swift

@@ -13,7 +13,7 @@ import RSCore
 typealias PasteboardFolderDictionary = [String: String]
 
 struct PasteboardFolder: Hashable {
-	
+
 	private struct Key {
 		static let name = "name"
 		// Internal
@@ -21,30 +21,29 @@ struct PasteboardFolder: Hashable {
 		static let accountID = "accountID"
 	}
 
-	
 	let name: String
 	let folderID: String?
 	let accountID: String?
-	
+
 	init(name: String, folderID: String?, accountID: String?) {
 		self.name = name
 		self.folderID = folderID
 		self.accountID = accountID
 	}
-	
+
 	// MARK: - Reading
-	
+
 	init?(dictionary: PasteboardFolderDictionary) {
 		guard let name = dictionary[Key.name] else {
 			return nil
 		}
-		
+
 		let folderID = dictionary[Key.folderID]
 		let accountID = dictionary[Key.accountID]
-		
+
 		self.init(name: name, folderID: folderID, accountID: accountID)
 	}
-	
+
 	init?(pasteboardItem: NSPasteboardItem) {
 		var pasteboardType: NSPasteboard.PasteboardType?
 		if pasteboardItem.types.contains(FolderPasteboardWriter.folderUTIInternalType) {
@@ -57,10 +56,10 @@ struct PasteboardFolder: Hashable {
 				return
 			}
 		}
-		
+
 		return nil
 	}
-	
+
 	static func pasteboardFolders(with pasteboard: NSPasteboard) -> Set<PasteboardFolder>? {
 		guard let items = pasteboard.pasteboardItems else {
 			return nil
@@ -68,9 +67,9 @@ struct PasteboardFolder: Hashable {
 		let folders = items.compactMap { PasteboardFolder(pasteboardItem: $0) }
 		return folders.isEmpty ? nil : Set(folders)
 	}
-	
+
 	// MARK: - Writing
-	
+
 	func internalDictionary() -> PasteboardFolderDictionary {
 		var d = PasteboardFeedDictionary()
 		d[PasteboardFolder.Key.name] = name
@@ -130,7 +129,7 @@ private extension FolderPasteboardWriter {
 	var pasteboardFolder: PasteboardFolder {
 		return PasteboardFolder(name: folder.name ?? "", folderID: String(folder.folderID), accountID: folder.account?.accountID)
 	}
-	
+
 	var internalDictionary: PasteboardFeedDictionary {
 		return pasteboardFolder.internalDictionary()
 	}

Mac/MainWindow/Sidebar/Renaming/RenameWindowController.swift

@@ -18,7 +18,7 @@ final class RenameWindowController: NSWindowController {
 	@IBOutlet var renamePrompt: NSTextField!
 	@IBOutlet var newTitleTextField: NSTextField!
 	@IBOutlet var renameButton: NSButton!
-	
+
 	private var originalTitle: String?
 	private var representedObject: Any?
 	private var delegate: RenameWindowControllerDelegate?

Mac/MainWindow/Sidebar/SidebarDeleteItemsAlert.swift

@@ -11,12 +11,12 @@ import RSTree
 import Account
 
 enum SidebarDeleteItemsAlert {
-	
+
 	/// Builds a delete confirmation dialog for the supplied nodes
 	static func build(_ nodes: [Node]) -> NSAlert {
 		let alert = NSAlert()
 		alert.alertStyle = .warning
-		
+
 		if nodes.count == 1 {
 			if let folder = nodes.first?.representedObject as? Folder {
 				alert.messageText = NSLocalizedString("Delete Folder", comment: "Delete Folder")
@@ -32,11 +32,11 @@ enum SidebarDeleteItemsAlert {
 			let localizedInformativeText = NSLocalizedString("Are you sure you want to delete the %d selected items?", comment: "Items delete text")
 			alert.informativeText = NSString.localizedStringWithFormat(localizedInformativeText as NSString, nodes.count) as String
 		}
-		
+
 		alert.addButton(withTitle: NSLocalizedString("Delete", comment: "Delete Account"))
 		alert.addButton(withTitle: NSLocalizedString("Cancel", comment: "Cancel Delete Account"))
-			
+
 		return alert
 	}
-	
+
 }

Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift

@@ -16,7 +16,7 @@ import Account
 
 	let treeController: TreeController
 	static let dragOperationNone = NSDragOperation(rawValue: 0)
-	private var draggedNodes: Set<Node>? = nil
+	private var draggedNodes: Set<Node>?
 
 	init(treeController: TreeController) {
 		self.treeController = treeController
@@ -56,7 +56,7 @@ import Account
 	func outlineView(_ outlineView: NSOutlineView, validateDrop info: NSDraggingInfo, proposedItem item: Any?, proposedChildIndex index: Int) -> NSDragOperation {
 		let draggedFolders = PasteboardFolder.pasteboardFolders(with: info.draggingPasteboard)
 		let draggedFeeds = PasteboardFeed.pasteboardFeeds(with: info.draggingPasteboard)
-		if (draggedFolders == nil && draggedFeeds == nil) || (draggedFolders != nil && draggedFeeds != nil)  {
+		if (draggedFolders == nil && draggedFeeds == nil) || (draggedFolders != nil && draggedFeeds != nil) {
 			return SidebarOutlineDataSource.dragOperationNone
 		}
 		let parentNode = nodeForItem(item)
@@ -68,7 +68,7 @@ import Account
 				return validateLocalFoldersDrop(outlineView, draggedFolders, parentNode, index)
 			}
 		}
-		
+
 		if let draggedFeeds = draggedFeeds {
 			let contentsType = draggedFeedContentsType(draggedFeeds)
 
@@ -88,11 +88,11 @@ import Account
 
 		return SidebarOutlineDataSource.dragOperationNone
 	}
-	
+
 	func outlineView(_ outlineView: NSOutlineView, acceptDrop info: NSDraggingInfo, item: Any?, childIndex index: Int) -> Bool {
 		let draggedFolders = PasteboardFolder.pasteboardFolders(with: info.draggingPasteboard)
 		let draggedFeeds = PasteboardFeed.pasteboardFeeds(with: info.draggingPasteboard)
-		if (draggedFolders == nil && draggedFeeds == nil) || (draggedFolders != nil && draggedFeeds != nil)  {
+		if (draggedFolders == nil && draggedFeeds == nil) || (draggedFolders != nil && draggedFeeds != nil) {
 			return false
 		}
 		let parentNode = nodeForItem(item)
@@ -100,7 +100,7 @@ import Account
 		if let draggedFolders = draggedFolders {
 			return acceptLocalFoldersDrop(outlineView, draggedFolders, parentNode, index)
 		}
-		
+
 		if let draggedFeeds = draggedFeeds {
 			let contentsType = draggedFeedContentsType(draggedFeeds)
 
@@ -116,7 +116,7 @@ import Account
 				return false
 			}
 		}
-		
+
 		return false
 	}
 }
@@ -159,8 +159,7 @@ private extension SidebarOutlineDataSource {
 		for feed in draggedFeeds {
 			if feed.isLocalFeed {
 				hasLocalFeed = true
-			}
-			else {
+			} else {
 				hasNonLocalFeed = true
 			}
 			if hasLocalFeed && hasNonLocalFeed {
@@ -228,7 +227,7 @@ private extension SidebarOutlineDataSource {
 		}
 		return localDragOperation(parentNode: parentNode)
 	}
-	
+
 	func localDragOperation(parentNode: Node) -> NSDragOperation {
 		guard let firstDraggedNode = draggedNodes?.first else { return .move }
 		if sameAccount(firstDraggedNode, parentNode) {
@@ -275,7 +274,7 @@ private extension SidebarOutlineDataSource {
 		}
 		return false
 	}
-	
+
 	func validateLocalFolderDrop(_ outlineView: NSOutlineView, _ draggedFolder: PasteboardFolder, _ parentNode: Node, _ index: Int) -> NSDragOperation {
 		guard let dropAccount = parentNode.representedObject as? Account, dropAccount.accountID != draggedFolder.accountID else {
 			return SidebarOutlineDataSource.dragOperationNone
@@ -289,7 +288,7 @@ private extension SidebarOutlineDataSource {
 		}
 		return localDragOperation(parentNode: parentNode)
 	}
-	
+
 	func validateLocalFoldersDrop(_ outlineView: NSOutlineView, _ draggedFolders: Set<PasteboardFolder>, _ parentNode: Node, _ index: Int) -> NSDragOperation {
 		guard let dropAccount = parentNode.representedObject as? Account else {
 			return SidebarOutlineDataSource.dragOperationNone
@@ -307,12 +306,12 @@ private extension SidebarOutlineDataSource {
 		}
 		return localDragOperation(parentNode: parentNode)
 	}
-	
+
 	func copyFeedInAccount(node: Node, to parentNode: Node) {
 		guard let feed = node.representedObject as? Feed, let destination = parentNode.representedObject as? Container else {
 			return
 		}
-		
+
 		destination.account?.addFeed(feed, to: destination) { result in
 			switch result {
 			case .success:
@@ -348,7 +347,7 @@ private extension SidebarOutlineDataSource {
 			let destinationContainer = parentNode.representedObject as? Container else {
 			return
 		}
-		
+
 		if let existingFeed = destinationAccount.existingFeed(withURL: feed.url) {
 			destinationAccount.addFeed(existingFeed, to: destinationContainer) { result in
 				switch result {
@@ -386,7 +385,7 @@ private extension SidebarOutlineDataSource {
 				copyFeedBetweenAccounts(node: node, to: parentNode)
 			}
 		}
-		
+
 		return true
 	}
 
@@ -463,13 +462,13 @@ private extension SidebarOutlineDataSource {
 		guard let draggedNodes = draggedNodes else {
 			return false
 		}
-		
+
 		for node in draggedNodes {
 			if !sameAccount(node, parentNode) {
 				copyFolderBetweenAccounts(node: node, to: parentNode)
 			}
 		}
-		
+
 		return true
 	}
 
@@ -486,7 +485,7 @@ private extension SidebarOutlineDataSource {
 			let folder = parentNode.representedObject as? Folder
 			appDelegate.addFeed(draggedFeed.url, name: draggedFeed.editedName ?? draggedFeed.name, account: account, folder: folder)
 		}
-		
+
 		return true
 	}
 
@@ -505,7 +504,7 @@ private extension SidebarOutlineDataSource {
 		}
 		return false
 	}
-	
+
 	func sameAccount(_ node: Node, _ parentNode: Node) -> Bool {
 		if let accountID = nodeAccountID(node), let parentAccountID = nodeAccountID(parentNode) {
 			if accountID == parentAccountID {
@@ -514,7 +513,7 @@ private extension SidebarOutlineDataSource {
 		}
 		return false
 	}
-	
+
 	func nodeAccount(_ node: Node) -> Account? {
 		if let account = node.representedObject as? Account {
 			return account
@@ -527,11 +526,11 @@ private extension SidebarOutlineDataSource {
 		}
 
 	}
-	
+
 	func nodeAccountID(_ node: Node) -> String? {
 		return nodeAccount(node)?.accountID
 	}
-	
+
 	func nodeHasChildRepresentingAnyDraggedFeed(_ parentNode: Node, _ draggedFeeds: Set<PasteboardFeed>) -> Bool {
 		for node in parentNode.childNodes {
 			if nodeRepresentsAnyDraggedFeed(node, draggedFeeds) {
@@ -544,7 +543,7 @@ private extension SidebarOutlineDataSource {
 	func violatesAccountSpecificBehavior(_ dropTargetNode: Node, _ draggedFeed: PasteboardFeed) -> Bool {
 		return violatesAccountSpecificBehavior(dropTargetNode, Set([draggedFeed]))
 	}
-	
+
 	func violatesAccountSpecificBehavior(_ dropTargetNode: Node, _ draggedFeeds: Set<PasteboardFeed>) -> Bool {
 		if violatesDisallowFeedInRootFolder(dropTargetNode) {
 			return true
@@ -553,23 +552,23 @@ private extension SidebarOutlineDataSource {
 		if violatesDisallowFeedCopyInRootFolder(dropTargetNode, draggedFeeds) {
 			return true
 		}
-		
+
 		if violatesDisallowFeedInMultipleFolders(dropTargetNode, draggedFeeds) {
 			return true
 		}
-		
+
 		return false
 	}
-	
+
 	func violatesDisallowFeedInRootFolder(_ dropTargetNode: Node) -> Bool {
 		guard let parentAccount = nodeAccount(dropTargetNode), parentAccount.behaviors.contains(.disallowFeedInRootFolder) else {
 			return false
 		}
-		
+
 		if dropTargetNode.representedObject is Account {
 			return true
 		}
-		
+
 		return false
 	}
 
@@ -577,17 +576,17 @@ private extension SidebarOutlineDataSource {
 		guard let dropTargetAccount = nodeAccount(dropTargetNode), dropTargetAccount.behaviors.contains(.disallowFeedCopyInRootFolder) else {
 			return false
 		}
-		
+
 		for draggedFeed in draggedFeeds {
 			if dropTargetAccount.accountID != draggedFeed.accountID {
 				return false
 			}
 		}
-		
+
 		if dropTargetNode.representedObject is Account && (NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false) {
 			return true
 		}
-		
+
 		return false
 	}
 
@@ -595,7 +594,7 @@ private extension SidebarOutlineDataSource {
 		guard let dropTargetAccount = nodeAccount(dropTargetNode), dropTargetAccount.behaviors.contains(.disallowFeedInMultipleFolders) else {
 			return false
 		}
-		
+
 		for draggedFeed in draggedFeeds {
 			if dropTargetAccount.accountID == draggedFeed.accountID {
 				if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false {
@@ -607,7 +606,7 @@ private extension SidebarOutlineDataSource {
 				}
 			}
 		}
-		
+
 		return false
 	}
 
@@ -627,7 +626,7 @@ private extension SidebarOutlineDataSource {
 		let draggedFolderNode = Node(representedObject: draggedFolderWrapper, parent: nil)
 		draggedFolderNode.canHaveChildNodes = true
 		let nodes = parentNode.childNodes + [draggedFolderNode]
-		
+
 		// Revisit if the tree controller can ever be sorted in some other way.
 		let sortedNodes = nodes.sortedAlphabeticallyWithFoldersAtEnd()
 		let index = sortedNodes.firstIndex(of: draggedFolderNode)!
@@ -648,12 +647,12 @@ final class PasteboardFeedObjectWrapper: DisplayNameProvider {
 }
 
 final class PasteboardFolderObjectWrapper: DisplayNameProvider {
-	
+
 	var nameForDisplay: String {
 		return pasteboardFolder.name
 	}
 	let pasteboardFolder: PasteboardFolder
-	
+
 	init(pasteboardFolder: PasteboardFolder) {
 		self.pasteboardFolder = pasteboardFolder
 	}

Mac/MainWindow/Sidebar/SidebarOutlineView.swift

@@ -10,7 +10,7 @@ import AppKit
 import RSCore
 import RSTree
 
-class SidebarOutlineView : NSOutlineView {
+class SidebarOutlineView: NSOutlineView {
 
 	@IBOutlet var keyboardDelegate: KeyboardDelegate!
 
@@ -40,15 +40,15 @@ class SidebarOutlineView : NSOutlineView {
 	// MARK: NSView
 
 	override func viewWillStartLiveResize() {
-		
+
 		if let scrollView = self.enclosingScrollView {
 			scrollView.hasVerticalScroller = false
 		}
 		super.viewWillStartLiveResize()
 	}
-	
+
 	override func viewDidEndLiveResize() {
-		
+
 		if let scrollView = self.enclosingScrollView {
 			scrollView.hasVerticalScroller = true
 		}

Mac/MainWindow/Sidebar/SidebarStatusBarView.swift

@@ -32,8 +32,8 @@ final class SidebarStatusBarView: NSView {
 
 		let progressLabelFontSize = progressLabel.font?.pointSize ?? 13.0
 		progressLabel.font = NSFont.monospacedDigitSystemFont(ofSize: progressLabelFontSize, weight: NSFont.Weight.regular)
-		progressLabel.stringValue = ""		
-		
+		progressLabel.stringValue = ""
+
 		NotificationCenter.default.addObserver(self, selector: #selector(progressDidChange(_:)), name: .combinedRefreshProgressDidChange, object: nil)
 	}
 

Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift

@@ -68,7 +68,7 @@ extension SidebarViewController {
 		guard let menuItem = sender as? NSMenuItem, let objects = menuItem.representedObject as? [Any] else {
 			return
 		}
-		
+
 		let articles = unreadArticles(for: objects)
 		guard let undoManager = undoManager, let markReadCommand = MarkStatusCommand(initialArticles: Array(articles), markingRead: true, undoManager: undoManager) else {
 			return
@@ -80,7 +80,7 @@ extension SidebarViewController {
 		guard let menuItem = sender as? NSMenuItem, let objects = menuItem.representedObject as? [AnyObject] else {
 			return
 		}
-		
+
 		let nodes = objects.compactMap { treeController.nodeInTreeRepresentingObject($0) }
 
 		let alert = SidebarDeleteItemsAlert.build(nodes)
@@ -103,7 +103,7 @@ extension SidebarViewController {
 		}
 		window.beginSheet(renameSheet)
 	}
-	
+
 	@objc func toggleNotificationsFromContextMenu(_ sender: Any?) {
 		guard let item = sender as? NSMenuItem,
 			  let feed = item.representedObject as? Feed else {
@@ -119,7 +119,7 @@ extension SidebarViewController {
 					NotificationCenter.default.post(Notification(name: .DidUpdateFeedPreferencesFromContextMenu))
 				}
 			} else {
-				UNUserNotificationCenter.current().requestAuthorization(options: [.badge, .sound, .alert]) { (granted, error) in
+				UNUserNotificationCenter.current().requestAuthorization(options: [.badge, .sound, .alert]) { (granted, _) in
 					if granted {
 						DispatchQueue.main.async {
 							if feed.isNotifyAboutNewArticles == nil { feed.isNotifyAboutNewArticles = false }
@@ -134,7 +134,7 @@ extension SidebarViewController {
 			}
 		}
 	}
-	
+
 	@objc func toggleArticleExtractorFromContextMenu(_ sender: Any?) {
 		guard let item = sender as? NSMenuItem,
 			  let feed = item.representedObject as? Feed else {
@@ -144,7 +144,7 @@ extension SidebarViewController {
 		feed.isArticleExtractorAlwaysOn?.toggle()
 		NotificationCenter.default.post(Notification(name: .DidUpdateFeedPreferencesFromContextMenu))
 	}
-	
+
 	func showNotificationsNotEnabledAlert() {
 		DispatchQueue.main.async {
 			let alert = NSAlert()
@@ -163,7 +163,7 @@ extension SidebarViewController {
 			}
 		}
 	}
-	
+
 }
 
 extension SidebarViewController: RenameWindowControllerDelegate {
@@ -229,9 +229,9 @@ private extension SidebarViewController {
 			menu.addItem(item)
 		}
 		menu.addItem(NSMenuItem.separator())
-		
+
 		let notificationText = feed.notificationDisplayName.capitalized
-		
+
 		let notificationMenuItem = menuItem(notificationText, #selector(toggleNotificationsFromContextMenu(_:)), feed)
 		if feed.isNotifyAboutNewArticles == nil || feed.isNotifyAboutNewArticles! == false {
 			notificationMenuItem.state = .off
@@ -251,7 +251,7 @@ private extension SidebarViewController {
 		menu.addItem(articleExtractorMenuItem)
 
 		menu.addItem(NSMenuItem.separator())
-		
+
 		menu.addItem(renameMenuItem(feed))
 		menu.addItem(deleteMenuItem([feed]))
 
@@ -362,4 +362,3 @@ private extension SidebarViewController {
 		return articles
 	}
 }
-

Mac/MainWindow/Sidebar/SidebarViewController.swift

@@ -23,9 +23,9 @@ protocol SidebarDelegate: AnyObject {
 }
 
 @objc class SidebarViewController: NSViewController, NSOutlineViewDelegate, NSMenuDelegate, UndoableCommandRunner {
-    
+
 	@IBOutlet weak var outlineView: NSOutlineView!
-	
+
 	weak var delegate: SidebarDelegate?
 
 	private let rebuildTreeAndRestoreSelectionQueue = CoalescingQueue(name: "Rebuild Tree Queue", interval: 1.0)
@@ -36,7 +36,7 @@ protocol SidebarDelegate: AnyObject {
 	lazy var dataSource: SidebarOutlineDataSource = {
 		return SidebarOutlineDataSource(treeController: treeController)
 	}()
-	
+
 	var isReadFiltered: Bool {
 		get {
 			return treeControllerDelegate.isReadFiltered
@@ -89,19 +89,19 @@ protocol SidebarDelegate: AnyObject {
 			}
 		}
 		expandNodes()
-		
+
 	}
 
 	// MARK: State Restoration
-	
-	func saveState(to state: inout [AnyHashable : Any]) {
+
+	func saveState(to state: inout [AnyHashable: Any]) {
 		state[UserInfoKey.readFeedsFilterState] = isReadFiltered
 		state[UserInfoKey.containerExpandedWindowState] = expandedTable.map { $0.userInfo }
 		state[UserInfoKey.selectedFeedsState] = selectedFeeds.compactMap { $0.sidebarItemID?.userInfo }
 	}
-	
-	func restoreState(from state: [AnyHashable : Any]) {
-		
+
+	func restoreState(from state: [AnyHashable: Any]) {
+
 		if let containerExpandedWindowState = state[UserInfoKey.containerExpandedWindowState] as? [[AnyHashable: AnyHashable]] {
 			let containerIdentifiers = containerExpandedWindowState.compactMap( { ContainerIdentifier(userInfo: $0) })
 			expandedTable = Set(containerIdentifiers)
@@ -117,7 +117,7 @@ protocol SidebarDelegate: AnyObject {
 		}
 
 		rebuildTreeAndReloadDataIfNeeded()
-		
+
 		var selectIndexes = IndexSet()
 
 		func selectFeedsVisitor(node: Node) {
@@ -131,12 +131,12 @@ protocol SidebarDelegate: AnyObject {
 		treeController.visitNodes(selectFeedsVisitor(node:))
 		outlineView.selectRowIndexes(selectIndexes, byExtendingSelection: false)
 		focus()
-		
+
 		if let readFeedsFilterState = state[UserInfoKey.readFeedsFilterState] as? Bool {
 			isReadFiltered = readFeedsFilterState
 		}
 	}
-	
+
 	// MARK: - Notifications
 
 	@objc func unreadCountDidInitialize(_ notification: Notification) {
@@ -152,7 +152,7 @@ protocol SidebarDelegate: AnyObject {
 		guard let representedObject = note.object else {
 			return
 		}
-		
+
 		if let timelineViewController = representedObject as? TimelineViewController {
 			configureUnreadCountForCellsForRepresentedObjects(timelineViewController.representedObjects)
 		} else {
@@ -175,7 +175,7 @@ protocol SidebarDelegate: AnyObject {
 	@objc func accountsDidChange(_ notification: Notification) {
 		rebuildTreeAndRestoreSelection()
 	}
-	
+
 	@objc func accountStateDidChange(_ notification: Notification) {
 		rebuildTreeAndRestoreSelection()
 	}
@@ -183,7 +183,7 @@ protocol SidebarDelegate: AnyObject {
 	@objc func batchUpdateDidPerform(_ notification: Notification) {
 		rebuildTreeAndRestoreSelection()
 	}
-	
+
 	@objc func userDidAddFeed(_ notification: Notification) {
 		guard let feed = notification.userInfo?[UserInfoKey.feed] else {
 			return
@@ -199,7 +199,7 @@ protocol SidebarDelegate: AnyObject {
 		guard let feed = note.userInfo?[UserInfoKey.feed] as? Feed else { return }
 		configureCellsForRepresentedObject(feed)
 	}
-	
+
 	@objc func feedSettingDidChange(_ note: Notification) {
 		guard let feed = note.object as? Feed, let key = note.userInfo?[Feed.FeedSettingUserInfoKey] as? String else {
 			return
@@ -228,18 +228,18 @@ protocol SidebarDelegate: AnyObject {
 			self.restoreSelection(to: savedSelection, sendNotificationIfChanged: true)
 		}
 	}
-	
+
 	// MARK: - Actions
 
 	@IBAction func delete(_ sender: AnyObject?) {
 		let availableSelectedNodes = selectedNodes.filter { !($0.representedObject is PseudoFeed) }
-		
+
 		if availableSelectedNodes.isEmpty {
 			return
 		}
-		
+
 		let alert = SidebarDeleteItemsAlert.build(availableSelectedNodes)
-		
+
 		alert.beginSheetModal(for: view.window!) { [weak self] result in
 			if result == NSApplication.ModalResponse.alertFirstButtonReturn {
 				guard let self = self else { return }
@@ -252,7 +252,7 @@ protocol SidebarDelegate: AnyObject {
 			}
 		}
 	}
-	
+
 	@IBAction func doubleClickedSidebar(_ sender: Any?) {
 		guard outlineView.clickedRow == outlineView.selectedRow else {
 			return
@@ -300,20 +300,20 @@ protocol SidebarDelegate: AnyObject {
 	}
 
 	// MARK: - Navigation
-	
+
 	func canGoToNextUnread(wrappingToTop wrapping: Bool = false) -> Bool {
 		if let _ = nextSelectableRowWithUnreadArticle(wrappingToTop: wrapping) {
 			return true
 		}
 		return false
 	}
-	
+
 	func goToNextUnread(wrappingToTop wrapping: Bool = false) {
 		guard let row = nextSelectableRowWithUnreadArticle(wrappingToTop: wrapping) else {
 			assertionFailure("goToNextUnread called before checking if there is a next unread.")
 			return
 		}
-		
+
 		NSCursor.setHiddenUntilMouseMoves(true)
 		outlineView.selectRowIndexes(IndexSet([row]), byExtendingSelection: false)
 		outlineView.scrollTo(row: row)
@@ -339,13 +339,13 @@ protocol SidebarDelegate: AnyObject {
 			// If the clickedRow is part of the selected rows, then do a contextual menu for all the selected rows.
 			return contextualMenuForSelectedObjects()
 		}
-		
+
 		let object = node.representedObject
 		return menu(for: [object])
 	}
 
 	// MARK: - NSMenuDelegate
-	
+
 	public func menuNeedsUpdate(_ menu: NSMenu) {
 		menu.removeAllItems()
 		guard let contextualMenu = contextualMenuForClickedRows() else {
@@ -354,9 +354,8 @@ protocol SidebarDelegate: AnyObject {
 		menu.takeItems(from: contextualMenu)
 	}
 
-
 	// MARK: - NSOutlineViewDelegate
-    
+
 	func outlineView(_ outlineView: NSOutlineView, viewFor tableColumn: NSTableColumn?, item: Any) -> NSView? {
 		let node = item as! Node
 
@@ -398,7 +397,7 @@ protocol SidebarDelegate: AnyObject {
     func outlineViewSelectionDidChange(_ notification: Notification) {
 		selectionDidChange(selectedObjects.isEmpty ? nil : selectedObjects)
     }
-	
+
 	func outlineViewItemDidExpand(_ notification: Notification) {
  		guard let node = notification.userInfo?["NSObject"] as? Node,
 			let containerID = (node.representedObject as? ContainerIdentifiable)?.containerID else {
@@ -409,7 +408,7 @@ protocol SidebarDelegate: AnyObject {
 			delegate?.sidebarInvalidatedRestorationState(self)
 		}
  	}
-	
+
 	func outlineViewItemDidCollapse(_ notification: Notification) {
  		guard let node = notification.userInfo?["NSObject"] as? Node,
 			let containerID = (node.representedObject as? ContainerIdentifiable)?.containerID else {
@@ -420,43 +419,43 @@ protocol SidebarDelegate: AnyObject {
 			delegate?.sidebarInvalidatedRestorationState(self)
 		}
 	}
-	
-	//MARK: - Node Manipulation
-	
+
+	// MARK: - Node Manipulation
+
 	func deleteNodes(_ nodes: [Node]) {
 		let nodesToDelete = treeController.normalizedSelectedNodes(nodes)
-		
+
 		guard let undoManager = undoManager, let deleteCommand = DeleteCommand(nodesToDelete: nodesToDelete, treeController: treeController, undoManager: undoManager, errorHandler: ErrorHandler.present) else {
 			return
 		}
-		
+
 		animatingChanges = true
 		outlineView.beginUpdates()
-		
+
 		let indexSetsGroupedByParent = Node.indexSetsGroupedByParent(nodesToDelete)
 		for (parent, indexSet) in indexSetsGroupedByParent {
 			outlineView.removeItems(at: indexSet, inParent: parent.isRoot ? nil : parent, withAnimation: [.slideDown])
 		}
-		
+
 		outlineView.endUpdates()
-		
+
 		runCommand(deleteCommand)
 		animatingChanges = false
 	}
 
 	// MARK: - API
-	
+
 	func selectFeed(_ feed: SidebarItem) {
 		if isReadFiltered, let feedID = feed.sidebarItemID {
 			self.treeControllerDelegate.addFilterException(feedID)
-			
+
 			if let feed = feed as? Feed, let account = feed.account {
 				let parentFolder = account.sortedFolders?.first(where: { $0.objectIsChild(feed) })
 				if let parentFolderFeedID = parentFolder?.sidebarItemID {
 					self.treeControllerDelegate.addFilterException(parentFolderFeedID)
 				}
 			}
-			
+
 			addTreeControllerToFilterExceptions()
 			rebuildTreeAndRestoreSelection()
 		}
@@ -464,7 +463,7 @@ protocol SidebarDelegate: AnyObject {
 		revealAndSelectRepresentedObject(feed as AnyObject)
 	}
 
-	func deepLinkRevealAndSelect(for userInfo: [AnyHashable : Any]) {
+	func deepLinkRevealAndSelect(for userInfo: [AnyHashable: Any]) {
 		guard let accountNode = findAccountNode(userInfo),
 			let feedNode = findFeedNode(userInfo, beginningAt: accountNode),
 			let feed = feedNode.representedObject as? SidebarItem else {
@@ -482,7 +481,7 @@ protocol SidebarDelegate: AnyObject {
 		delegate?.sidebarInvalidatedRestorationState(self)
 		rebuildTreeAndRestoreSelection()
 	}
-	
+
 }
 
 // MARK: - NSUserInterfaceValidations
@@ -497,21 +496,21 @@ extension SidebarViewController: NSUserInterfaceValidations {
 	}
 }
 
-//MARK: - Private
+// MARK: - Private
 
 private extension SidebarViewController {
-	
+
 	var accountNodes: [Account] {
 		return treeController.rootNode.childNodes.compactMap { $0.representedObject as? Account }
 	}
-	
+
 	var selectedNodes: [Node] {
 		if let nodes = outlineView.selectedItems as? [Node] {
 			return nodes
 		}
 		return [Node]()
 	}
-	
+
 	var selectedFeeds: [SidebarItem] {
 		selectedNodes.compactMap { $0.representedObject as? SidebarItem }
 	}
@@ -529,13 +528,13 @@ private extension SidebarViewController {
 		}
 		return node.representedObject as? Feed
 	}
-	
+
 	func addAllSelectedToFilterExceptions() {
 		for feed in selectedFeeds {
 			addToFilterExceptionsIfNecessary(feed)
 		}
 	}
-	
+
 	func addToFilterExceptionsIfNecessary(_ feed: SidebarItem?) {
 		if isReadFiltered, let feedID = feed?.sidebarItemID {
 			if feed is PseudoFeed {
@@ -552,29 +551,28 @@ private extension SidebarViewController {
 			}
 		}
 	}
-	
+
 	func addParentFolderToFilterExceptions(_ feed: SidebarItem) {
 		guard let node = treeController.rootNode.descendantNodeRepresentingObject(feed as AnyObject),
 			let folder = node.parent?.representedObject as? Folder,
 			let folderFeedID = folder.sidebarItemID else {
 				return
 		}
-		
+
 		treeControllerDelegate.addFilterException(folderFeedID)
 	}
-	
 
 	func queueRebuildTreeAndRestoreSelection() {
 		rebuildTreeAndRestoreSelectionQueue.add(self, #selector(rebuildTreeAndRestoreSelection))
 	}
-	
+
 	@objc func rebuildTreeAndRestoreSelection() {
 		let savedAccounts = accountNodes
 		let savedSelection = selectedNodes
-		
+
 		rebuildTreeAndReloadDataIfNeeded()
 		restoreSelection(to: savedSelection, sendNotificationIfChanged: true)
-		
+
 		// Automatically expand any new or newly active accounts
 		for account in AccountManager.shared.activeAccounts {
 			if !savedAccounts.contains(account) {
@@ -583,7 +581,7 @@ private extension SidebarViewController {
 			}
 		}
 	}
-	
+
 	func rebuildTreeAndReloadDataIfNeeded() {
 		if !animatingChanges && !BatchUpdate.shared.isPerforming {
 			addAllSelectedToFilterExceptions()
@@ -593,11 +591,11 @@ private extension SidebarViewController {
 			expandNodes()
 		}
 	}
-	
+
 	func expandNodes() {
 		treeController.visitNodes(expandNodesVisitor(node:))
 	}
-	
+
 	func expandNodesVisitor(node: Node) {
 		if let containerID = (node.representedObject as? ContainerIdentifiable)?.containerID {
 			if expandedTable.contains(containerID) {
@@ -607,7 +605,7 @@ private extension SidebarViewController {
 			}
 		}
 	}
-	
+
 	func addTreeControllerToFilterExceptions() {
 		treeController.visitNodes(addTreeControllerToFilterExceptionsVisitor(node:))
 	}
@@ -654,13 +652,13 @@ private extension SidebarViewController {
 		if row < 0 || row >= outlineView.numberOfRows {
 			return nil
 		}
-		
+
 		if let node = outlineView.item(atRow: row) as? Node {
 			return node
 		}
 		return nil
 	}
-	
+
 	func rowHasAtLeastOneUnreadArticle(_ row: Int) -> Bool {
 		if let oneNode = nodeForRow(row) {
 			if let unreadCountProvider = oneNode.representedObject as? UnreadCountProvider {
@@ -716,15 +714,15 @@ private extension SidebarViewController {
 				return row
 			}
 		}
-		
+
 		return nil
 	}
 
-	func findAccountNode(_ userInfo: [AnyHashable : Any]?) -> Node? {
+	func findAccountNode(_ userInfo: [AnyHashable: Any]?) -> Node? {
 		guard let accountID = userInfo?[ArticlePathKey.accountID] as? String else {
 			return nil
 		}
-		
+
 		if let node = treeController.rootNode.descendantNode(where: { ($0.representedObject as? Account)?.accountID == accountID }) {
 			return node
 		}
@@ -739,8 +737,8 @@ private extension SidebarViewController {
 
 		return nil
 	}
-	
-	func findFeedNode(_ userInfo: [AnyHashable : Any]?, beginningAt startingNode: Node) -> Node? {
+
+	func findFeedNode(_ userInfo: [AnyHashable: Any]?, beginningAt startingNode: Node) -> Node? {
 		guard let feedID = userInfo?[ArticlePathKey.feedID] as? String else {
 			return nil
 		}
@@ -749,7 +747,7 @@ private extension SidebarViewController {
 		}
 		return nil
 	}
-	
+
 	func configure(_ cell: SidebarCell, _ node: Node) {
 		cell.cellAppearance = SidebarCellAppearance(rowSizeStyle: outlineView.effectiveRowSizeStyle)
 		cell.name = nameFor(node)
@@ -819,7 +817,7 @@ private extension SidebarViewController {
 	}
 
 	func applyToAvailableCells(_ completion: (SidebarCell, Node) -> Void) {
-		outlineView.enumerateAvailableRowViews { (rowView: NSTableRowView, row: Int) -> Void in
+		outlineView.enumerateAvailableRowViews { (rowView: NSTableRowView, row: Int) in
 			guard let cell = cellForRowView(rowView), let node = nodeForRow(row) else {
 				return
 			}
@@ -852,7 +850,7 @@ private extension SidebarViewController {
 	func revealAndSelectRepresentedObject(_ representedObject: AnyObject) -> Bool {
 		return outlineView.revealAndSelectRepresentedObject(representedObject, treeController)
 	}
-	
+
 }
 
 private extension Node {

Mac/MainWindow/Sidebar/UnreadCountView.swift

@@ -8,7 +8,7 @@
 
 import AppKit
 
-class UnreadCountView : NSView {
+class UnreadCountView: NSView {
 
 	struct Appearance {
 		static let padding = NSEdgeInsets(top: 1.0, left: 7.0, bottom: 1.0, right: 7.0)
@@ -31,11 +31,11 @@ class UnreadCountView : NSView {
 	}
 
 	private var intrinsicContentSizeIsValid = false
-	private var _intrinsicContentSize = NSZeroSize
-	
+	private var _intrinsicContentSize = NSSize.zero
+
 	override var intrinsicContentSize: NSSize {
 		if !intrinsicContentSizeIsValid {
-			var size = NSZeroSize
+			var size = NSSize.zero
 			if unreadCount > 0 {
 				size = textSize()
 				size.width += (Appearance.padding.left + Appearance.padding.right)
@@ -46,11 +46,11 @@ class UnreadCountView : NSView {
 		}
 		return _intrinsicContentSize
 	}
-	
+
 	override var isFlipped: Bool {
 		return true
 	}
-	
+
 	override func invalidateIntrinsicContentSize() {
 		intrinsicContentSizeIsValid = false
 	}
@@ -59,7 +59,7 @@ class UnreadCountView : NSView {
 
 	private func textSize() -> NSSize {
 		if unreadCount < 1 {
-			return NSZeroSize
+			return NSSize.zero
 		}
 
 		if let cachedSize = UnreadCountView.textSizeCache[unreadCount] {
@@ -76,9 +76,9 @@ class UnreadCountView : NSView {
 
 	private func textRect() -> NSRect {
 		let size = textSize()
-		var r = NSZeroRect
+		var r = NSRect.zero
 		r.size = size
-		r.origin.x = (NSMaxX(bounds) - Appearance.padding.right) - r.size.width
+		r.origin.x = (bounds.maxX - Appearance.padding.right) - r.size.width
 		r.origin.y = Appearance.padding.top
 		return r
 	}
@@ -93,4 +93,3 @@ class UnreadCountView : NSView {
 		}
 	}
 }
-