Regression: cancelling a launch command should silently cancel launch

alexr00 · alexr00 · commit ee3d459a8a41 · 2018-12-06T16:28:28.000+01:00
Fixes microsoft#64547
diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
@@ -90,7 +90,9 @@ export class ConfigurationResolverService extends AbstractVariableResolverServic
 		// resolve input variables in the order in which they are encountered
 		return this.resolveWithInteraction(folder, config, section, variables).then(mapping => {
 			// finally substitute evaluated command variables (if there are any)
-			if (mapping && mapping.size > 0) {
+			if (!mapping) {
+				return null;
+			} else if (mapping.size > 0) {
 				return this.resolveAny(folder, config, fromMap(mapping));
 			} else {
 				return config;
