Remove duplicate steps while coalescing changes in _ASHierarchyChangeSet

Author: nguyenhuy

AsyncDisplayKit/Private/_ASHierarchyChangeSet.m

@@ -222,8 +222,9 @@ + (void)sortAndCoalesceChanges:(NSMutableArray *)changes
 
   NSEnumerationOptions options = type == _ASHierarchyChangeTypeDelete ? NSEnumerationReverse : kNilOptions;
   [allIndexes enumerateIndexesWithOptions:options usingBlock:^(NSUInteger idx, __unused BOOL * stop) {
-    
     ASDataControllerAnimationOptions options = [animationOptions[@(idx)] integerValue];
+    BOOL endingCurrentGroup = NO;
+    
     if (currentIndexes == nil) {
       // Starting a new group
       currentIndexes = [NSMutableIndexSet indexSetWithIndex:idx];
@@ -232,21 +233,19 @@ + (void)sortAndCoalesceChanges:(NSMutableArray *)changes
       // Continuing the current group
       [currentIndexes addIndex:idx];
     } else {
-      // Ending the current group
+      endingCurrentGroup = YES;
+    }
+    
+    BOOL endingLastGroup = (currentIndexes != nil && allIndexes.lastIndex == idx);
+    
+    if (endingCurrentGroup || endingLastGroup) {
       _ASHierarchySectionChange *change = [[_ASHierarchySectionChange alloc] initWithChangeType:type indexSet:currentIndexes animationOptions:currentOptions];
       [result addObject:change];
       currentOptions = 0;
       currentIndexes = nil;
     }
   }];
 
-  if (currentIndexes != nil) {
-    // Ending the last group
-    _ASHierarchySectionChange *change = [[_ASHierarchySectionChange alloc] initWithChangeType:type indexSet:currentIndexes animationOptions:currentOptions];
-    [result addObject:change];
-    currentOptions = 0;
-    currentIndexes = nil;
-  }
   [changes setArray:result];
 }
 
@@ -304,9 +303,12 @@ + (void)sortAndCoalesceChanges:(NSMutableArray *)changes ignoringChangesInSectio
 
   ASDataControllerAnimationOptions currentOptions = 0;
   NSMutableArray *currentIndexPaths = nil;
+  NSIndexPath *lastIndexPath = allIndexPaths.lastObject;
 
   for (NSIndexPath *indexPath in allIndexPaths) {
     ASDataControllerAnimationOptions options = [animationOptions[indexPath] integerValue];
+    BOOL endingCurrentGroup = NO;
+    
     if (currentIndexPaths == nil) {
       // Starting a new group
       currentIndexPaths = [NSMutableArray arrayWithObject:indexPath];
@@ -315,21 +317,19 @@ + (void)sortAndCoalesceChanges:(NSMutableArray *)changes ignoringChangesInSectio
       // Continuing the current group
       [currentIndexPaths addObject:indexPath];
     } else {
-      // Ending the current group
+      endingCurrentGroup = YES;
+    }
+    
+    BOOL endingLastGroup = (currentIndexPaths != nil && (NSOrderedSame == [lastIndexPath compare:indexPath]));
+
+    if (endingCurrentGroup || endingLastGroup) {
       _ASHierarchyItemChange *change = [[_ASHierarchyItemChange alloc] initWithChangeType:type indexPaths:currentIndexPaths animationOptions:currentOptions presorted:YES];
       [result addObject:change];
       currentOptions = 0;
       currentIndexPaths = nil;
     }
   }
 
-  if (currentIndexPaths != nil) {
-    // Ending the last group
-    _ASHierarchyItemChange *change = [[_ASHierarchyItemChange alloc] initWithChangeType:type indexPaths:currentIndexPaths animationOptions:currentOptions presorted:YES];
-    [result addObject:change];
-    currentOptions = 0;
-    currentIndexPaths = nil;
-  }
   [changes setArray:result];
 }