From 7ab5bca205ef3c7c1c1fd3f0dd931464ae91aaff Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 15 Nov 2019 11:13:30 +0100 Subject: [PATCH] CallStack: keep showing the session if we were in a multi session view fixes #84601 --- src/vs/workbench/contrib/debug/browser/callStackView.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts index df3cc534863..528bffc3b13 100644 --- a/src/vs/workbench/contrib/debug/browser/callStackView.ts +++ b/src/vs/workbench/contrib/debug/browser/callStackView.ts @@ -25,7 +25,6 @@ import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/m import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { ITreeRenderer, ITreeNode, ITreeContextMenuEvent, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { TreeResourceNavigator2, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService'; -import { onUnexpectedError } from 'vs/base/common/errors'; import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel'; import { createMatches, FuzzyScore } from 'vs/base/common/filters'; import { Event } from 'vs/base/common/event'; @@ -165,7 +164,7 @@ export class CallStackView extends ViewletPanel { expandOnlyOnTwistieClick: true }); - this.tree.setInput(this.debugService.getModel()).then(undefined, onUnexpectedError); + this.tree.setInput(this.debugService.getModel()); const callstackNavigator = new TreeResourceNavigator2(this.tree); this._register(callstackNavigator); @@ -644,7 +643,7 @@ class CallStackDataSource implements IAsyncDataSource 1) { + if (sessions.length > 1 || this.debugService.getViewModel().isMultiSessionView()) { return Promise.resolve(sessions.filter(s => !s.parentSession)); } -- GitLab