diff --git a/src/vs/workbench/parts/debug/browser/debugActionItems.ts b/src/vs/workbench/parts/debug/browser/debugActionItems.ts index 6dceacd9ff69bb155f25b250f87d1e1e6dfbc9dc..1fc9861d9249c4de9d0b1af2aa8269747bdcbef7 100644 --- a/src/vs/workbench/parts/debug/browser/debugActionItems.ts +++ b/src/vs/workbench/parts/debug/browser/debugActionItems.ts @@ -55,7 +55,9 @@ export class StartDebugActionItem extends EventEmitter implements IActionItem { manager.openConfigFile(false).then(editor => { if (editor) { const codeEditor = editor.getControl(); - return codeEditor.getContribution(EDITOR_CONTRIBUTION_ID).addLaunchConfiguration(); + if (codeEditor) { + return codeEditor.getContribution(EDITOR_CONTRIBUTION_ID).addLaunchConfiguration(); + } } }); } else { diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts index d12369aeb6800ff593baa68031fde0e702334c0d..d7893158546f1abe47656a02ecfb139c4931d2d2 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts @@ -393,7 +393,8 @@ export class ConfigurationManager implements debug.IConfigurationManager { const editor = this.editorService.getActiveEditor(); if (editor) { - const model = (editor.getControl()).getModel(); + const codeEditor = editor.getControl(); + const model = codeEditor ? codeEditor.getModel() : undefined; const language = model ? model.getLanguageIdentifier().language : undefined; const adapter = this.adapters.filter(a => a.languages && a.languages.indexOf(language) >= 0).pop(); if (adapter) {