support DOS newlines in NSString.lineAndCharacterForByteOffset(_:)

Fixes realm/SwiftLint#315
jpsim · Mar 10, 2016 · 3ff57ab · 3ff57ab
1 parent 66f0ef0
commit 3ff57ab
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Source/SourceKittenFramework/String+SourceKitten.swift b/Source/SourceKittenFramework/String+SourceKitten.swift
@@ -176,9 +176,14 @@ extension NSString {
                 if length == line.byteRange.length {
                     character = content.utf16.count
                 } else {
-                    let endIndex = content.utf8.startIndex.advancedBy(length)
-                        .samePositionIn(content.utf16) ?? content.utf16.endIndex
-                    character = content.utf16.startIndex.distanceTo(endIndex)
+                    let fullLength = content.utf8.startIndex.distanceTo(content.utf8.endIndex)
+                    if fullLength < length {
+                        character = fullLength
+                    } else {
+                        let endIndex = content.utf8.startIndex.advancedBy(length)
+                            .samePositionIn(content.utf16) ?? content.utf16.endIndex
+                        character = content.utf16.startIndex.distanceTo(endIndex)
+                    }
                 }
                 return (line: line.index, character: character)
             }