Update tab bar sanity check to log when dragging ends (it was called too soon)...

Update tab bar sanity check to log when dragging ends (it was called too soon) and to log more info. Issue 5055

ThirdParty/PSMTabBarControl/source/PSMTabBarControl.m

@@ -226,7 +226,12 @@ const NSInteger kPSMStartResizeAnimation = 0;
 }
 - (void)sanityCheck:(NSString *)callsite {
-    if ([[PSMTabDragAssistant sharedDragAssistant] isDragging]) {
+    [self sanityCheck:callsite force:NO];
+}
+
+- (void)sanityCheck:(NSString *)callsite force:(BOOL)force {
+    if (!force && [[PSMTabDragAssistant sharedDragAssistant] isDragging]) {
+        ILog(@"Skip sanity check during drag from callsite %@", callsite);
         return;
     }
     if (self.tabView.tabViewItems.count != self.cells.count) {
@@ -239,6 +244,7 @@ const NSInteger kPSMStartResizeAnimation = 0;
                 [self sanityCheckFailedWithCallsite:callsite reason:@"cells[i].representedObject != tabView.tabViewItems[i].representedObject"];
             }
         }
+        NSLog(@"Sanity check passed. cells=%@. tabView.tabViewITems=%@", self.cells, self.tabView.tabViewItems);
     }
 }

ThirdParty/PSMTabBarControl/source/PSMTabDragAssistant.m

@@ -439,17 +439,23 @@
                                  didDropTabViewItem:[[self draggedCell] representedObject]
                                            inTabBar:[self destinationTabBar]];
         }
-        [[self destinationTabBar] sanityCheck:@"destination performDragOperation"];
-        [[self sourceTabBar] sanityCheck:@"source performDragOperation"];
     }
     [[NSNotificationCenter defaultCenter] postNotificationName:PSMTabDragDidEndNotification object:nil];
+    PSMTabBarControl *destination = [[[self destinationTabBar] retain] autorelease];
+    PSMTabBarControl *source = [[[self sourceTabBar] retain] autorelease];
+
     [self finishDrag];
+
+    [destination sanityCheck:@"destination performDragOperation"];
+    [source sanityCheck:@"source performDragOperation"];
 }
 - (void)draggedImageEndedAt:(NSPoint)aPoint operation:(NSDragOperation)operation {
     if ([self isDragging]) {  // means there was not a successful drop (performDragOperation)
+        PSMTabBarControl *destination = [[[self destinationTabBar] retain] autorelease];
+        PSMTabBarControl *source = [[[self sourceTabBar] retain] autorelease];
         id sourceDelegate = [[self sourceTabBar] delegate];
         //split off the dragged tab into a new window
@@ -520,7 +526,7 @@
                 }
                 [control sanityCheck:@"add dragged tab to new window"];
             } else {
-                NSLog(@"Delegate returned no control to add to.");
+                ELog(@"Delegate returned no control to add to.");
                 [[[self sourceTabBar] cells] insertObject:[self draggedCell] atIndex:[self draggedCellIndex]];
                 [[[self sourceTabBar] window] setAlphaValue:1];  // Make the window visible again.
                 [[[self sourceTabBar] window] orderFront:nil];
@@ -536,6 +542,9 @@
         [[NSNotificationCenter defaultCenter] postNotificationName:PSMTabDragDidEndNotification object:nil];
         [self finishDrag];
+
+        [source sanityCheck:@"draggedImageEndedAt - source"];
+        [destination sanityCheck:@"draggedImageEndedAt - destination"];
     }
 }

ThirdParty/PSMTabBarControl/source/PSMTabStyle.h

@@ -62,5 +62,6 @@ Protocol to be observed by all style delegate objects.  These objects handle the
 - (NSMutableArray *)cells;
 - (void)sanityCheck:(NSString *)callsite;
+- (void)sanityCheck:(NSString *)callsite force:(BOOL)force;
 @end