Fix Cummualtive Range Offset

CodeEditApp · Jun 22, 2024 · 146fd17 · 146fd17
1 parent 28afd25
commit 146fd17
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 22 deletions.
diff --git a/Sources/CodeEditTextView/MarkedTextManager/MarkedTextManager.swift b/Sources/CodeEditTextView/MarkedTextManager/MarkedTextManager.swift
@@ -47,30 +47,21 @@ class MarkedTextManager {
     /// - Parameters:
     ///   - insertLength: The length of the string being inserted.
     ///   - textSelections: The current text selections.
-    func updateMarkedRanges(
-        insertLength: Int,
-        textSelections: [NSRange]
-    ) {
+    func updateMarkedRanges(insertLength: Int, textSelections: [NSRange]) {
         var cumulativeExistingDiff = 0
-        if markedRanges.isEmpty {
-            let lengthDiff = insertLength
-            var newRanges = [NSRange]()
-            for (idx, range) in textSelections.sorted(by: { $0.location < $1.location }).enumerated() {
-                let rangeOffset = (lengthDiff * idx) - cumulativeExistingDiff
-                newRanges.append(NSRange(location: range.location + rangeOffset, length: insertLength))
-                cumulativeExistingDiff += range.length
-            }
-            markedRanges = newRanges
-        } else if let firstRange = markedRanges.first {
-            let lengthDiff = insertLength - firstRange.length
-            var newRanges = [NSRange]()
-            for (idx, range) in markedRanges.sorted(by: { $0.location < $1.location }).enumerated() {
-                let rangeOffset = (lengthDiff * idx) - cumulativeExistingDiff
-                newRanges.append(NSRange(location: range.location + rangeOffset, length: insertLength))
-                cumulativeExistingDiff += range.length
-            }
-            markedRanges = newRanges
+        let lengthDiff = insertLength
+        var newRanges = [NSRange]()
+        let ranges: [NSRange] = if markedRanges.isEmpty {
+            textSelections.sorted(by: { $0.location < $1.location })
+        } else {
+            markedRanges.sorted(by: { $0.location < $1.location })
+        }
+
+        for (idx, range) in ranges.enumerated() {
+            newRanges.append(NSRange(location: range.location + cumulativeExistingDiff, length: insertLength))
+            cumulativeExistingDiff += insertLength - range.length
         }
+        markedRanges = newRanges
     }
 
     /// Finds any marked ranges for a line and returns them.

diff --git a/Sources/CodeEditTextView/TextView/TextView+NSTextInput.swift b/Sources/CodeEditTextView/TextView/TextView+NSTextInput.swift
@@ -107,6 +107,7 @@ extension TextView: NSTextInputClient {
             insertLength: (insertString as NSString).length,
             textSelections: selectionCopies
         )
+
         // Reset the selected ranges to reflect the replaced text.
         selectionManager.setSelectedRanges(layoutManager.markedTextManager.markedRanges.map({
             NSRange(location: $0.max, length: 0)

diff --git a/Tests/CodeEditTextViewTests/MarkedTextTests.swift b/Tests/CodeEditTextViewTests/MarkedTextTests.swift
@@ -68,6 +68,28 @@ class MarkedTextTests: XCTestCase {
         )
     }
 
+    func test_markedTextMultipleSelectionMultipleChar() {
+        let textView = TextView(string: "ABCDE")
+        textView.selectionManager.setSelectedRanges([NSRange(location: 0, length: 1), NSRange(location: 4, length: 1)])
+
+        textView.setMarkedText("´", selectedRange: .notFound, replacementRange: .notFound)
+        XCTAssertEqual(textView.string, "´BCD´")
+
+        textView.setMarkedText("´´´", selectedRange: .notFound, replacementRange: .notFound)
+        XCTAssertEqual(textView.string, "´´´BCD´´´")
+        XCTAssertEqual(
+            textView.selectionManager.textSelections.map(\.range).sorted(by: { $0.location < $1.location }),
+            [NSRange(location: 3, length: 0), NSRange(location: 9, length: 0)]
+        )
+
+        textView.insertText("é", replacementRange: .notFound)
+        XCTAssertEqual(textView.string, "éBCDé")
+        XCTAssertEqual(
+            textView.selectionManager.textSelections.map(\.range).sorted(by: { $0.location < $1.location }),
+            [NSRange(location: 1, length: 0), NSRange(location: 5, length: 0)]
+        )
+    }
+
     func test_cancelMarkedText() {
         let textView = TextView(string: "")
         textView.selectionManager.setSelectedRange(.zero)