Bug 183504 Frames collapse when holding down step over key

2 files changed, 16 insertions, 2 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java
index d87cce838..c41be3965 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java
@@ -91,7 +91,14 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU
 		if (fBatchedRequests == null) {
 			getElementContentProvider().update(new IChildrenCountUpdate[]{this});
 		} else {
-			getElementContentProvider().update((IChildrenCountUpdate[]) fBatchedRequests.toArray(new IChildrenCountUpdate[fBatchedRequests.size()]));
+			IChildrenCountUpdate[] updates = (IChildrenCountUpdate[]) fBatchedRequests.toArray(new IChildrenCountUpdate[fBatchedRequests.size()]);
+			// notify that the other updates have also started to ensure correct sequence
+			// of model updates - **** start at index 1 since the first (0) update has
+			// already notified the content provider that it has started.
+			for (int i = 1; i < updates.length; i++) {
+				getContentProvider().updateStarted((ViewerUpdateMonitor) updates[i]);
+			}
+			getElementContentProvider().update(updates);
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java
index 15f22a094..eb7174c78 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/HasChildrenUpdate.java
@@ -91,7 +91,14 @@ class HasChildrenUpdate extends ViewerUpdateMonitor implements IHasChildrenUpdat
 		if (fBatchedRequests == null) {
 			getElementContentProvider().update(new IHasChildrenUpdate[]{this});
 		} else {
-			getElementContentProvider().update((IHasChildrenUpdate[]) fBatchedRequests.toArray(new IHasChildrenUpdate[fBatchedRequests.size()]));
+			IHasChildrenUpdate[] updates = (IHasChildrenUpdate[]) fBatchedRequests.toArray(new IHasChildrenUpdate[fBatchedRequests.size()]);
+			// notify that the other updates have also started to ensure correct sequence
+			// of model updates - **** start at index 1 since the first (0) update has
+			// already notified the content provider that it has started.
+			for (int i = 1; i < updates.length; i++) {
+				getContentProvider().updateStarted((ViewerUpdateMonitor) updates[i]);
+			}
+			getElementContentProvider().update(updates);
 		}
 	}