Some cleanup especially regarding method references (#516)

SimplyDanny · web-flow · commit 32b7c9b635a3 · 2021-10-02T20:46:07.000-07:00
* Remove superfluous method arguments in method references

* Use 'Self' for internal static access

* Convert static to instance field in singleton class

* Remove class name prefix in references to local methods

* Remove nested frameworks in all extensions and frameworks
diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj
@@ -1463,7 +1463,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nset -xe\nrm -rf ${BUILT_PRODUCTS_DIR}/passKit.framework/Frameworks\nfind -L ${BUILT_PRODUCTS_DIR}/OneTimePassword_*.framework -type d -name \"Frameworks\" | xargs rm -rf\nfind -L ${BUILT_PRODUCTS_DIR}/passAutoFillExtension.appex -type d -name \"Frameworks\" | xargs rm -rf\nfind -L ${BUILT_PRODUCTS_DIR}/passShortcuts.appex -type d -name \"Frameworks\" | xargs rm -rf\n\n";
+			shellScript = "set -xe\n\nfind -L \"${BUILT_PRODUCTS_DIR}\" -type d -path \"*.appex/Frameworks\" -o -path \"*.framework/Frameworks\" -maxdepth 2 | xargs rm -rf\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/pass/Controllers/AboutRepositoryTableViewController.swift b/pass/Controllers/AboutRepositoryTableViewController.swift
@@ -100,7 +100,7 @@ class AboutRepositoryTableViewController: BasicStaticTableViewController {
         if let numberOfCommits = passwordStore.numberOfCommits {
             return String(numberOfCommits)
         }
-        return AboutRepositoryTableViewController.VALUE_NOT_AVAILABLE
+        return Self.VALUE_NOT_AVAILABLE
     }
 
     @objc
diff --git a/pass/Controllers/AdvancedSettingsTableViewController.swift b/pass/Controllers/AdvancedSettingsTableViewController.swift
@@ -21,7 +21,7 @@ class AdvancedSettingsTableViewController: UITableViewController {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Colors.systemBlue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(encryptInASCIIArmoredAction(_:)), for: UIControl.Event.valueChanged)
+        uiSwitch.addTarget(self, action: #selector(encryptInASCIIArmoredAction), for: UIControl.Event.valueChanged)
         return uiSwitch
     }()
 
diff --git a/pass/Controllers/GeneralSettingsTableViewController.swift b/pass/Controllers/GeneralSettingsTableViewController.swift
@@ -16,31 +16,31 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Colors.systemBlue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(hideUnknownSwitchAction(_:)), for: UIControl.Event.valueChanged)
+        uiSwitch.addTarget(self, action: #selector(hideUnknownSwitchAction), for: UIControl.Event.valueChanged)
         return uiSwitch
     }()
 
     let hideOTPSwitch: UISwitch = {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Colors.systemBlue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(hideOTPSwitchAction(_:)), for: UIControl.Event.valueChanged)
+        uiSwitch.addTarget(self, action: #selector(hideOTPSwitchAction), for: UIControl.Event.valueChanged)
         return uiSwitch
     }()
 
     let autoCopyOTPSwitch: UISwitch = {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Colors.systemBlue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(autoCopyOTPSwitchAction(_:)), for: UIControl.Event.valueChanged)
+        uiSwitch.addTarget(self, action: #selector(autoCopyOTPSwitchAction), for: UIControl.Event.valueChanged)
         return uiSwitch
     }()
 
     let rememberPGPPassphraseSwitch: UISwitch = {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Colors.systemBlue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(rememberPGPPassphraseSwitchAction(_:)), for: UIControl.Event.valueChanged)
+        uiSwitch.addTarget(self, action: #selector(rememberPGPPassphraseSwitchAction), for: UIControl.Event.valueChanged)
         uiSwitch.isOn = Defaults.isRememberPGPPassphraseOn
         return uiSwitch
     }()
@@ -49,7 +49,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Colors.systemBlue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(rememberGitCredentialPassphraseSwitchAction(_:)), for: UIControl.Event.valueChanged)
+        uiSwitch.addTarget(self, action: #selector(rememberGitCredentialPassphraseSwitchAction), for: UIControl.Event.valueChanged)
         uiSwitch.isOn = Defaults.isRememberGitCredentialPassphraseOn
         return uiSwitch
     }()
