Clean Up

Author: thecoolwinter

Sources/CodeEditTextView/TextSelectionManager/TextSelectionManager.swift

@@ -95,6 +95,7 @@ public class TextSelectionManager: NSObject {
                 (0...(textStorage?.length ?? 0)).contains($0.location)
                 && (0...(textStorage?.length ?? 0)).contains($0.max)
             }
+            .sorted(by: { $0.location < $1.location })
             .map {
                 let selection = TextSelection(range: $0)
                 selection.suggestedXPos = layoutManager?.rectForOffset($0.location)?.minX
@@ -127,6 +128,7 @@ public class TextSelectionManager: NSObject {
         }
         if !didHandle {
             textSelections.append(newTextSelection)
+            textSelections.sort(by: { $0.range.location < $1.range.location })
         }
 
         updateSelectionViews()

Sources/CodeEditTextView/TextView/TextView+ColumnSelection.swift

@@ -0,0 +1,50 @@
+//
+//  TextView+ColumnSelection.swift
+//  CodeEditTextView
+//
+//  Created by Khan Winter on 6/19/25.
+//
+
+import AppKit
+
+extension TextView {
+    /// Set the user's selection to a square region in the editor.
+    ///
+    /// This method will automatically determine a valid region from the provided two points.
+    /// - Parameters:
+    ///   - pointA: The first point.
+    ///   - pointB: The second point.
+    public func selectColumns(betweenPointA pointA: CGPoint, pointB: CGPoint) {
+        let start = CGPoint(x: min(pointA.x, pointB.x), y: min(pointA.y, pointB.y))
+        let end = CGPoint(x: max(pointA.x, pointB.x), y: max(pointA.y, pointB.y))
+
+        // Collect all overlapping text ranges
+        var selectedRanges: [NSRange] = layoutManager.linesStartingAt(start.y, until: end.y).flatMap { textLine in
+            // Collect fragment ranges
+            return textLine.data.lineFragments.compactMap { lineFragment -> NSRange? in
+                let startOffset = self.layoutManager.textOffsetAtPoint(
+                    start,
+                    fragmentPosition: lineFragment,
+                    linePosition: textLine
+                )
+                let endOffset = self.layoutManager.textOffsetAtPoint(
+                    end,
+                    fragmentPosition: lineFragment,
+                    linePosition: textLine
+                )
+                guard let startOffset, let endOffset else { return nil }
+
+                return NSRange(start: startOffset, end: endOffset)
+            }
+        }
+
+        // If we have some non-cursor selections, filter out any cursor selections
+        if selectedRanges.contains(where: { !$0.isEmpty }) {
+            selectedRanges = selectedRanges.filter({
+                !$0.isEmpty || (layoutManager.rectForOffset($0.location)?.origin.x.approxEqual(start.x) ?? false)
+            })
+        }
+
+        selectionManager.setSelectedRanges(selectedRanges)
+    }
+}

Sources/CodeEditTextView/TextView/TextView+KeyDown.swift

@@ -52,8 +52,10 @@ extension TextView {
         super.flagsChanged(with: event)
 
         let modifierFlags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
-        if modifierFlags.contains(.option) != isOptionPressed {
-            isOptionPressed = modifierFlags.contains(.option)
+        let modifierFlagsIsOption = modifierFlags == [.option]
+
+        if modifierFlagsIsOption != isOptionPressed {
+            isOptionPressed = modifierFlagsIsOption
             resetCursorRects()
         }
     }

Sources/CodeEditTextView/TextView/TextView+Mouse.swift

@@ -136,6 +136,8 @@ extension TextView {
         setNeedsDisplay()
     }
 
+    // MARK: - Mouse Autoscroll
+
     /// Sets up a timer that fires at a predetermined period to autoscroll the text view.
     /// Ensure the timer is disabled using ``disableMouseAutoscrollTimer``.
     func setUpMouseAutoscrollTimer() {
@@ -155,6 +157,8 @@ extension TextView {
         mouseDragTimer = nil
     }
 
+    // MARK: - Drag Selection
+
     private func dragSelection(startPosition: Int, endPosition: Int, mouseDragAnchor: CGPoint) {
         switch cursorSelectionMode {
         case .character:
@@ -196,41 +200,6 @@ extension TextView {
     private func dragColumnSelection(mouseDragAnchor: CGPoint, event: NSEvent) {
         // Drag the selection and select in columns
         let eventLocation = convert(event.locationInWindow, from: nil)
-
-        let start = CGPoint(
-            x: min(mouseDragAnchor.x, eventLocation.x),
-            y: min(mouseDragAnchor.y, eventLocation.y)
-        )
-        let end = CGPoint(
-            x: max(mouseDragAnchor.x, eventLocation.x),
-            y: max(mouseDragAnchor.y, eventLocation.y)
-        )
-
-        // Collect all overlapping text ranges
-        var selectedRanges: [NSRange] = layoutManager.linesStartingAt(start.y, until: end.y).flatMap { textLine in
-            // Collect fragment ranges
-            return textLine.data.lineFragments.compactMap { lineFragment -> NSRange? in
-                let startOffset = self.layoutManager.textOffsetAtPoint(
-                    start,
-                    fragmentPosition: lineFragment,
-                    linePosition: textLine
-                )
-                let endOffset = self.layoutManager.textOffsetAtPoint(
-                    end,
-                    fragmentPosition: lineFragment,
-                    linePosition: textLine
-                )
-                guard let startOffset, let endOffset else { return nil }
-
-                return NSRange(start: startOffset, end: endOffset)
-            }
-        }
-
-        // If we have some non-cursor selections, filter out any cursor selections
-        if selectedRanges.contains(where: { !$0.isEmpty }) {
-            selectedRanges = selectedRanges.filter({ !$0.isEmpty })
-        }
-
-        selectionManager.setSelectedRanges(selectedRanges)
+        selectColumns(betweenPointA: eventLocation, pointB: mouseDragAnchor)
     }
 }