commit f9afb90dff42bbc8904ce30ba9f40c38b920a950
author Anton Pogonets <zayass@gmail.com> Thu Feb 22 22:00:22 2018 +0200
committer Tony Parker <anthony.parker@apple.com> Thu Feb 22 12:00:22 2018 -0800
tree d2538adedcb81d5279da69512abc66134801de3b
parent 0fd1ce653826d04041a138d4ce28085f8a1369eb

Fix IndexSet/NSIndexSet range merging (#1434)

Foundation/NSIndexSet.swift

diff --git a/Foundation/NSIndexSet.swift b/Foundation/NSIndexSet.swift
index 3b03f3b..5214318 100644
--- a/Foundation/NSIndexSet.swift
+++ b/Foundation/NSIndexSet.swift
@@ -589,7 +589,7 @@
             let nextRange = _ranges[rangeIndex + 1]
             let currentEnd = currentRange.location + currentRange.length
             let nextEnd = nextRange.location + nextRange.length
-            if nextEnd >= nextRange.location {
+            if currentEnd >= nextRange.location {
                 // overlaps
                 if currentEnd < nextEnd {
                     // next range extends beyond current range

TestFoundation/TestIndexSet.swift

diff --git a/TestFoundation/TestIndexSet.swift b/TestFoundation/TestIndexSet.swift
index 95c0fe5..9eff873 100644
--- a/TestFoundation/TestIndexSet.swift
+++ b/TestFoundation/TestIndexSet.swift
@@ -57,6 +57,13 @@
             ("test_AnyHashableContainingIndexSet", test_AnyHashableContainingIndexSet),
             ("test_AnyHashableCreatedFromNSIndexSet", test_AnyHashableCreatedFromNSIndexSet),
             ("test_unconditionallyBridgeFromObjectiveC", test_unconditionallyBridgeFromObjectiveC),
+            ("testInsertNonOverlapping", testInsertNonOverlapping),
+            ("testInsertOverlapping", testInsertOverlapping),
+            ("testInsertOverlappingExtend", testInsertOverlappingExtend),
+            ("testInsertOverlappingMultiple", testInsertOverlappingMultiple),
+            ("testRemoveNonOverlapping", testRemoveNonOverlapping),
+            ("testRemoveOverlapping", testRemoveOverlapping),
+            ("testRemoveSplitting", testRemoveSplitting),
         ]
     }
     
@@ -1082,4 +1089,120 @@
     func test_unconditionallyBridgeFromObjectiveC() {
         XCTAssertEqual(IndexSet(), IndexSet._unconditionallyBridgeFromObjectiveC(nil))
     }
+
+    func testInsertNonOverlapping() {
+        var tested = IndexSet()
+        tested.insert(integersIn: 1..<2)
+        tested.insert(integersIn: 100..<200)
+        tested.insert(integersIn: 1000..<2000)
+
+        tested.insert(200)
+
+        var expected = IndexSet()
+        expected.insert(integersIn: 1..<2)
+        expected.insert(integersIn: 100..<201)
+        expected.insert(integersIn: 1000..<2000)
+
+        XCTAssertEqual(tested, expected)
+    }
+
+    func testInsertOverlapping() {
+        var tested = IndexSet()
+        tested.insert(integersIn: 1..<2)
+        tested.insert(integersIn: 100..<200)
+        tested.insert(integersIn: 1000..<2000)
+        tested.insert(integersIn: 10000..<20000)
+
+        tested.insert(integersIn: 150..<1500)
+
+        var expected = IndexSet()
+        expected.insert(integersIn: 1..<2)
+        expected.insert(integersIn: 100..<2000)
+        expected.insert(integersIn: 10000..<20000)
+
+        XCTAssertEqual(tested, expected)
+    }
+
+    func testInsertOverlappingExtend() {
+        var tested = IndexSet()
+        tested.insert(integersIn: 1..<2)
+        tested.insert(integersIn: 100..<200)
+        tested.insert(integersIn: 1000..<2000)
+
+        tested.insert(integersIn: 50..<500)
+
+        var expected = IndexSet()
+        expected.insert(integersIn: 1..<2)
+        expected.insert(integersIn: 50..<500)
+        expected.insert(integersIn: 1000..<2000)
+
+        XCTAssertEqual(tested, expected)
+    }
+
+    func testInsertOverlappingMultiple() {
+        var tested = IndexSet()
+        tested.insert(integersIn: 1..<2)
+        tested.insert(integersIn: 100..<200)
+        tested.insert(integersIn: 1000..<2000)
+        tested.insert(integersIn: 10000..<20000)
+
+        tested.insert(integersIn: 150..<3000)
+
+        var expected = IndexSet()
+        expected.insert(integersIn: 1..<2)
+        expected.insert(integersIn: 100..<3000)
+        expected.insert(integersIn: 10000..<20000)
+
+        XCTAssertEqual(tested, expected)
+    }
+
+    func testRemoveNonOverlapping() {
+        var tested = IndexSet()
+        tested.insert(integersIn: 1..<2)
+        tested.insert(integersIn: 100..<200)
+        tested.insert(integersIn: 1000..<2000)
+
+        tested.remove(199)
+
+        var expected = IndexSet()
+        expected.insert(integersIn: 1..<2)
+        expected.insert(integersIn: 100..<199)
+        expected.insert(integersIn: 1000..<2000)
+
+        XCTAssertEqual(tested, expected)
+    }
+
+    func testRemoveOverlapping() {
+        var tested = IndexSet()
+        tested.insert(integersIn: 1..<2)
+        tested.insert(integersIn: 100..<200)
+        tested.insert(integersIn: 1000..<2000)
+
+        tested.remove(integersIn: 150..<1500)
+
+        var expected = IndexSet()
+        expected.insert(integersIn: 1..<2)
+        expected.insert(integersIn: 100..<150)
+        expected.insert(integersIn: 1500..<2000)
+
+        XCTAssertEqual(tested, expected)
+    }
+
+    func testRemoveSplitting() {
+        var tested = IndexSet()
+        tested.insert(integersIn: 1..<2)
+        tested.insert(integersIn: 100..<200)
+        tested.insert(integersIn: 1000..<2000)
+
+        tested.remove(integersIn: 150..<160)
+
+        var expected = IndexSet()
+        expected.insert(integersIn: 1..<2)
+        expected.insert(integersIn: 100..<150)
+        expected.insert(integersIn: 160..<200)
+        expected.insert(integersIn: 1000..<2000)
+
+        XCTAssertEqual(tested, expected)
+    }
+
 }