Merge pull request #737 from norio-nomura/fix-sr-3366
diff --git a/Foundation/NSScanner.swift b/Foundation/NSScanner.swift
index 28ec5c1..9cb3b58 100644
--- a/Foundation/NSScanner.swift
+++ b/Foundation/NSScanner.swift
@@ -168,6 +168,7 @@
buffer.withUnsafeMutableBufferPointer({ (ptr: inout UnsafeMutableBufferPointer<unichar>) -> Void in
string.getCharacters(ptr.baseAddress!, range: range)
})
+ curChar = buffer[bufferLoc - 1]
} else {
bufferLoc = 0
curChar = _NSStringBuffer.EndCharacter
diff --git a/TestFoundation/TestNSString.swift b/TestFoundation/TestNSString.swift
index 9abe6f8..0671f99 100644
--- a/TestFoundation/TestNSString.swift
+++ b/TestFoundation/TestNSString.swift
@@ -94,6 +94,7 @@
("test_utf16StringRangeCount", test_StringUTF16ViewIndexStrideableRange),
("test_reflection", { _ in test_reflection }),
("test_replacingOccurrences", test_replacingOccurrences),
+ ("test_getLineStart", test_getLineStart),
]
}
@@ -1031,6 +1032,30 @@
let mutableString = NSMutableString(string: "Test")
XCTAssertEqual(mutableString, "Test")
}
+
+ func test_getLineStart() {
+ // offset 012345 678901
+ let twoLines = "line1\nline2\n"
+ var outStartIndex = twoLines.startIndex
+ var outEndIndex = twoLines.startIndex
+ var outContentsEndIndex = twoLines.startIndex
+
+ twoLines.getLineStart(&outStartIndex, end: &outEndIndex,
+ contentsEnd: &outContentsEndIndex,
+ for: outEndIndex..<outEndIndex)
+
+ XCTAssertEqual(outStartIndex, twoLines.startIndex)
+ XCTAssertEqual(outContentsEndIndex, twoLines.index(twoLines.startIndex, offsetBy: 5))
+ XCTAssertEqual(outEndIndex, twoLines.index(twoLines.startIndex, offsetBy: 6))
+
+ twoLines.getLineStart(&outStartIndex, end: &outEndIndex,
+ contentsEnd: &outContentsEndIndex,
+ for: outEndIndex..<outEndIndex)
+
+ XCTAssertEqual(outStartIndex, twoLines.index(twoLines.startIndex, offsetBy: 6))
+ XCTAssertEqual(outContentsEndIndex, twoLines.index(twoLines.startIndex, offsetBy: 11))
+ XCTAssertEqual(outEndIndex, twoLines.index(twoLines.startIndex, offsetBy: 12))
+ }
}
struct ComparisonTest {
