diff options
author | Simeon Andreev | 2018-08-28 15:38:23 +0000 |
---|---|---|
committer | Andrey Loskutov | 2018-09-11 13:53:32 +0000 |
commit | 429be954283cd8253bb30b7fd8cd28ff8af5abf0 (patch) | |
tree | c2f55edec1fed17cb3dfb90ad9645f4ad983136c /org.eclipse.debug.ui/ui | |
parent | 244cac5a57dd6207923acaf7daa223aebcd046db (diff) | |
download | eclipse.platform.debug-429be954283cd8253bb30b7fd8cd28ff8af5abf0.tar.gz eclipse.platform.debug-429be954283cd8253bb30b7fd8cd28ff8af5abf0.tar.xz eclipse.platform.debug-429be954283cd8253bb30b7fd8cd28ff8af5abf0.zip |
Bug 538303 - Debug View wrong selection if activated by breakpointI20180912-0225I20180912-0210I20180911-1400
If a breakpoint is hit when the Debug View is not active, the Debug View
is activated. In some cases, this leads to a bad selection and expanded
state.
When the Debug View is activated, either by a breakpoint or by a user,
a state is saved in ViewerStateTracker. This state is cancelled by
TreeModelContentProvider on breakpoint hit, however without removing
COLLAPSED delta states. As such, applying the state later on will lead
to a collapsed thread, if the state had a collapsed flag for that
thread. This "overwrites" a thread selected by suspend handling.
This change should ensure that COLLAPSED thread state in
ViewerStateTracker is cleared when an expand is handled, regardless if
the tree had to be expanded or was expanded already by another
operation.
Change-Id: I7c43b8317081747c6d8e85020e7040e928c4f39b
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
Diffstat (limited to 'org.eclipse.debug.ui/ui')
-rw-r--r-- | org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java index 4fc8d4ab6..4608c48b0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelContentProvider.java @@ -1437,8 +1437,8 @@ public class TreeModelContentProvider implements ITreeModelContentProvider, ICon treeViewer.setChildCount(elementPath, viewCount); if (!treeViewer.getExpandedState(elementPath)) { treeViewer.expandToLevel(elementPath, 1); - cancelRestore(elementPath, IModelDelta.COLLAPSE); } + cancelRestore(elementPath, IModelDelta.COLLAPSE); } } |