callstack improvements microsoft#106957

isidorn · isidorn · commit 50610f085d7f · 2020-09-18T18:44:17.000+02:00
diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts
@@ -156,7 +156,7 @@ export class CallStackView extends ViewPane {
 
 			const thread = sessions.length === 1 && sessions[0].getAllThreads().length === 1 ? sessions[0].getAllThreads()[0] : undefined;
 			if (thread && thread.stoppedDetails) {
-				this.pauseMessageLabel.textContent = thread.stoppedDetails.description || nls.localize('debugStopped', "Paused on {0}", thread.stoppedDetails.reason || '');
+				this.pauseMessageLabel.textContent = thread.stateLabel;
 				this.pauseMessageLabel.title = thread.stoppedDetails.text || '';
 				this.pauseMessageLabel.classList.toggle('exception', thread.stoppedDetails.reason === 'exception');
 				this.pauseMessage.hidden = false;
@@ -547,7 +547,7 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 		data.stateLabel.style.display = '';
 
 		if (thread && thread.stoppedDetails) {
-			data.stateLabel.textContent = thread.stoppedDetails.description || nls.localize('debugStopped', "Paused on {0}", thread.stoppedDetails.reason || '');
+			data.stateLabel.textContent = thread.stateLabel;
 			if (thread.stoppedDetails.text) {
 				data.session.title = thread.stoppedDetails.text;
 			}
@@ -577,7 +577,7 @@ class ThreadsRenderer implements ICompressibleTreeRenderer<IThread, FuzzyScore,
 	renderTemplate(container: HTMLElement): IThreadTemplateData {
 		const thread = dom.append(container, $('.thread'));
 		const name = dom.append(thread, $('.name'));
-		const stateLabel = dom.append(thread, $('span.state.label'));
+		const stateLabel = dom.append(thread, $('span.state.label.monaco-count-badge.long'));
 		const label = new HighlightedLabel(name, false);
 		const actionBar = new ActionBar(thread);
 
diff --git a/src/vs/workbench/contrib/debug/common/debugModel.ts b/src/vs/workbench/contrib/debug/common/debugModel.ts
@@ -428,7 +428,7 @@ export class Thread implements IThread {
 	get stateLabel(): string {
 		if (this.stoppedDetails) {
 			return this.stoppedDetails.description ||
-				this.stoppedDetails.reason ? nls.localize({ key: 'pausedOn', comment: ['indicates reason for program being paused'] }, "Paused on {0}", this.stoppedDetails.reason) : nls.localize('paused', "Paused");
+				(this.stoppedDetails.reason ? nls.localize({ key: 'pausedOn', comment: ['indicates reason for program being paused'] }, "Paused on {0}", this.stoppedDetails.reason) : nls.localize('paused', "Paused"));
 		}
 
 		return nls.localize({ key: 'running', comment: ['indicates state'] }, "Running");

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ export class Thread implements IThread {`
`428`	`428`	`get stateLabel(): string {`
`429`	`429`	`if (this.stoppedDetails) {`
`430`	`430`	`return this.stoppedDetails.description \|\|`
`431`		`- this.stoppedDetails.reason ? nls.localize({ key: 'pausedOn', comment: ['indicates reason for program being paused'] }, "Paused on {0}", this.stoppedDetails.reason) : nls.localize('paused', "Paused");`
	`431`	`+ (this.stoppedDetails.reason ? nls.localize({ key: 'pausedOn', comment: ['indicates reason for program being paused'] }, "Paused on {0}", this.stoppedDetails.reason) : nls.localize('paused', "Paused"));`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`return nls.localize({ key: 'running', comment: ['indicates state'] }, "Running");`