Skip to content

Commit 2777706

Browse files
Refactor
1 parent 6955a7a commit 2777706

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//
2+
// CursorSelectionMode.swift
3+
// CodeEditTextView
4+
//
5+
// Created by Abe Malla on 3/31/25.
6+
//
7+
8+
enum CursorSelectionMode {
9+
case character
10+
case word
11+
case line
12+
}

Sources/CodeEditTextView/TextSelectionManager/TextSelection.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ public extension TextSelectionManager {
3434
lhs.range == rhs.range
3535
}
3636
}
37-
38-
enum SelectionMode {
39-
case character
40-
case word
41-
case line
42-
}
4337
}
4438

4539
private extension TextSelectionManager.TextSelection {

Sources/CodeEditTextView/TextView/TextView+Mouse.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ extension TextView {
4242
/// if shift, we extend the selection to the click location
4343
/// else we set the cursor
4444
fileprivate func handleSingleClick(event: NSEvent, offset: Int) {
45-
selectionMode = .character
45+
cursorSelectionMode = .character
4646

4747
guard isEditable else {
4848
super.mouseDown(with: event)
@@ -61,7 +61,7 @@ extension TextView {
6161
}
6262

6363
fileprivate func handleDoubleClick(event: NSEvent) {
64-
selectionMode = .word
64+
cursorSelectionMode = .word
6565

6666
guard !event.modifierFlags.contains(.shift) else {
6767
super.mouseDown(with: event)
@@ -72,7 +72,7 @@ extension TextView {
7272
}
7373

7474
fileprivate func handleTripleClick(event: NSEvent) {
75-
selectionMode = .line
75+
cursorSelectionMode = .line
7676

7777
guard !event.modifierFlags.contains(.shift) else {
7878
super.mouseDown(with: event)
@@ -104,7 +104,7 @@ extension TextView {
104104
return
105105
}
106106

107-
switch selectionMode {
107+
switch cursorSelectionMode {
108108
case .character:
109109
selectionManager.setSelectedRange(
110110
NSRange(

Sources/CodeEditTextView/TextView/TextView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public class TextView: NSView, NSTextContent {
248248
var isFirstResponder: Bool = false
249249
var mouseDragAnchor: CGPoint?
250250
var mouseDragTimer: Timer?
251-
var selectionMode: TextSelectionManager.SelectionMode = .character
251+
var cursorSelectionMode: CursorSelectionMode = .character
252252

253253
private var fontCharWidth: CGFloat {
254254
(" " as NSString).size(withAttributes: [.font: font]).width

0 commit comments

Comments
 (0)