maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't lose state of tree when going from a stopped->running->stopped state.

Browse source
This commit is contained in:
Haneef Mohammed 2019-07-01 13:04:22 -07:00
parent 71bd9c68e6
commit d7c8e71538
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/workbench/contrib/debug/browser/variablesView.ts
View file

@ -39,6 +39,7 @@ export class VariablesView extends ViewletPanel {
private onFocusStackFrameScheduler: RunOnceScheduler;
private needsRefresh: boolean;
private tree: WorkbenchAsyncDataTree<IViewModel | IExpression | IScope, IExpression | IScope, FuzzyScore>;
private treeContainer: HTMLElement;
constructor(
options: IViewletViewOptions,
@ -53,6 +54,15 @@ export class VariablesView extends ViewletPanel {
// Use scheduler to prevent unnecessary flashing
this.onFocusStackFrameScheduler = new RunOnceScheduler(() => {
if (!this.debugService.getViewModel().focusedStackFrame) {
// This is called even when there is no stackFrame (transition from stopped to running)
// We don't want to clear/udate the tree just yet. We will be called again when we have an actual
// stacktrace available. So, simply hide the tree. Thill help preserve the tree state better and
// will even remember state across a restart.
this.treeContainer.hidden = true;
return;
}
this.treeContainer.hidden = false;
this.needsRefresh = false;
this.tree.updateChildren().then(() => {
const stackFrame = this.debugService.getViewModel().focusedStackFrame;
@ -70,9 +80,9 @@ export class VariablesView extends ViewletPanel {
renderBody(container: HTMLElement): void {
dom.addClass(container, 'debug-variables');
const treeContainer = renderViewTree(container);
this.treeContainer = renderViewTree(container);
this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, treeContainer, new VariablesDelegate(),
this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, this.treeContainer, new VariablesDelegate(),
[this.instantiationService.createInstance(VariablesRenderer), new ScopesRenderer()],
new VariablesDataSource(), {
ariaLabel: nls.localize('variablesAriaTreeLabel', "Debug Variables"),