@@ -58,7 +58,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Colors.systemBlue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(enableGPGIDSwitchAction(_:)), for: UIControl.Event.valueChanged)
+        uiSwitch.addTarget(self, action: #selector(enableGPGIDSwitchAction), for: UIControl.Event.valueChanged)
         uiSwitch.isOn = Defaults.isEnableGPGIDOn
         return uiSwitch
     }()
@@ -67,7 +67,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Colors.systemBlue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(showFolderSwitchAction(_:)), for: UIControl.Event.valueChanged)
+        uiSwitch.addTarget(self, action: #selector(showFolderSwitchAction), for: UIControl.Event.valueChanged)
         uiSwitch.isOn = Defaults.isShowFolderOn
         return uiSwitch
     }()
@@ -76,7 +76,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Colors.systemBlue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(hidePasswordImagesSwitchAction(_:)), for: UIControl.Event.valueChanged)
+        uiSwitch.addTarget(self, action: #selector(hidePasswordImagesSwitchAction), for: UIControl.Event.valueChanged)
         uiSwitch.isOn = Defaults.isHidePasswordImagesOn
         return uiSwitch
     }()
diff --git a/pass/Controllers/OpenSourceComponentsTableViewController.swift b/pass/Controllers/OpenSourceComponentsTableViewController.swift
@@ -68,7 +68,7 @@ class OpenSourceComponentsTableViewController: BasicStaticTableViewController {
                     .action: "link",
                     .link: item[1],
                     .accessoryType: UITableViewCell.AccessoryType.detailDisclosureButton,
-                    .detailDisclosureAction: #selector(actOnDetailDisclosureButton(_:)),
+                    .detailDisclosureAction: #selector(actOnDetailDisclosureButton),
                     .detailDisclosureData: item[2],
                 ]
             )
diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -21,7 +21,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     private let keychain = AppKeychain.shared
 
     private lazy var editUIBarButtonItem: UIBarButtonItem = {
-        let uiBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(pressEdit(_:)))
+        let uiBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(pressEdit))
         return uiBarButtonItem
     }()
 
@@ -47,7 +47,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
         tableView.register(UINib(nibName: "LabelTableViewCell", bundle: nil), forCellReuseIdentifier: "labelCell")
         tableView.register(UINib(nibName: "PasswordDetailTitleTableViewCell", bundle: nil), forCellReuseIdentifier: "passwordDetailTitleTableViewCell")
 
-        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(PasswordDetailTableViewController.tapMenu(recognizer:)))
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(tapMenu))
         tapGesture.cancelsTouchesInView = false
         tableView.addGestureRecognizer(tapGesture)
         tapGesture.delegate = self
