Merge pull request #162 from HeMet/nsrange-bridging-fix

Fix Range to NSRange conversion. NSRange.length calculated properly now.

Author: phausler

Foundation/NSRange.swift

@@ -39,7 +39,7 @@ extension _NSRange {
     public init(_ x: Range<Int>) {
         if let start = x.first {
             if let end = x.last {
-                self.init(location: start, length: end - start)
+                self.init(location: start, length: end - start + 1)
                 return
             }
         }

TestFoundation/TestNSRange.swift

@@ -23,6 +23,7 @@ class TestNSRange : XCTestCase {
         return [
             // currently disabled due to pending requirements for NSString
             // ("test_NSRangeFromString", test_NSRangeFromString ),
+            ("test_NSRangeBridging", test_NSRangeBridging)
         ]
     }
 
@@ -58,4 +59,11 @@ class TestNSRange : XCTestCase {
             XCTAssert(NSEqualRanges(NSRangeFromString(string), fullRange))
         }
     }
+    
+    func test_NSRangeBridging() {
+        let swiftRange = 1..<7
+        let range = NSRange(swiftRange)
+        let swiftRange2 = range.toRange()
+        XCTAssertEqual(swiftRange, swiftRange2)
+    }
 }