fixes microsoft#101400

isidorn · isidorn · commit fb2d4b9bfe16 · 2020-07-01T15:59:01.000+02:00
diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts
@@ -348,8 +348,8 @@ export class DebugService implements IDebugService {
 			}
 
 			if (configOrName && !config) {
-				const message = !!launch ? nls.localize('configMissing', "Configuration '{0}' is missing in 'launch.json'.", typeof configOrName === 'string' ? configOrName : JSON.stringify(configOrName)) :
-					nls.localize('launchJsonDoesNotExist', "'launch.json' does not exist.");
+				const message = !!launch ? nls.localize('configMissing', "Configuration '{0}' is missing in 'launch.json'.", typeof configOrName === 'string' ? configOrName : configOrName.name) :
+					nls.localize('launchJsonDoesNotExist', "'launch.json' does not exist for passed workspace folder.");
 				throw new Error(message);
 			}
 
@@ -358,6 +358,7 @@ export class DebugService implements IDebugService {
 			return result;
 		} catch (err) {
 			// make sure to get out of initializing state, and propagate the result
+			this.notificationService.error(err);
 			this.endInitializingState();
 			return Promise.reject(err);
 		}

Original file line number	Diff line number	Diff line change
`@@ -348,8 +348,8 @@ export class DebugService implements IDebugService {`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`if (configOrName && !config) {`
`351`		`- const message = !!launch ? nls.localize('configMissing', "Configuration '{0}' is missing in 'launch.json'.", typeof configOrName === 'string' ? configOrName : JSON.stringify(configOrName)) :`
`352`		`- nls.localize('launchJsonDoesNotExist', "'launch.json' does not exist.");`
	`351`	`+ const message = !!launch ? nls.localize('configMissing', "Configuration '{0}' is missing in 'launch.json'.", typeof configOrName === 'string' ? configOrName : configOrName.name) :`
	`352`	`+ nls.localize('launchJsonDoesNotExist', "'launch.json' does not exist for passed workspace folder.");`
`353`	`353`	`throw new Error(message);`
`354`	`354`	`}`
`355`	`355`
`@@ -358,6 +358,7 @@ export class DebugService implements IDebugService {`
`358`	`358`	`return result;`
`359`	`359`	`} catch (err) {`
`360`	`360`	`// make sure to get out of initializing state, and propagate the result`
	`361`	`+ this.notificationService.error(err);`
`361`	`362`	`this.endInitializingState();`
`362`	`363`	`return Promise.reject(err);`
`363`	`364`	`}`