@@ -326,10 +326,10 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
                 if let tappedCell = tableView.cellForRow(at: tapIndexPath) as? LabelTableViewCell {
                     tappedCell.becomeFirstResponder()
                     let menuController = UIMenuController.shared
-                    let revealItem = UIMenuItem(title: "Reveal".localize(), action: #selector(LabelTableViewCell.revealPassword(_:)))
-                    let concealItem = UIMenuItem(title: "Conceal".localize(), action: #selector(LabelTableViewCell.concealPassword(_:)))
-                    let nextHOTPItem = UIMenuItem(title: "NextPassword".localize(), action: #selector(LabelTableViewCell.getNextHOTP(_:)))
-                    let openURLItem = UIMenuItem(title: "CopyAndOpen".localize(), action: #selector(LabelTableViewCell.openLink(_:)))
+                    let revealItem = UIMenuItem(title: "Reveal".localize(), action: #selector(LabelTableViewCell.revealPassword))
+                    let concealItem = UIMenuItem(title: "Conceal".localize(), action: #selector(LabelTableViewCell.concealPassword))
+                    let nextHOTPItem = UIMenuItem(title: "NextPassword".localize(), action: #selector(LabelTableViewCell.getNextHOTP))
+                    let openURLItem = UIMenuItem(title: "CopyAndOpen".localize(), action: #selector(LabelTableViewCell.openLink))
                     menuController.menuItems = [revealItem, concealItem, nextHOTPItem, openURLItem]
                     menuController.setTargetRect(tappedCell.contentLabel.frame, in: tappedCell.contentLabel.superview!)
                     menuController.setMenuVisible(true, animated: true)
@@ -490,7 +490,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
         let section = tableData[indexPath.section]
         switch section.type {
         case .addition, .main:
-            return action == #selector(UIResponderStandardEditActions.copy(_:))
+            return action == #selector(UIResponderStandardEditActions.copy)
         default:
             return false
         }
diff --git a/pass/Controllers/PasswordNavigationViewController.swift b/pass/Controllers/PasswordNavigationViewController.swift
@@ -56,10 +56,10 @@ class PasswordNavigationViewController: UIViewController {
             let addPasswordButton = UIButton(type: .system)
             let plusImage = UIImage(systemName: "plus.circle", withConfiguration: UIImage.SymbolConfiguration(weight: .regular))
             addPasswordButton.setImage(plusImage, for: .normal)
-            addPasswordButton.addTarget(self, action: #selector(self.addPasswordAction(_:)), for: .touchDown)
+            addPasswordButton.addTarget(self, action: #selector(self.addPasswordAction), for: .touchDown)
             addPasswordUIBarButtonItem.customView = addPasswordButton
         } else {
-            addPasswordUIBarButtonItem = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(self.addPasswordAction(_:)))
+            addPasswordUIBarButtonItem = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(self.addPasswordAction))
         }
         return addPasswordUIBarButtonItem
     }()
diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift
@@ -66,7 +66,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        NotificationCenter.default.addObserver(self, selector: #selector(SettingsTableViewController.actOnPasswordStoreErasedNotification), name: .passwordStoreErased, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(actOnPasswordStoreErasedNotification), name: .passwordStoreErased, object: nil)
         passwordRepositoryTableViewCell.detailTextLabel?.text = Defaults.gitURL.host
         setPGPKeyTableViewCellDetailText()
         setPasscodeLockCell()
@@ -243,12 +243,12 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
         setPasscodeLockAlert?.addTextField { textField -> Void in
             textField.placeholder = "Passcode".localize()
             textField.isSecureTextEntry = true
-            textField.addTarget(self, action: #selector(self.alertTextFieldDidChange(_:)), for: UIControl.Event.editingChanged)
+            textField.addTarget(self, action: #selector(self.alertTextFieldDidChange), for: UIControl.Event.editingChanged)
         }
         setPasscodeLockAlert?.addTextField { textField -> Void in
             textField.placeholder = "PasswordConfirmation".localize()
             textField.isSecureTextEntry = true
-            textField.addTarget(self, action: #selector(self.alertTextFieldDidChange(_:)), for: UIControl.Event.editingChanged)
+            textField.addTarget(self, action: #selector(self.alertTextFieldDidChange), for: UIControl.Event.editingChanged)
         }
 
         // save action
diff --git a/pass/Views/LabelTableViewCell.swift b/pass/Views/LabelTableViewCell.swift
@@ -80,16 +80,16 @@ class LabelTableViewCell: UITableViewCell {
         switch type {
         case .password:
             if isReveal {
-                return action == #selector(copy(_:)) || action == #selector(concealPassword(_:))
+                return action == #selector(copy(_:)) || action == #selector(concealPassword)
             }
-            return action == #selector(copy(_:)) || action == #selector(revealPassword(_:))
+            return action == #selector(copy(_:)) || action == #selector(revealPassword)
         case .URL:
-            return action == #selector(copy(_:)) || action == #selector(openLink(_:))
+            return action == #selector(copy(_:)) || action == #selector(openLink)
         case .HOTP:
             if isReveal {
-                return action == #selector(copy(_:)) || action == #selector(concealPassword(_:)) || action == #selector(getNextHOTP(_:))
+                return action == #selector(copy(_:)) || action == #selector(concealPassword) || action == #selector(getNextHOTP)
             }
-            return action == #selector(copy(_:)) || action == #selector(revealPassword(_:)) || action == #selector(getNextHOTP(_:))
+            return action == #selector(copy(_:)) || action == #selector(revealPassword) || action == #selector(getNextHOTP)
         default:
             return action == #selector(copy(_:))
         }
diff --git a/pass/Views/UICodeHighlightingLabel.swift b/pass/Views/UICodeHighlightingLabel.swift
@@ -31,13 +31,13 @@ class UICodeHighlightingLabel: UILocalizedLabel {
         let formattedText = text.splitByNewline()
             .map { line -> NSAttributedString in
                 if line.starts(with: "  ") {
-                    return NSAttributedString(string: line, attributes: UICodeHighlightingLabel.CODE_ATTRIBUTES)
+                    return NSAttributedString(string: line, attributes: Self.CODE_ATTRIBUTES)
                 }
                 return NSAttributedString(string: line)
             }
             .reduce(into: NSMutableAttributedString(string: "")) {
                 $0.append($1)
-                $0.append(UICodeHighlightingLabel.ATTRIBUTED_NEWLINE)
+                $0.append(Self.ATTRIBUTED_NEWLINE)
             }
         formattedText.deleteCharacters(in: NSRange(location: formattedText.length - 1, length: 1))
         return formattedText
diff --git a/passAutoFillExtension/Controllers/CredentialProviderViewController.swift b/passAutoFillExtension/Controllers/CredentialProviderViewController.swift
@@ -23,7 +23,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
     }()
 
     private lazy var passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false)
-        .map(PasswordTableEntry.init(_:))
+        .map(PasswordTableEntry.init)
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -44,7 +44,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
             self.credentialProvider.identifier = serviceIdentifiers.first
             let url = serviceIdentifiers.first
                 .map(\.identifier)
-                .flatMap(URL.init(string:))
+                .flatMap(URL.init)
             self.passwordsViewController.navigationItem.prompt = url?.host
             self.passwordsViewController.showPasswordsWithSuggestion(matching: url?.host ?? "")
         }
diff --git a/passExtension/Controllers/ExtensionViewController.swift b/passExtension/Controllers/ExtensionViewController.swift
@@ -24,7 +24,7 @@ class ExtensionViewController: UIViewController {
     }()
 
     private lazy var passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false)
-        .map(PasswordTableEntry.init(_:))
+        .map(PasswordTableEntry.init)
 
     enum Action {
         case findLogin, fillBrowser, unknown
diff --git a/passKit/Controllers/PasscodeLockViewController.swift b/passKit/Controllers/PasscodeLockViewController.swift
@@ -34,7 +34,7 @@ open class PasscodeLockViewController: UIViewController, UITextFieldDelegate {
         passcodeTextField.isSecureTextEntry = true
         passcodeTextField.clearButtonMode = UITextField.ViewMode.whileEditing
         passcodeTextField.delegate = self
-        passcodeTextField.addTarget(self, action: #selector(passcodeTextFieldDidChange(_:)), for: UIControl.Event.editingChanged)
+        passcodeTextField.addTarget(self, action: #selector(passcodeTextFieldDidChange), for: UIControl.Event.editingChanged)
         passcodeTextField.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(passcodeTextField)
         self.passcodeTextField = passcodeTextField
@@ -46,7 +46,7 @@ open class PasscodeLockViewController: UIViewController, UITextFieldDelegate {
         let biometryAuthButton = UIButton(type: .custom)
         biometryAuthButton.setTitle("", for: .normal)
         biometryAuthButton.setTitleColor(Colors.systemBlue, for: .normal)
-        biometryAuthButton.addTarget(self, action: #selector(bioButtonPressedAction(_:)), for: .touchUpInside)
+        biometryAuthButton.addTarget(self, action: #selector(bioButtonPressedAction), for: .touchUpInside)
         biometryAuthButton.isHidden = true
         biometryAuthButton.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(biometryAuthButton)
@@ -68,7 +68,7 @@ open class PasscodeLockViewController: UIViewController, UITextFieldDelegate {
         forgotPasscodeButton.setTitle("ForgotYourPasscode?".localize(), for: .normal)
         forgotPasscodeButton.titleLabel?.font = UIFont.systemFont(ofSize: UIFont.systemFontSize)
         forgotPasscodeButton.setTitleColor(Colors.systemBlue, for: .normal)
-        forgotPasscodeButton.addTarget(self, action: #selector(forgotPasscodeButtonPressedAction(_:)), for: .touchUpInside)
+        forgotPasscodeButton.addTarget(self, action: #selector(forgotPasscodeButtonPressedAction), for: .touchUpInside)
         // hide the forgotPasscodeButton if the native app is running
         forgotPasscodeButton.isHidden = isCancellable
         forgotPasscodeButton.translatesAutoresizingMaskIntoConstraints = false
diff --git a/passKit/Models/PasscodeLock.swift b/passKit/Models/PasscodeLock.swift
@@ -9,10 +9,10 @@
 public class PasscodeLock {
     public static let shared = PasscodeLock()
 
-    private static let identifier = Globals.bundleIdentifier + "passcode"
+    private let identifier = Globals.bundleIdentifier + "passcode"
 
     private var passcode: String? {
-        AppKeychain.shared.get(for: PasscodeLock.identifier)
+        AppKeychain.shared.get(for: identifier)
     }
 
     /// Constructor used to migrate passcode from SharedDefaults to Keychain
@@ -28,14 +28,14 @@ public class PasscodeLock {
     }
 
     public func save(passcode: String) {
-        AppKeychain.shared.add(string: passcode, for: PasscodeLock.identifier)
+        AppKeychain.shared.add(string: passcode, for: identifier)
     }
 
     public func check(passcode: String) -> Bool {
         self.passcode == passcode
     }
 
     public func delete() {
-        AppKeychain.shared.removeContent(for: PasscodeLock.identifier)
+        AppKeychain.shared.removeContent(for: identifier)
     }
 }
diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
@@ -380,7 +380,7 @@ public class PasswordStore {
         if Date().timeIntervalSince(lastCommitDate) <= 60 {
             return "JustNow".localize()
         }
-        return PasswordStore.dateFormatter.string(from: lastCommitDate)
+        return Self.dateFormatter.string(from: lastCommitDate)
     }
 
     public func updateRemoteRepo() {}
diff --git a/passKit/Models/PasswordTableEntry.swift b/passKit/Models/PasswordTableEntry.swift
@@ -24,7 +24,7 @@ public class PasswordTableEntry: NSObject {
     }
 
     public func matches(_ searchText: String) -> Bool {
-        PasswordTableEntry.match(nameWithCategory: passwordEntity.nameWithCategory, searchText: searchText)
+        Self.match(nameWithCategory: passwordEntity.nameWithCategory, searchText: searchText)
     }
 
     public static func match(nameWithCategory: String, searchText: String) -> Bool {
diff --git a/passKit/Parser/Parser.swift b/passKit/Parser/Parser.swift
@@ -29,7 +29,7 @@ class Parser {
         while lineNumber < purgedAdditionalLines.count {
             let line = purgedAdditionalLines[lineNumber]
             lineNumber += 1
-            var (key, value) = Parser.getKeyValuePair(from: line)
+            var (key, value) = Self.getKeyValuePair(from: line)
             if key == nil {
                 unknownIndex += 1
                 key = Constants.unknown(unknownIndex)
diff --git a/passKitTests/Helpers/KeyFileManagerTest.swift b/passKitTests/Helpers/KeyFileManagerTest.swift

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class AboutRepositoryTableViewController: BasicStaticTableViewController {`
`100`	`100`	`if let numberOfCommits = passwordStore.numberOfCommits {`
`101`	`101`	`return String(numberOfCommits)`
`102`	`102`	`}`
`103`		`- return AboutRepositoryTableViewController.VALUE_NOT_AVAILABLE`
	`103`	`+ return Self.VALUE_NOT_AVAILABLE`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`@objc`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class OpenSourceComponentsTableViewController: BasicStaticTableViewController {`
`68`	`68`	`.action: "link",`
`69`	`69`	`.link: item[1],`
`70`	`70`	`.accessoryType: UITableViewCell.AccessoryType.detailDisclosureButton,`
`71`		`- .detailDisclosureAction: #selector(actOnDetailDisclosureButton(_:)),`
	`71`	`+ .detailDisclosureAction: #selector(actOnDetailDisclosureButton),`
`72`	`72`	`.detailDisclosureData: item[2],`
`73`	`73`	`]`
`74`	`74`	`)`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,13 @@ class UICodeHighlightingLabel: UILocalizedLabel {`
`31`	`31`	`let formattedText = text.splitByNewline()`
`32`	`32`	`.map { line -> NSAttributedString in`
`33`	`33`	`if line.starts(with: " ") {`
`34`		`- return NSAttributedString(string: line, attributes: UICodeHighlightingLabel.CODE_ATTRIBUTES)`
	`34`	`+ return NSAttributedString(string: line, attributes: Self.CODE_ATTRIBUTES)`
`35`	`35`	`}`
`36`	`36`	`return NSAttributedString(string: line)`
`37`	`37`	`}`
`38`	`38`	`.reduce(into: NSMutableAttributedString(string: "")) {`
`39`	`39`	`$0.append($1)`
`40`		`- $0.append(UICodeHighlightingLabel.ATTRIBUTED_NEWLINE)`
	`40`	`+ $0.append(Self.ATTRIBUTED_NEWLINE)`
`41`	`41`	`}`
`42`	`42`	`formattedText.deleteCharacters(in: NSRange(location: formattedText.length - 1, length: 1))`
`43`	`43`	`return formattedText`