Merge pull request #2785 from readdle/date-formatter-whitespaces

Allow whitespaces after parsed content in DateFormatter.date(from:)

Author: compnerd

Sources/Foundation/DateFormatter.swift

@@ -64,8 +64,15 @@ open class DateFormatter : Formatter {
         }
 
         // range.length is updated with the last position of the input string that was parsed
-        guard range.length == string.length else {
-            // The whole string was not parsed
+        guard let swiftRange = Range(NSRange(range), in: string) else {
+            fatalError("Incorrect range \(range) in \(string)")
+        }
+        
+        // Apple DateFormatter implementation returns nil
+        // if non-whitespace sharacters are left after parsed content.
+        let remainder = String(string[swiftRange.upperBound...])
+        let characterSet = CharacterSet(charactersIn: remainder)
+        guard CharacterSet.whitespaces.isSuperset(of: characterSet) else {
             return nil
         }
         return date

Tests/Foundation/Tests/TestDateFormatter.swift

@@ -419,6 +419,15 @@ class TestDateFormatter: XCTestCase {
         let d1 = try XCTUnwrap(formatter.date(from: "2018-03-09"))
         XCTAssertEqual(d1.description, "2018-03-09 00:00:00 +0000")
 
+        // DateFormatter should allow any kind of whitespace before and after parsed content
+        let whitespaces = " \t\u{00a0}\u{1680}\u{2000}\u{2001}\u{2002}\u{2003}\u{2004}\u{2005}\u{2006}\u{2007}\u{2008}\u{2009}\u{200a}\u{202f}\u{205f}\u{3000}"
+        let d1Prefix = try XCTUnwrap(formatter.date(from: "\(whitespaces)2018-03-09"))
+        XCTAssertEqual(d1.description, d1Prefix.description)
+        let d1PrefixSuffix = try XCTUnwrap(formatter.date(from: "\(whitespaces)2018-03-09\(whitespaces)"))
+        XCTAssertEqual(d1.description, d1PrefixSuffix.description)
+        let d1Suffix = try XCTUnwrap(formatter.date(from: "2018-03-09\(whitespaces)"))
+        XCTAssertEqual(d1.description, d1Suffix.description)
+        
         formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
         XCTAssertNil(formatter.date(from: "2018-03-09"))
         let d2 = try XCTUnwrap(formatter.date(from: "2018-03-09T10:25:16+01:00"))