Remove last if let strongSelf = self usages (#23836)

* Sort `.swiftlint.yml` rules alphabetically

* Opt into `shorthand_optional_binding` SwiftLint rule

* Address `shorthand_optional_binding` SwiftLint violations

Run via `Pods/SwiftLint/swiftlint lint --fix`

.swiftlint.yml

@@ -7,11 +7,12 @@ excluded:
   - Modules/.build
 
 opt_in_rules:
-  - overridden_super_call
   - discarded_notification_center_observer
-  - weak_delegate
-  - vertical_whitespace
   - duplicate_imports
+  - overridden_super_call
+  - shorthand_optional_binding
+  - vertical_whitespace
+  - weak_delegate
 
 overridden_super_call:
   severity: error

Modules/Sources/DesignSystem/Gallery/ColorGallery.swift

@@ -160,7 +160,7 @@ private extension Color {
 // MARK: - Helpers for Color Gallery
 private extension UIColor {
     func color(for trait: UITraitCollection?) -> UIColor {
-        if let trait = trait {
+        if let trait {
             return resolvedColor(with: trait)
         }
         return self

Modules/Sources/WordPressFlux/QueryStore.swift

@@ -56,7 +56,7 @@ open class QueryStore<State, Query>: StatefulStore<State>, Unsubscribable {
     override public final var state: State {
         get {
             // If the in-memory State is populated, just return that.
-            if let inMemoryState = inMemoryState {
+            if let inMemoryState {
                 return inMemoryState
             }
 

Modules/Sources/WordPressShared/Utility/Debouncer.swift

@@ -18,7 +18,7 @@ public final class Debouncer {
     }
 
     deinit {
-        if let timer = timer, timer.fireDate >= Date() {
+        if let timer, timer.fireDate >= Date() {
             timer.invalidate()
             callback?()
         }

Modules/Sources/WordPressShared/Utility/NSDate+Helpers.swift

@@ -127,7 +127,7 @@ extension Date {
 
         let absoluteFormatter = DateFormatters.mediumDate
 
-        if let timeZone = timeZone {
+        if let timeZone {
             absoluteFormatter.timeZone = timeZone
         }
 
@@ -145,7 +145,7 @@ extension Date {
     /// - Parameter timeZone: An optional time zone used to adjust the date formatters.
     public func mediumStringWithTime(timeZone: TimeZone? = nil) -> String {
         let formatter = DateFormatters.mediumDateTime
-        if let timeZone = timeZone {
+        if let timeZone {
             formatter.timeZone = timeZone
         }
         return formatter.string(from: self)

Modules/Sources/WordPressShared/Utility/Notification+Gravatar.swift

@@ -11,7 +11,7 @@ public extension NSNotification.Name {
 
 extension Foundation.Notification {
     public func userInfoHasEmail(_ email: String) -> Bool {
-        guard let userInfo = userInfo,
+        guard let userInfo,
               let notificationEmail = userInfo[GravatarQEAvatarUpdateNotificationKeys.email.rawValue] as? String else {
                   return false
               }

Modules/Sources/WordPressUI/BottomSheet/BottomSheetViewController.swift

@@ -68,7 +68,7 @@ public class BottomSheetViewController: UIViewController {
             } else {
                 modalPresentationStyle = .popover
 
-                if let sourceBarButtonItem = sourceBarButtonItem {
+                if let sourceBarButtonItem {
                     popoverPresentationController?.barButtonItem = sourceBarButtonItem
                 } else {
                     popoverPresentationController?.permittedArrowDirections = arrowDirections
@@ -129,7 +129,7 @@ public class BottomSheetViewController: UIViewController {
             gripButton.heightAnchor.constraint(equalToConstant: Constants.gripHeight)
         ])
 
-        guard let childViewController = childViewController else {
+        guard let childViewController else {
             return
         }
 
@@ -263,7 +263,7 @@ extension BottomSheetViewController: DrawerPresentable {
     }
 
     public func handleDismiss() {
-        if let childViewController = childViewController {
+        if let childViewController {
             childViewController.handleDismiss()
         }
     }

Modules/Sources/WordPressUI/BottomSheet/DrawerPresentationController.swift

@@ -536,8 +536,8 @@ extension DrawerPresentationController: UIGestureRecognizerDelegate {
 
         /// Shouldn't happen; should always have container & presented view when tapped
         guard
-            let containerView = containerView,
-            let presentedView = presentedView,
+            let containerView,
+            let presentedView,
             currentPosition != .hidden
         else {
             return false

Modules/Sources/WordPressUI/Extensions/UIImage+Assets.swift

@@ -65,7 +65,7 @@ extension UIImage {
 
             cgContext.restoreGState()
 
-            if let border = border {
+            if let border {
                 border.setStroke()
                 path.stroke()
             }

Modules/Sources/WordPressUI/Extensions/UIImageView+Gravatar.swift

@@ -55,7 +55,7 @@ extension UIImageView {
     ///   - email: associated email of the new gravatar
     @objc public func updateGravatar(image: UIImage, email: String?) {
         self.image = image
-        guard let email = email else {
+        guard let email else {
             return
         }
         NotificationCenter.default.post(name: .GravatarImageUpdateNotification, object: self, userInfo: [Defaults.emailKey: email, Defaults.imageKey: image])

Modules/Sources/WordPressUI/Extensions/UIImageView+Networking.swift

@@ -36,10 +36,10 @@ public extension UIImageView {
     @objc func downloadImage(from url: URL?, placeholderImage: UIImage? = nil, success: ((UIImage) -> Void)? = nil, failure: ((Error?) -> Void)? = nil) {
         // Ideally speaking, this method should *not* receive an Optional URL. But we're doing so, for convenience.
         // If the actual URL was nil, at least we set the Placeholder Image. Capicci?
-        guard let url = url else {
+        guard let url else {
             cancelImageDownload()
 
-            if let placeholderImage = placeholderImage {
+            if let placeholderImage {
                 self.image = placeholderImage
             }
 
@@ -67,7 +67,7 @@ public extension UIImageView {
         }
 
         guard let url = request.url else {
-            if let placeholderImage = placeholderImage {
+            if let placeholderImage {
                 image = placeholderImage
             }
 
@@ -82,12 +82,12 @@ public extension UIImageView {
 
         // Using the placeholder only makes sense if we know we're going to download an image
         // that's not immediately available to us.
-        if let placeholderImage = placeholderImage {
+        if let placeholderImage {
             self.image = placeholderImage
         }
 
         let task = URLSession.shared.dataTask(with: request, completionHandler: { [weak self] data, response, error in
-            guard let data = data, let image = UIImage(data: data, scale: UIScreen.main.scale) else {
+            guard let data, let image = UIImage(data: data, scale: UIScreen.main.scale) else {
                 DispatchQueue.main.async {
                     failure?(error)
                     self?.downloadTask = nil

Modules/Sources/WordPressUI/Extensions/UITableViewController+Helpers.swift

@@ -22,7 +22,7 @@ extension UITableViewController {
                     self.tableView.deselectRow(at: indexPath, animated: true)
                 }
                 let completionBlock: (UIViewControllerTransitionCoordinatorContext?) -> Void = { [unowned self] context in
-                    if let context = context,
+                    if let context,
                         context.isCancelled {
                         self.tableView.selectRow(at: indexPath, animated: true, scrollPosition: .none)
                     }

Modules/Sources/WordPressUI/FancyAlert/FancyAlertPresentationController.swift

@@ -16,7 +16,7 @@ open class FancyAlertPresentationController: UIPresentationController, UIViewCon
     }(UIView())
 
     override open func presentationTransitionWillBegin() {
-        guard let containerView = containerView else { return }
+        guard let containerView else { return }
 
         containerView.addSubview(dimmingView)
         containerView.pinSubviewToAllEdges(dimmingView)

Modules/Sources/WordPressUI/FancyAlert/FancyAlertViewController.swift

@@ -246,7 +246,7 @@ open class FancyAlertViewController: UIViewController {
 
     private func updateViewConfiguration() {
         guard isViewLoaded else { return }
-        guard let configuration = configuration else { return }
+        guard let configuration else { return }
 
         buttonHandlers.removeAll()
 
@@ -349,7 +349,7 @@ open class FancyAlertViewController: UIViewController {
     }
 
     private func update(_ button: UIButton, with buttonConfig: Config.ButtonConfig?) {
-        guard let buttonConfig = buttonConfig else {
+        guard let buttonConfig else {
             button.isHiddenInStackView = true
             return
         }
@@ -361,7 +361,7 @@ open class FancyAlertViewController: UIViewController {
     }
 
     private func updateBottomSwitch(with config: Config.SwitchConfig?) {
-        guard let config = config else {
+        guard let config else {
             alertView.bottomSwitchStackView.isHiddenInStackView = true
             return
         }

Modules/Sources/WordPressUI/FancyAlert/FancyButton.swift

@@ -128,7 +128,7 @@ open class FancyButton: UIButton {
     // wrap appropriately including insets above and below.
     //
     open override var intrinsicContentSize: CGSize {
-        guard let titleLabel = titleLabel else {
+        guard let titleLabel else {
             return super.intrinsicContentSize
         }
 

Modules/Sources/WordPressUI/FlingableView/FlingableViewHandler.swift

@@ -139,7 +139,7 @@ open class FlingableViewHandler: NSObject {
         // Check for the view leaving the screen
         pushBehavior.action = { [weak self] in
             guard let strongSelf = self,
-                  let referenceView = referenceView else { return }
+                  let referenceView else { return }
 
             if !view.frame.intersects(referenceView.bounds) {
                 strongSelf.animator.removeAllBehaviors()

WordPress/Classes/Extensions/Array+Page.swift

@@ -18,7 +18,7 @@ extension Array where Element == Page {
     /// - Parameter pageId: Page id
     /// - Returns: If the Page exists or not
     func containsPage(for pageId: Int?) -> Bool {
-        guard let pageId = pageId else {
+        guard let pageId else {
             return false
         }
 

WordPress/Classes/Extensions/Array.swift

@@ -71,15 +71,15 @@ extension Array {
         forEach { (element) in
             let value = transforming(element)
             if currentValue != value {
-                if let currentValue = currentValue {
+                if let currentValue {
                     result.append((currentValue, currentGroup))
                 }
                 currentValue = value
                 currentGroup = []
             }
             currentGroup.append(element)
         }
-        if let currentValue = currentValue {
+        if let currentValue {
             result.append((currentValue, currentGroup))
         }
         return result

WordPress/Classes/Extensions/CLPlacemark+Formatting.swift

@@ -18,7 +18,7 @@ extension CLPlacemark {
         if let zipCode = postalCode {
             address.append(", " + zipCode)
         }
-        if let country = country {
+        if let country {
             address.append(", " + country)
         }
         return address

WordPress/Classes/Extensions/Colors and Styles/UIColor+Extensions.swift

@@ -15,7 +15,7 @@ extension UIColor {
     }
 
     func color(for trait: UITraitCollection?) -> UIColor {
-        if let trait = trait {
+        if let trait {
             return resolvedColor(with: trait)
         }
         return self

WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift

@@ -117,14 +117,14 @@ extension WPStyleGuide {
     }
 
     class func configureTableViewColors(view: UIView?) {
-        guard let view = view else {
+        guard let view else {
             return
         }
         view.backgroundColor = .systemBackground
     }
 
     class func configureTableViewColors(tableView: UITableView?) {
-        guard let tableView = tableView else {
+        guard let tableView else {
             return
         }
 
@@ -140,7 +140,7 @@ extension WPStyleGuide {
 
     @objc
     class func configureTableViewCell(_ cell: UITableViewCell?) {
-        guard let cell = cell else {
+        guard let cell else {
             return
         }
 

WordPress/Classes/Extensions/Comment+Interface.swift

@@ -10,7 +10,7 @@ extension Comment {
     /// as well!
     ///
     @objc func relativeDateSectionIdentifier() -> String? {
-        guard let dateCreated = dateCreated else {
+        guard let dateCreated else {
             return nil
         }
 

WordPress/Classes/Extensions/NSAttributedString+StyledHTML.swift

@@ -33,7 +33,7 @@ extension NSAttributedString {
         // set via CSS). So we'll look for a paragraph style specified for the
         // body of the text, so we can copy it use its text alignment.
         let paragraphStyle = NSMutableParagraphStyle()
-        if let attributes = attributes,
+        if let attributes,
             let bodyAttributes = attributes[.BodyAttribute],
             let pStyle = bodyAttributes[.paragraphStyle] as? NSParagraphStyle {
                 paragraphStyle.setParagraphStyle(pStyle)

WordPress/Classes/Extensions/NSFetchedResultsController+Helpers.swift

@@ -4,7 +4,7 @@ extension NSFetchedResultsController {
     /// Returns whether an indexPath represents the last row in it's section, or not
     ///
     @objc func isLastIndexPathInSection(_ indexPath: IndexPath) -> Bool {
-        guard let sections = sections else {
+        guard let sections else {
             return false
         }
 
@@ -19,7 +19,7 @@ extension NSFetchedResultsController {
     /// Otherwise, null will be returned.
     ///
     @objc func managedObject(atUnsafe indexPath: IndexPath) -> NSManagedObject? {
-        guard let sections = sections else {
+        guard let sections else {
             return nil
         }
 

WordPress/Classes/Extensions/NSMutableAttributedString+ApplyAttributesToQuotes.swift

@@ -8,7 +8,7 @@ extension NSMutableAttributedString {
     ///     - attributes: Collection of attributes to be applied on the matched strings
     ///
     public func applyAttributes(toQuotes attributes: [NSAttributedString.Key: Any]?) {
-        guard let attributes = attributes else {
+        guard let attributes else {
             return
         }
         let rawString = self.string

WordPress/Classes/Extensions/NotificationCenter+ObserveOnce.swift

@@ -9,7 +9,7 @@ private class OneTimeObserver {
     }
 
     func run(_ notification: Foundation.Notification) {
-        if let observer = observer {
+        if let observer {
             NotificationCenter.default.removeObserver(observer)
         }
         action(notification)

WordPress/Classes/Extensions/Post+BloggingPrompts.swift

@@ -3,7 +3,7 @@ import Foundation
 extension Post {
 
     func prepareForPrompt(_ prompt: BloggingPrompt?) {
-        guard let prompt = prompt else {
+        guard let prompt else {
             return
         }
 

WordPress/Classes/Extensions/URL+Helpers.swift

@@ -91,7 +91,7 @@ extension URL {
     }
 
     var isHostedAtWPCom: Bool {
-        guard let host = host else {
+        guard let host else {
             return false
         }
 

WordPress/Classes/Models/AbstractPost+Searchable.swift

@@ -14,7 +14,7 @@ extension AbstractPost: SearchableItemConvertable {
     }
 
     var searchIdentifier: String? {
-        guard let postID = postID, postID.intValue > 0 else {
+        guard let postID, postID.intValue > 0 else {
             return nil
         }
         return postID.stringValue
@@ -55,7 +55,7 @@ extension AbstractPost: SearchableItemConvertable {
 fileprivate extension AbstractPost {
     func generateKeywordsFromContent() -> [String]? {
         var keywords: [String]? = nil
-        if let postTitle = postTitle {
+        if let postTitle {
             // Try to generate some keywords from the title...
             keywords = postTitle.components(separatedBy: " ").map({ $0.trimmingCharacters(in: .whitespacesAndNewlines) })
         } else if !contentPreviewForDisplay().isEmpty {
@@ -68,7 +68,7 @@ fileprivate extension AbstractPost {
     func generateTitle(from postTitle: String?) -> String {
         let noTitleText = NSLocalizedString("No Title", comment: "Label used for posts without a title in spotlight search.")
         var title = "(\(noTitleText))"
-        if let postTitle = postTitle, !postTitle.isEmpty {
+        if let postTitle, !postTitle.isEmpty {
             title = postTitle
         }