coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 19:27:30 +03:00
Code Issues Projects Releases Wiki Activity

Fix FuzzyRange

Browse Source
This commit is contained in:
1024jp 2024-06-27 23:19:38 +09:00
parent e5a4cf39c0
commit e76d2995ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/EditorKit/Sources/FuzzyRange/String+FuzzyRange.swift
View File

@ -71,7 +71,7 @@ public extension String {
/// - Returns: A character range, or `nil` if the given value is out of range.
func rangeForLine(in lineRange: FuzzyRange, includingLineEnding: Bool = true) -> NSRange? {
let length = self.utf16.count
let length = (self as NSString).length
let pattern = includingLineEnding ? "(?<=\\A|\\R).*(?:\\R|\\z)" : "(?<=\\A|\\R).*$"
let regex = try! NSRegularExpression(pattern: pattern, options: .anchorsMatchLines)
let lineRanges = regex.matches(in: self, range: NSRange(..<length)).map(\.range)
@ -87,7 +87,7 @@ public extension String {
default: lineRange.length - 1
}
guard lineRanges.count <= newLocation + newLength else { return nil }
guard lineRanges.indices.contains(newLocation + newLength) else { return nil }
let firstLineRange = lineRanges[newLocation]
let lastLineRange = lineRanges[newLocation + newLength]