compacted debug sessions should show name of child and not of parent

isidorn · isidorn · commit 13885429b79d · 2020-07-02T11:43:59.000+02:00
fixes microsoft#101429
diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts
@@ -521,18 +521,18 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 	}
 
 	renderElement(element: ITreeNode<IDebugSession, FuzzyScore>, _: number, data: ISessionTemplateData): void {
-		this.doRenderElement(element.element, element.element.getLabel(), createMatches(element.filterData), data);
+		this.doRenderElement(element.element, createMatches(element.filterData), data);
 	}
 
 	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IDebugSession>, FuzzyScore>, index: number, templateData: ISessionTemplateData, height: number | undefined): void {
 		const lastElement = node.element.elements[node.element.elements.length - 1];
 		const matches = createMatches(node.filterData);
-		this.doRenderElement(lastElement, node.element.elements[0].getLabel(), matches, templateData);
+		this.doRenderElement(lastElement, matches, templateData);
 	}
 
-	private doRenderElement(session: IDebugSession, label: string, matches: IMatch[], data: ISessionTemplateData): void {
+	private doRenderElement(session: IDebugSession, matches: IMatch[], data: ISessionTemplateData): void {
 		data.session.title = nls.localize({ key: 'session', comment: ['Session is a noun'] }, "Session");
-		data.label.set(label, matches);
+		data.label.set(session.getLabel(), matches);
 		const thread = session.getAllThreads().find(t => t.stopped);
 
 		const setActionBar = () => {

Original file line number	Diff line number	Diff line change
`@@ -521,18 +521,18 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`renderElement(element: ITreeNode<IDebugSession, FuzzyScore>, _: number, data: ISessionTemplateData): void {`
`524`		`- this.doRenderElement(element.element, element.element.getLabel(), createMatches(element.filterData), data);`
	`524`	`+ this.doRenderElement(element.element, createMatches(element.filterData), data);`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IDebugSession>, FuzzyScore>, index: number, templateData: ISessionTemplateData, height: number \| undefined): void {`
`528`	`528`	`const lastElement = node.element.elements[node.element.elements.length - 1];`
`529`	`529`	`const matches = createMatches(node.filterData);`
`530`		`- this.doRenderElement(lastElement, node.element.elements[0].getLabel(), matches, templateData);`
	`530`	`+ this.doRenderElement(lastElement, matches, templateData);`
`531`	`531`	`}`
`532`	`532`
`533`		`- private doRenderElement(session: IDebugSession, label: string, matches: IMatch[], data: ISessionTemplateData): void {`
	`533`	`+ private doRenderElement(session: IDebugSession, matches: IMatch[], data: ISessionTemplateData): void {`
`534`	`534`	`data.session.title = nls.localize({ key: 'session', comment: ['Session is a noun'] }, "Session");`
`535`		`- data.label.set(label, matches);`
	`535`	`+ data.label.set(session.getLabel(), matches);`
`536`	`536`	`const thread = session.getAllThreads().find(t => t.stopped);`
`537`	`537`
`538`	`538`	`const setActionBar = () => {`