coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-10-06 07:27:56 +03:00
Code Issues Projects Releases Wiki Activity

Resume "Select word" on top of document (close #1167)

Browse Source
This commit is contained in:
1024jp 2021-06-10 15:55:23 +09:00
parent 2e83d52017
commit b4c215f0de
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ Change Log
### Improvements
- Resume "Select word" on top of the document if the search reached the end.
- Minimize scrolling when focusing on a text such as in text search and outline selection.

18
CotEditor/Sources/EditorTextView+CursorMovement.swift
View File

@ -480,14 +480,26 @@ extension EditorTextView {
self.selectedRanges = self.insertionRanges.map { self.wordRange(at: $0.location) } as [NSValue]
} else {
let selectedRanges = self.selectedRanges.map(\.rangeValue)
// select next instance
guard let lastRange = self.selectedRanges.last as? NSRange else { return assertionFailure() }
guard let lastRange = selectedRanges.last else { return assertionFailure() }
let string = self.string as NSString
let selectedWord = string.substring(with: lastRange)
let nextRange = string.range(of: selectedWord, range: NSRange(lastRange.upperBound..<string.length))
var nextRange = string.range(of: selectedWord, range: NSRange(lastRange.upperBound..<string.length))
guard nextRange != .notFound else { return }
// resume from the top of the document
if nextRange == .notFound {
var location = 0
repeat {
nextRange = string.range(of: selectedWord, range: NSRange(location..<lastRange.lowerBound))
location = nextRange.upperBound
guard nextRange != .notFound else { return }
} while selectedRanges.contains(where: { $0.intersects(nextRange) })
}
self.selectedRanges.append(NSValue(range: nextRange))
self.scrollRangeToVisible(nextRange)