diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts index b94c9f95fc6..a879dca6abe 100644 --- a/src/vs/workbench/parts/debug/common/debug.ts +++ b/src/vs/workbench/parts/debug/common/debug.ts @@ -49,6 +49,7 @@ export interface IRawModelUpdate { export interface IRawStoppedDetails { reason: string; + description?: string; threadId?: number; text?: string; totalFrames?: number; diff --git a/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts b/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts index e5c02c809d9..99619e21241 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts @@ -510,8 +510,8 @@ export class CallStackRenderer implements IRenderer { data.thread.title = nls.localize('thread', "Thread"); data.name.textContent = thread.name; - data.stateLabel.textContent = thread.stopped ? nls.localize({ key: 'pausedOn', comment: ['indicates reason for program being paused'] }, "Paused on {0}", thread.stoppedDetails.reason) - : nls.localize({ key: 'running', comment: ['indicates state'] }, "Running"); + const description = thread.stoppedDetails.description || nls.localize({ key: 'pausedOn', comment: ['indicates reason for program being paused'] }, "Paused on {0}", thread.stoppedDetails.reason); + data.stateLabel.textContent = thread.stopped ? description : nls.localize({ key: 'running', comment: ['indicates state'] }, "Running"); } private renderError(element: string, data: IErrorTemplateData) { diff --git a/src/vs/workbench/parts/debug/electron-browser/debugViews.ts b/src/vs/workbench/parts/debug/electron-browser/debugViews.ts index 3882d9d6e2e..fc152c59b99 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugViews.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugViews.ts @@ -277,7 +277,7 @@ export class CallStackView extends CollapsibleViewletView { // Only show the global pause message if we do not display threads. // Otherwsie there will be a pause message per thread and there is no need for a global one. if (newTreeInput instanceof Thread && newTreeInput.stoppedDetails) { - this.pauseMessageLabel.text(nls.localize('debugStopped', "Paused on {0}", newTreeInput.stoppedDetails.reason)); + this.pauseMessageLabel.text(newTreeInput.stoppedDetails.description || nls.localize('debugStopped', "Paused on {0}", newTreeInput.stoppedDetails.reason)); if (newTreeInput.stoppedDetails.text) { this.pauseMessageLabel.title(newTreeInput.stoppedDetails.text); }