Fix selection when highlighting a word

usecanvas · Jun 22, 2016 · 8e24c00 · 8e24c00
1 parent bbdb01b
commit 8e24c00
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/Sources/SelectionController.swift b/Sources/SelectionController.swift
@@ -18,6 +18,10 @@ struct SelectionController {
 		// Inserting
 		if replacementLength > 0 {
 
+			if selection.location == replacementRange.location {
+				return NSRange(location: selection.location + replacementLength, length: 0)
+			}
+
 			// Shift selection
 			if replacementRange.max < output.location {
 				output.location += replacementLength - replacementRange.length

diff --git a/Tests/SelectionControllerTests.swift b/Tests/SelectionControllerTests.swift
@@ -150,6 +150,15 @@ class SelectionControllerTests: XCTestCase {
 		XCTAssertEqual(NSRange(location: 10, length: 9), output)
 	}
 
+	func testReplaceAll() {
+		let output = SelectionController.adjust(
+			selection: NSRange(location: 6, length: 5),
+			replacementRange: NSRange(location: 6, length: 5),
+			replacementLength: 1
+		)
+		XCTAssertEqual(NSRange(location: 7, length: 0), output)
+	}
+
 
 	// MARK: - Invalid Input Tests