fixes microsoft#93346

isidorn · isidorn · commit 04b2d52822ed · 2020-03-26T11:51:12.000+01:00
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -670,7 +670,7 @@ export class RawDebugSession implements IDisposable {
 			});
 		}
 		if (error && error.format && error.showUser) {
-			this.notificationService.error(error.format);
+			this.notificationService.error(userMessage);
 		}
 
 		return new Error(userMessage);
diff --git a/src/vs/workbench/contrib/debug/test/common/debugUtils.test.ts b/src/vs/workbench/contrib/debug/test/common/debugUtils.test.ts
@@ -17,6 +17,7 @@ suite('Debug - Utils', () => {
 		assert.strictEqual(formatPII('Foo {0} Bar {1}{2}', false, { '0': 'yes', '1': 'undefined' }), 'Foo yes Bar undefined{2}');
 		assert.strictEqual(formatPII('Foo {_key0} Bar {key1}{key2}', true, { '_key0': 'yes', 'key1': '5', 'key2': 'false' }), 'Foo yes Bar {key1}{key2}');
 		assert.strictEqual(formatPII('Foo {_key0} Bar {key1}{key2}', false, { '_key0': 'yes', 'key1': '5', 'key2': 'false' }), 'Foo yes Bar 5false');
+		assert.strictEqual(formatPII('Unable to display threads:"{e}"', false, { 'e': 'detached from process' }), 'Unable to display threads:"detached from process"');
 	});
 
 	test('getExactExpressionStartAndEnd', () => {

Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,7 @@ export class RawDebugSession implements IDisposable {`
`670`	`670`	`});`
`671`	`671`	`}`
`672`	`672`	`if (error && error.format && error.showUser) {`
`673`		`- this.notificationService.error(error.format);`
	`673`	`+ this.notificationService.error(userMessage);`
`674`	`674`	`}`
`675`	`675`
`676`	`676`	`return new Error(userMessage);`