提交 03b20768 编写于 作者: I isidor

debug: better error handling for non-existent launch configs

fixes #6800
上级 63507b7e
...@@ -7,6 +7,7 @@ import 'vs/css!../browser/media/debug.contribution'; ...@@ -7,6 +7,7 @@ import 'vs/css!../browser/media/debug.contribution';
import 'vs/css!../browser/media/debugHover'; import 'vs/css!../browser/media/debugHover';
import nls = require('vs/nls'); import nls = require('vs/nls');
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { TPromise } from 'vs/base/common/winjs.base';
import editorcommon = require('vs/editor/common/editorCommon'); import editorcommon = require('vs/editor/common/editorCommon');
import { CommonEditorRegistry, ContextKey, EditorActionDescriptor } from 'vs/editor/common/editorCommonExtensions'; import { CommonEditorRegistry, ContextKey, EditorActionDescriptor } from 'vs/editor/common/editorCommonExtensions';
import { EditorBrowserRegistry } from 'vs/editor/browser/editorBrowserExtensions'; import { EditorBrowserRegistry } from 'vs/editor/browser/editorBrowserExtensions';
...@@ -120,8 +121,12 @@ KeybindingsRegistry.registerCommandDesc({ ...@@ -120,8 +121,12 @@ KeybindingsRegistry.registerCommandDesc({
handler(accessor: ServicesAccessor, configuration: any) { handler(accessor: ServicesAccessor, configuration: any) {
const debugService = accessor.get(debug.IDebugService); const debugService = accessor.get(debug.IDebugService);
if (typeof configuration === 'string') { if (typeof configuration === 'string') {
return debugService.getConfigurationManager().setConfiguration(configuration) const configurationManager = debugService.getConfigurationManager();
.then(() => debugService.createSession(false)); return configurationManager.setConfiguration(configuration)
.then(() => {
return configurationManager.configurationName ? debugService.createSession(false)
: TPromise.wrapError(new Error(nls.localize('launchConfigDoesNotExist', "Launch configuration '{0}' does not exist.", configuration)));
});
} }
const noDebug = configuration && !!configuration.noDebug; const noDebug = configuration && !!configuration.noDebug;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册