Refactored.

Example/RichEditor/PreviewWebViewController.swift

@@ -20,7 +20,7 @@ class PreviewWebViewController: NSViewController
     }
 }
 
-//MARK: - WKNavigation Delegate
+// MARK: - WKNavigation Delegate
 extension PreviewWebViewController: WKNavigationDelegate
 {
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!)

Example/RichEditor/ViewController.swift

@@ -29,16 +29,17 @@ class ViewController: NSViewController
     @IBOutlet weak var fontFamiliesPopUpButton: NSPopUpButton!
     @IBOutlet weak var fontSizePopUpButton: NSPopUpButton!
 
-    ///This window displays the HTML, that was sourced from the RichEditor.html() function
+    /// This window displays the HTML, that was sourced from the RichEditor.html() function
     private var previewTextViewController : PreviewTextViewController?
 
-    ///This window displays the NSAttributedString, that was sourced from HTML
+    /// This window displays the NSAttributedString, that was sourced from HTML
     private var previewTextViewController2: PreviewTextViewController?
 
-    ///This window displays the HTML from the RawHTML
+    /// This window displays the HTML from the RawHTML
     private var previewWebViewController: PreviewWebViewController?
 
-    //MARK: - NSViewController
+    // MARK: - NSViewController
+
     deinit
     {
         self.textColorWell.removeObserver(self, forKeyPath: "color")
@@ -58,10 +59,7 @@ class ViewController: NSViewController
     override func viewDidAppear()
     {
         super.viewDidAppear()
-
-        if let window = self.view.window {
-            window.title = "1. Rich Editor"
-        }
+        self.view.window?.title = "1. Rich Editor"
     }
 
     private func configureUI()
@@ -114,7 +112,7 @@ class ViewController: NSViewController
     }
 }
 
-//MARK: - Actions
+// MARK: - Actions
 extension ViewController
 {
     @IBAction func boldButtonTapped(_ sender: Any)
@@ -166,7 +164,7 @@ extension ViewController
     }
 }
 
-//MARK: - RichEditorDelegate
+// MARK: - RichEditorDelegate
 extension ViewController: RichEditorDelegate
 {
     func fontStylingChanged(_ fontStyling: FontStyling)
@@ -206,7 +204,7 @@ extension ViewController: RichEditorDelegate
 
 }
 
