debug: surface all errors from the variable substitution via modal dialogs

isidorn · isidorn · commit 705de3da4d93 · 2018-04-19T12:34:10.000+02:00
fixes microsoft#46870
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -634,9 +634,13 @@ class Launch implements ILaunch {
 		setOSProperties(isLinux, result.linux);
 
 		// massage configuration attributes - append workspace path to relatvie paths, substitute variables in paths.
-		Object.keys(result).forEach(key => {
-			result[key] = this.configurationResolverService.resolveAny(this.getWorkspaceForResolving(), result[key]);
-		});
+		try {
+			Object.keys(result).forEach(key => {
+				result[key] = this.configurationResolverService.resolveAny(this.getWorkspaceForResolving(), result[key]);
+			});
+		} catch (e) {
+			return TPromise.wrapError(e);
+		}
 
 		const adapter = this.configurationManager.getDebugger(result.type);
 		return this.configurationResolverService.resolveInteractiveVariables(result, adapter ? adapter.variables : null);
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -786,7 +786,7 @@ export class DebugService implements debug.IDebugService {
 
 	private createProcess(launch: debug.ILaunch, config: debug.IConfig, sessionId: string): TPromise<void> {
 		return this.textFileService.saveAll().then(() =>
-			(launch ? launch.substituteVariables(config) : TPromise.as(config)).then(resolvedConfig => {
+			(launch ? launch.substituteVariables(config).then(config => config, (err: Error) => this.showError(err.message)) : TPromise.as(config)).then(resolvedConfig => {
 				if (!resolvedConfig) {
 					// User canceled resolving of interactive variables, silently return
 					return undefined;
