提交 7ab5bca2 编写于 作者: I isidor

CallStack: keep showing the session if we were in a multi session view

fixes #84601
上级 c54ed592
...@@ -25,7 +25,6 @@ import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/m ...@@ -25,7 +25,6 @@ import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/m
import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
import { ITreeRenderer, ITreeNode, ITreeContextMenuEvent, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree'; import { ITreeRenderer, ITreeNode, ITreeContextMenuEvent, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
import { TreeResourceNavigator2, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService'; 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 { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
import { createMatches, FuzzyScore } from 'vs/base/common/filters'; import { createMatches, FuzzyScore } from 'vs/base/common/filters';
import { Event } from 'vs/base/common/event'; import { Event } from 'vs/base/common/event';
...@@ -165,7 +164,7 @@ export class CallStackView extends ViewletPanel { ...@@ -165,7 +164,7 @@ export class CallStackView extends ViewletPanel {
expandOnlyOnTwistieClick: true expandOnlyOnTwistieClick: true
}); });
this.tree.setInput(this.debugService.getModel()).then(undefined, onUnexpectedError); this.tree.setInput(this.debugService.getModel());
const callstackNavigator = new TreeResourceNavigator2(this.tree); const callstackNavigator = new TreeResourceNavigator2(this.tree);
this._register(callstackNavigator); this._register(callstackNavigator);
...@@ -644,7 +643,7 @@ class CallStackDataSource implements IAsyncDataSource<IDebugModel, CallStackItem ...@@ -644,7 +643,7 @@ class CallStackDataSource implements IAsyncDataSource<IDebugModel, CallStackItem
if (sessions.length === 0) { if (sessions.length === 0) {
return Promise.resolve([]); return Promise.resolve([]);
} }
if (sessions.length > 1) { if (sessions.length > 1 || this.debugService.getViewModel().isMultiSessionView()) {
return Promise.resolve(sessions.filter(s => !s.parentSession)); return Promise.resolve(sessions.filter(s => !s.parentSession));
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册