-//MARK: - Functions
+// MARK: - Functions
 extension ViewController
 {
     private func configureTextActionButtonsUI()

Extensions/CGFloat+Formatting.swift

@@ -8,13 +8,14 @@
 
 import Foundation
 
-extension CGFloat
-{
+public extension CGFloat {
+
     /**
      Removes the decimal point if the value is equal to 0
      StackOverflow: https://stackoverflow.com/a/33996219
     */
-    public var cleanValue: String {
+    var cleanValue: String {
         return self.truncatingRemainder(dividingBy: 1) == 0 ? String(format: "%.0f", self) : String(Float(self))
     }
+
 }

Extensions/Dictionary+Convenience.swift

@@ -9,15 +9,13 @@
 import Foundation
 import AppKit
 
-extension Dictionary
-{
+extension Dictionary {
     /**
      Merges the provided dictionary into this one. If the newDict and this dictionary have identical keys,
      the newDict's key/value pair overwrite the original one
      - parameter newDict: The dictionary which we'd like to merge
     */
-    mutating func merge(newDict: Dictionary)
-    {
+    mutating func merge(newDict: Dictionary) {
         for (key, value) in newDict {
             self[key] = value
         }

Extensions/Dictionary+TypingAttributes.swift

@@ -9,8 +9,8 @@
 import Foundation
 import AppKit
 
-extension Dictionary where Key == NSAttributedString.Key
-{
+extension Dictionary where Key == NSAttributedString.Key {
+
     public var isUnderlined : Bool {
         guard let rawUnderlineStyle = self[NSAttributedString.Key.underlineStyle] as? NSNumber else {
             return false
@@ -35,5 +35,5 @@ extension Dictionary where Key == NSAttributedString.Key
 
         return !isNegativeAttr(rawAttr.intValue)
     }
-}
 
+}

Extensions/NSAttributedString+Convenience.swift

@@ -9,13 +9,12 @@
 import Foundation
 import AppKit
 
-extension NSAttributedString
-{
+public extension NSAttributedString {
     /**
      Determines the attributes for the whole complete NSAttributedString
      - returns: The attributes, in the form of a dictionary, for the whole NSAttributedString
      */
-    public var attributes: [NSAttributedString.Key: Any] {
+    var attributes: [NSAttributedString.Key: Any] {
         return self.attributes(at: 0, longestEffectiveRange: nil, in: self.string.fullRange)
     }
 
@@ -90,14 +89,13 @@ extension NSAttributedString
         return attachments
     }
 
-    //MARK: - Basic Attribute Fetching
+    // MARK: - Basic Attribute Fetching
     /**
      Collects all the types of the attribute that we're after
      - parameter attribute: The NSAttributedString.Key values we're searching for
      - returns: An array of all the values that correlated with the provided attribute key
     */
-    fileprivate func all(of attribute: NSAttributedString.Key) -> [Any]
-    {
+    fileprivate func all(of attribute: NSAttributedString.Key) -> [Any] {
         var allValues = [Any]()
         let fullRange = self.string.fullRange
         let options   = NSAttributedString.EnumerationOptions.longestEffectiveRangeNotRequired
@@ -111,13 +109,12 @@ extension NSAttributedString
         return allValues
     }
 
-    //MARK: - Attribute Checking
+    // MARK: - Attribute Checking
     /**
      Iterates over every font that exists within this NSAttributedString, and checks if any of the fonts contain the desired NSFontTraitMask
      - returns: A boolean value, indicative of if this contains our desired trait
     */
-    public func contains(trait: NSFontTraitMask) -> Bool
-    {
+    func contains(trait: NSFontTraitMask) -> Bool {
         let allFonts = self.all(of: NSAttributedString.Key.font) as! [NSFont]
         for font in allFonts {
             if font.contains(trait: trait) {
@@ -132,8 +129,7 @@ extension NSAttributedString
      Iterates over every font that exists within this NSAttributedString, and checks if any of the fonts contain the desired NSFontTraitMask
      - returns: A boolean value, indicative of if our desired trait could not be found
      */
-    public func doesNotContain(trait: NSFontTraitMask) -> Bool
-    {
+    func doesNotContain(trait: NSFontTraitMask) -> Bool {
         let allFonts = self.all(of: NSAttributedString.Key.font) as! [NSFont]
         for font in allFonts {
             if !font.contains(trait: trait) {
@@ -156,8 +152,7 @@ extension NSAttributedString
      The two arguments are not mutually exclusive since a string can have an attribute at some parts and
      not have the same attributes at other parts.
     */
-    public func check(attribute: NSAttributedString.Key, isNegativeAttr: (_ rawAttrValue: Int) -> Bool) -> (atParts: Bool, notAtParts: Bool)
-    {
+    func check(attribute: NSAttributedString.Key, isNegativeAttr: (_ rawAttrValue: Int) -> Bool) -> (atParts: Bool, notAtParts: Bool) {
         var atParts   : Bool?
         var notAtParts: Bool?
 
@@ -197,4 +192,5 @@ extension NSAttributedString
 
         return (atParts!, notAtParts!)
     }
+
 }

Extensions/NSFont+Traits.swift

@@ -9,15 +9,14 @@
 import Foundation
 import AppKit
 
-extension NSFont
-{
+public extension NSFont {
+
     /**
      Determines the FontTrait's that this font has
      StackOverflow: https://stackoverflow.com/a/38405084
      - returns: The NSFontTraitMask that will contain this font's traits
     */
-    public func fontTraits() -> NSFontTraitMask
-    {
+    var fontTraits: NSFontTraitMask {
         let descriptor = self.fontDescriptor
         let symTraits  = descriptor.symbolicTraits
         let traitSet   = NSFontTraitMask(rawValue: UInt(symTraits.rawValue))
@@ -30,8 +29,7 @@ extension NSFont
      - trait: The NSFontTraitMask that we're looking for
      - returns: A boolean value, indicative of if this contains our desired trait
     */
-    public func contains(trait: NSFontTraitMask) -> Bool
-    {
-        return self.fontTraits().contains(trait)
+    func contains(trait: NSFontTraitMask) -> Bool {
+        return self.fontTraits.contains(trait)
     }
 }

Extensions/NSMenu+Convenience.swift

@@ -9,10 +9,9 @@
 import Foundation
 import AppKit
 
-extension NSMenu
-{
-    public static func fontsMenu(_ title: String?) -> NSMenu
-    {
+public extension NSMenu {
+
+    static func fontsMenu(_ title: String?) -> NSMenu {
         let menu = NSMenu(title: title ?? "Select a Font Family")
 
         let allFontFamilyNames = NSFontManager.shared.availableFontFamilies
@@ -31,8 +30,7 @@ extension NSMenu
         return menu
     }
 
-    public static func fontSizesMenu(_ title: String?) -> NSMenu
-    {
+    static func fontSizesMenu(_ title: String?) -> NSMenu {
         let menu = NSMenu(title: title ?? "Select a Font Size")
 
         let allFontSizes = ["9", "10", "11", "12", "13", "14", "18", "24", "36", "48", "64", "72", "96", "144", "288"]
@@ -50,4 +48,5 @@ extension NSMenu
 
         return menu
     }
+
 }

Extensions/NSTextView+Convenience.swift

@@ -9,7 +9,7 @@
 import Foundation
 import AppKit
 
-extension NSTextView {
+public extension NSTextView {
 
     struct LineInfo {
         let lineNumber: Int
@@ -18,12 +18,12 @@ extension NSTextView {
     }
 
     /// Determines if the user has selected (ie. highlighted) any text
-    public var hasSelectedText: Bool {
+    var hasSelectedText: Bool {
         return self.selectedRange().length > 0
     }
 
     /// The location of our caret within the textview
-    public var caretLocation: Int {
+    var caretLocation: Int {
         return self.selectedRange().location
     }
 
@@ -59,7 +59,7 @@ extension NSTextView {
 
             //If the CaretLocation is between the start of this line, and the end of this line, we can assume that the caret is on this line
             if self.caretLocation >= startOfLine && self.caretLocation <= endOfLine {
-                //Mark the line number
+                // MARK the line number
                 selectedLineNumber = lineNumber
                 selectedLineOfText = substring ?? ""
                 selectedLineRange  = range
@@ -89,7 +89,7 @@ extension NSTextView {
      - returns: A boolean value indicative of if the conversion and setting of
      the HTML string was successful
      */
-    public func set(html: String) -> Bool {
+    func set(html: String) -> Bool {
         guard let htmlData = html.data(using: .utf8) else {
             print("Error creating NSAttributedString, HTML data is nil.")
             return false
@@ -112,7 +112,7 @@ extension NSTextView {
      - returns: A boolean value indicative of if the setting of the NSAttributedString was successful
     */
     @discardableResult
-    public func set(attributedString: NSAttributedString) -> Bool {
+    func set(attributedString: NSAttributedString) -> Bool {
         guard let textStorage = self.textStorage else {
             print("Error setting NSAttributedString, TextStorage is nil.")
             return false
@@ -124,7 +124,7 @@ extension NSTextView {
         return true
     }
 
-    public func iterateThroughAllAttachments() {
+    func iterateThroughAllAttachments() {
         let attachments = self.attributedString().allAttachments
         for attachment in attachments {
             guard let fileWrapper = attachment.fileWrapper else {
@@ -149,7 +149,7 @@ extension NSTextView {
         }
     }
 
-    public func append(_ string: String) {
+    func append(_ string: String) {
         let textViewText = NSMutableAttributedString(attributedString: self.attributedString())
         textViewText.append(NSAttributedString(string: string, attributes: self.typingAttributes))
 

Extensions/String+BulletPoints.swift

@@ -7,14 +7,14 @@
 
 import Foundation
 
-extension String
-{
-    public var isBulletPoint: Bool {
+public extension String {
+
+    var isBulletPoint: Bool {
         return self.hasPrefix(RichEditor.bulletPointMarker)
     }
 
     /// Returns an array of strings that is made up of all the "lines" in this string.
-    public var lines: [String] {
+    var lines: [String] {
         var lines = [String]()
 
         self.enumerateSubstrings(in: self.startIndex..<self.endIndex, options: .byLines) {(substring, substringRange, _, _) in
@@ -24,5 +24,6 @@ extension String
         }
 
         return lines
-    }    
+    }
+
 }

Extensions/String+Convenience.swift

@@ -9,10 +9,11 @@
 import Foundation
 import AppKit
 
-extension String
-{
+public extension String {
+
     /// Conveniently creates an NSRange that covers the very start of this string, to the very end of this string
-    public var fullRange: NSRange {
+    var fullRange: NSRange {
         return NSRange(location: 0, length: self.count)
     }
+
 }

Extensions/URL+Images.swift

@@ -9,14 +9,14 @@
 import Foundation
 import AppKit
 
-extension URL
-{
-    public var icon: NSImage {
+public extension URL {
+
+    var icon: NSImage {
         let icon = NSWorkspace.shared.icon(forFile: self.path)
         return icon
     }
 
-    public var textAttachment: NSTextAttachment {
+    var textAttachment: NSTextAttachment {
         //var data: Data?
         var fileWrapper: FileWrapper?
 
@@ -31,5 +31,5 @@ extension URL
         let attachment = NSTextAttachment(fileWrapper: fileWrapper)
         return attachment
     }
-}
 
+}