diff --git a/src/vs/workbench/parts/debug/browser/debugViewer.ts b/src/vs/workbench/parts/debug/browser/debugViewer.ts index 0dcba00cadc7b02c3d120b20e1d1dfaf8d42921b..fc62242533b3a47a08c20c45c9a80834dcebeb45 100644 --- a/src/vs/workbench/parts/debug/browser/debugViewer.ts +++ b/src/vs/workbench/parts/debug/browser/debugViewer.ts @@ -878,8 +878,7 @@ export class BreakpointsRenderer implements tree.IRenderer { } private renderExceptionBreakpoint(exceptionBreakpoint: debug.IExceptionBreakpoint, data: IExceptionBreakpointTemplateData): void { - const namePascalCase = exceptionBreakpoint.name.charAt(0).toUpperCase() + exceptionBreakpoint.name.slice(1); - data.name.textContent = `${ namePascalCase} exceptions`; + data.name.textContent = exceptionBreakpoint.label || `${ exceptionBreakpoint.filter } exceptions`;; data.checkbox.checked = exceptionBreakpoint.enabled; } @@ -929,7 +928,7 @@ export class BreakpointsAccessibilityProvider implements tree.IAccessibilityProv return nls.localize('functionBreakpointAriaLabel', "Funktion breakpoint {0}, breakpoints, debug", (element).name); } if (element instanceof model.ExceptionBreakpoint) { - return nls.localize('exceptionBreakpointAriaLabel', "Exception breakpoint {0}, breakpoints, debug", (element).name); + return nls.localize('exceptionBreakpointAriaLabel', "Exception breakpoint {0}, breakpoints, debug", (element).filter); } return null; diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts index 13730fa9202d028e1f352e5c76746ad93ce1d90a..55f94493fbe8675dbb12f53aa2429f4c16a7adcf 100644 --- a/src/vs/workbench/parts/debug/common/debug.ts +++ b/src/vs/workbench/parts/debug/common/debug.ts @@ -93,7 +93,8 @@ export interface IFunctionBreakpoint extends IEnablement { } export interface IExceptionBreakpoint extends IEnablement { - name: string; + filter: string; + label: string; } // events diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 46c67860203ade77dbf5566e6f12a673fae38c74..946420606e997c3ef45afdac83e290088861714b 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -320,7 +320,7 @@ export class ExceptionBreakpoint implements debug.IExceptionBreakpoint { private id: string; - constructor(public name: string, public enabled: boolean) { + constructor(public filter: string, public label: string, public enabled: boolean) { this.id = uuid.generateUuid(); } diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 9734b068f06f1163336edd8556baf25f637ceb21..1ad39b8295f9abe8ee1ea292825d2c1dc8c13a4d 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -371,13 +371,14 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService let result: debug.IExceptionBreakpoint[] = null; try { result = JSON.parse(this.storageService.get(DEBUG_EXCEPTION_BREAKPOINTS_KEY, StorageScope.WORKSPACE, '[]')).map((exBreakpoint: any) => { - return new model.ExceptionBreakpoint(exBreakpoint.name, exBreakpoint.enabled); + return new model.ExceptionBreakpoint(exBreakpoint.filter || exBreakpoint.name, exBreakpoint.label, exBreakpoint.enabled); }); } catch (e) { result = []; } - return result.length > 0 ? result : [new model.ExceptionBreakpoint('all', false), new model.ExceptionBreakpoint('uncaught', true)]; + return result.length > 0 ? result : [new model.ExceptionBreakpoint('all', nls.localize('allExceptions', "All Exceptions"), false), + new model.ExceptionBreakpoint('uncaught', nls.localize('uncaughtExceptions', "Uncaught Exceptions"), true)]; } private loadWatchExpressions(): model.Expression[] { @@ -863,7 +864,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService } const enabledExceptionBps = this.model.getExceptionBreakpoints().filter(exb => exb.enabled); - return this.session.setExceptionBreakpoints({ filters: enabledExceptionBps.map(exb => exb.name) }); + return this.session.setExceptionBreakpoints({ filters: enabledExceptionBps.map(exb => exb.filter) }); } private onFileChanges(fileChangesEvent: FileChangesEvent): void {