maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9966 from Meai1/patch-3

Browse source 
Check if adapter is null and let it print errors
This commit is contained in:
Isidor Nikolic 2016-08-03 23:16:45 +02:00 committed by GitHub
parent 594b73647b 39891e39b6
commit 30c71c5d85
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/workbench/parts/debug/node/debugConfigurationManager.ts
View file

@ -297,9 +297,12 @@ export class ConfigurationManager implements debug.IConfigurationManager {
const factory: { (): TPromise<any> }[] = Object.keys(interactiveVariablesToSubstitutes).map(interactiveVariable => {
return () => {
const commandId = this.adapter.variables ? this.adapter.variables[interactiveVariable] : null;
let commandId = null;
if (this.adapter !== null) {
commandId = this.adapter.variables ? this.adapter.variables[interactiveVariable] : null;
}
if (!commandId) {
return TPromise.wrapError(nls.localize('interactiveVariableNotFound', "Adapter {0} does not contribute variable {1} that is specified in launch configuration.", this.adapter.type, interactiveVariable));
return TPromise.wrapError(nls.localize('interactiveVariableNotFound', "Adapter {0} does not contribute variable {1} that is specified in launch configuration.", this.adapter !== null ? this.adapter.type : null, interactiveVariable));
} else {
return this.commandService.executeCommand<string>(commandId, this.configuration).then(result => {
if (!result) {