Remove internal, Unnecessary Public Extensions

Author: thecoolwinter

Sources/CodeEditInputView/Extensions/NSTextStorage+getLine.swift

@@ -8,7 +8,7 @@
 import AppKit
 
 extension NSString {
-    public func getNextLine(startingAt location: Int) -> NSRange? {
+    func getNextLine(startingAt location: Int) -> NSRange? {
         let range = NSRange(location: location, length: 0)
         var end: Int = NSNotFound
         var contentsEnd: Int = NSNotFound
@@ -22,7 +22,7 @@ extension NSString {
 }
 
 extension NSTextStorage {
-    public func getNextLine(startingAt location: Int) -> NSRange? {
+    func getNextLine(startingAt location: Int) -> NSRange? {
         (self.string as NSString).getNextLine(startingAt: location)
     }
 }

Sources/CodeEditInputView/TextLayoutManager/TextLayoutManager.swift

@@ -74,13 +74,13 @@ public class TextLayoutManager: NSObject {
     /// The calculated maximum width of all laid out lines.
     /// - Note: This does not indicate *the* maximum width of the text view if all lines have not been laid out.
     ///         This will be updated if it comes across a wider line.
-    internal var maxLineWidth: CGFloat = 0 {
+    var maxLineWidth: CGFloat = 0 {
         didSet {
             delegate?.layoutManagerMaxWidthDidChange(newWidth: maxLineWidth + edgeInsets.horizontal)
         }
     }
     /// The maximum width available to lay out lines in.
-    internal var maxLineLayoutWidth: CGFloat {
+    var maxLineLayoutWidth: CGFloat {
         wrapLines ? (delegate?.textViewportSize().width ?? .greatestFiniteMagnitude) - edgeInsets.horizontal
         : .greatestFiniteMagnitude
     }
@@ -119,7 +119,7 @@ public class TextLayoutManager: NSObject {
 
     /// Prepares the layout manager for use.
     /// Parses the text storage object into lines and builds the `lineStorage` object from those lines.
-    internal func prepareTextLines() {
+    func prepareTextLines() {
         guard lineStorage.count == 0, let textStorage else { return }
         #if DEBUG
         // Grab some performance information if debugging.
@@ -141,7 +141,7 @@ public class TextLayoutManager: NSObject {
     }
 
     /// Resets the layout manager to an initial state.
-    internal func reset() {
+    func reset() {
         lineStorage.removeAll()
         visibleLineIds.removeAll()
         viewReuseQueue.queuedViews.removeAll()
@@ -229,7 +229,7 @@ public class TextLayoutManager: NSObject {
     // MARK: - Layout
 
     /// Lays out all visible lines
-    internal func layoutLines() { // swiftlint:disable:this function_body_length
+    func layoutLines() { // swiftlint:disable:this function_body_length
         guard let visibleRect = delegate?.visibleRect, !isInTransaction, let textStorage else { return }
         CATransaction.begin()
         let minY = max(visibleRect.minY, 0)

Sources/CodeEditInputView/TextLineStorage/TextLineStorage+Node.swift

@@ -8,11 +8,11 @@
 import Foundation
 
 extension TextLineStorage {
-    internal func isRightChild(_ node: Node<Data>) -> Bool {
+    func isRightChild(_ node: Node<Data>) -> Bool {
         node.parent?.right === node
     }
 
-    internal func isLeftChild(_ node: Node<Data>) -> Bool {
+    func isLeftChild(_ node: Node<Data>) -> Bool {
         node.parent?.left === node
     }
 
@@ -34,7 +34,7 @@ extension TextLineStorage {
     /// - Parameters:
     ///   - nodeU: The node to replace.
     ///   - nodeV: The node to insert in place of `nodeU`
-    internal func transplant(_ nodeU: borrowing Node<Data>, with nodeV: Node<Data>?) {
+    func transplant(_ nodeU: borrowing Node<Data>, with nodeV: Node<Data>?) {
         if nodeU.parent == nil {
             root = nodeV
         } else if isLeftChild(nodeU) {
@@ -105,31 +105,31 @@ extension TextLineStorage {
             )
         }
 
-        internal func sibling() -> Node<NodeData>? {
+        func sibling() -> Node<NodeData>? {
             if parent?.left === self {
                 return parent?.right
             } else {
                 return parent?.left
             }
         }
 
-        internal func minimum() -> Node<NodeData> {
+        func minimum() -> Node<NodeData> {
             if let left {
                 return left.minimum()
             } else {
                 return self
             }
         }
 
-        internal func maximum() -> Node<NodeData> {
+        func maximum() -> Node<NodeData> {
             if let right {
                 return right.maximum()
             } else {
                 return self
             }
         }
 
-        internal func getSuccessor() -> Node<NodeData>? {
+        func getSuccessor() -> Node<NodeData>? {
             // If node has right child: successor is the min of this right tree
             if let right {
                 return right.minimum()

Sources/CodeEditInputView/TextLineStorage/TextLineStorage+Structs.swift

@@ -9,15 +9,15 @@ import Foundation
 
 extension TextLineStorage where Data: Identifiable {
     public struct TextLinePosition {
-        internal init(data: Data, range: NSRange, yPos: CGFloat, height: CGFloat, index: Int) {
+        init(data: Data, range: NSRange, yPos: CGFloat, height: CGFloat, index: Int) {
             self.data = data
             self.range = range
             self.yPos = yPos
             self.height = height
             self.index = index
         }
 
-        internal init(position: NodePosition) {
+        init(position: NodePosition) {
             self.data = position.node.data
             self.range = NSRange(location: position.textPos, length: position.node.length)
             self.yPos = position.yPos
@@ -37,7 +37,7 @@ extension TextLineStorage where Data: Identifiable {
         public let index: Int
     }
 
-    internal struct NodePosition {
+    struct NodePosition {
         /// The node storing information and the data stored at the position.
         let node: Node<Data>
         /// The y position of the data, on a top down y axis
@@ -48,7 +48,7 @@ extension TextLineStorage where Data: Identifiable {
         let index: Int
     }
 
-    internal struct NodeSubtreeMetadata {
+    struct NodeSubtreeMetadata {
         let height: CGFloat
         let offset: Int
         let count: Int

Sources/CodeEditInputView/TextLineStorage/TextLineStorage.swift

@@ -30,7 +30,7 @@ public final class TextLineStorage<Data: Identifiable> {
         case none
     }
 
-    internal var root: Node<Data>?
+    var root: Node<Data>?
 
     /// The number of characters in the storage object.
     private(set) public var length: Int = 0

Sources/CodeEditInputView/TextSelectionManager/TextSelectionManager+Update.swift

@@ -39,7 +39,7 @@ extension TextSelectionManager {
         }
     }
 
-    internal func notifyAfterEdit() {
+    func notifyAfterEdit() {
         updateSelectionViews()
         NotificationCenter.default.post(Notification(name: Self.selectionChangedNotification, object: self))
     }

Sources/CodeEditInputView/TextSelectionManager/TextSelectionManager.swift

@@ -23,11 +23,11 @@ public class TextSelectionManager: NSObject {
 
     public class TextSelection: Hashable, Equatable {
         public var range: NSRange
-        internal weak var view: CursorView?
-        internal var boundingRect: CGRect = .zero
-        internal var suggestedXPos: CGFloat?
+        weak var view: CursorView?
+        var boundingRect: CGRect = .zero
+        var suggestedXPos: CGFloat?
         /// The position this selection should 'rotate' around when modifying selections.
-        internal var pivot: Int?
+        var pivot: Int?
 
         init(range: NSRange, view: CursorView? = nil) {
             self.range = range
@@ -79,10 +79,10 @@ public class TextSelectionManager: NSObject {
     public var selectionBackgroundColor: NSColor = NSColor.selectedTextBackgroundColor
 
     internal(set) public var textSelections: [TextSelection] = []
-    internal weak var layoutManager: TextLayoutManager?
-    internal weak var textStorage: NSTextStorage?
-    internal weak var layoutView: NSView?
-    internal weak var delegate: TextSelectionManagerDelegate?
+    weak var layoutManager: TextLayoutManager?
+    weak var textStorage: NSTextStorage?
+    weak var layoutView: NSView?
+    weak var delegate: TextSelectionManagerDelegate?
 
     init(
         layoutManager: TextLayoutManager,
@@ -183,7 +183,7 @@ public class TextSelectionManager: NSObject {
         }
     }
 
-    internal func removeCursors() {
+    func removeCursors() {
         for textSelection in textSelections {
             textSelection.view?.removeFromSuperview()
         }
@@ -193,7 +193,7 @@ public class TextSelectionManager: NSObject {
 
     /// Draws line backgrounds and selection rects for each selection in the given rect.
     /// - Parameter rect: The rect to draw in.
-    internal func drawSelections(in rect: NSRect) {
+    func drawSelections(in rect: NSRect) {
         guard let context = NSGraphicsContext.current?.cgContext else { return }
         context.saveGState()
         var highlightedLines: Set<UUID> = []

Sources/CodeEditInputView/TextView/TextView+Drag.swift

@@ -26,7 +26,7 @@ extension TextView: NSDraggingSource {
         }
     }
 
-    internal func setUpDragGesture() {
+    func setUpDragGesture() {
         let dragGesture = DragSelectionGesture(target: self, action: #selector(dragGestureHandler(_:)))
         dragGesture.minimumPressDuration = NSEvent.doubleClickInterval / 3
         dragGesture.isEnabled = isSelectable

Sources/CodeEditInputView/TextView/TextView+Setup.swift

@@ -8,7 +8,7 @@
 import AppKit
 
 extension TextView {
-    internal func setUpLayoutManager(lineHeightMultiplier: CGFloat, wrapLines: Bool) -> TextLayoutManager {
+    func setUpLayoutManager(lineHeightMultiplier: CGFloat, wrapLines: Bool) -> TextLayoutManager {
         TextLayoutManager(
             textStorage: textStorage,
             lineHeightMultiplier: lineHeightMultiplier,
@@ -18,7 +18,7 @@ extension TextView {
         )
     }
 
-    internal func setUpSelectionManager() -> TextSelectionManager {
+    func setUpSelectionManager() -> TextSelectionManager {
         TextSelectionManager(
             layoutManager: layoutManager,
             textStorage: textStorage,

Sources/CodeEditInputView/TextView/TextView.swift

@@ -195,9 +195,9 @@ public class TextView: NSView, NSTextContent {
 
     // MARK: - Private Properties
 
-    internal var isFirstResponder: Bool = false
-    internal var mouseDragAnchor: CGPoint?
-    internal var mouseDragTimer: Timer?
+    var isFirstResponder: Bool = false
+    var mouseDragAnchor: CGPoint?
+    var mouseDragTimer: Timer?
 
     private var fontCharWidth: CGFloat {
         (" " as NSString).size(withAttributes: [.font: font]).width
@@ -211,7 +211,7 @@ public class TextView: NSView, NSTextContent {
         return enclosingScrollView
     }
 
-    internal var storageDelegate: MultiStorageDelegate!
+    var storageDelegate: MultiStorageDelegate!
 
     // MARK: - Init